Checkout Tools
  • last updated 21 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1863316 is being indexed.

Merge of r1426802,1744460,1829799,1824716,1838318,1840678,1861294

*) easy patches to synch 2.4.x and trunk:

- core: extend description of r->hostname

- mod_proxy_http: Avoid memory allocation before making sure that this handler can handle the URL

- core: Save a few cycles in 'ap_parse_form_data()'

- mod_cache_socache: Save some cycles

- mod_proxy_ftp: Save some cycle

- vhost: move an assignment to the end of the loop to ease readability and please a compiler

- core: Be a little more verbose when an error in trigerred in 'ap_set_file_slot()'

  1. … 8 more files in changeset.
Merge of r1847430,r1853302 from trunk:

*) core: Split out the ability to parse wildcard files and directories

from the Include/IncludeOptional directives into a generic set of

functions ap_dir_nofnmatch() and ap_dir_fnmatch().

  1. … 6 more files in changeset.
Merge r1769718, r1785943, r1786110, r1786119 from trunk:

add an <IfFile> config section like <IfDefine>

It allows a non httpd config file to be used as a marker directly in

httpd.conf without hiding logic in a script in front of apachectl

to do test -f and pass extra -D's.

This is something we've had in IBM's httpd distro for a little bit and

hadn't remembered to share. I've seen some questions/config files come

up in a few places lately that would benefit from this as an option.

Remove duplicate implementations of conditional section function. No

functional change.

* server/core.c (start_cond_section): Factor out from start_if*.

Adjust to use apr_strmemdup.

(test_ifmod_section, test_iffile_section, test_ifdefine_section):

Move container-specific tests into callbacks from start_if*.

(core_cmds): Adjust <IfFile, <IfDefine, <IfModule to use

start_cond_section with callbacks.

Add <IfDirective> and <IfSection>:

* server/core.c

(test_ifdirective_section, test_ifsection_section): New callbacks.

(core_cmds): Define new directives.

* include/http_config.h, server/config.c (ap_exists_directive):

New function.

* include/ap_mmn.h: Bump MMN minor for above.

* docs/manual/mod/core.xml: Add docs.

* server/core.c (start_cond_section): Comment & variable name fixes,

no functional change.

Submitted by: covener, jorton

Reviewed by: jorton, ylavic, covener

  1. … 7 more files in changeset.
Merge r1490294, r1734635, r1749403, r1813116, r1816179, r1817598, r1832198, r1832200, r1832277, r1832317 from trunk:

Note that the function will be available in APR.

Silent a smatch warning:

mod_auth_form.c:626 get_form_auth() warn: variable dereferenced before check 'sent_user' (see line 616)

Use 'memcpy' instead of 'strcpy' when the size of the string has already been computed.

Fix compilation failure :

unixd.c: In function ‘ap_unixd_mpm_set_signals’:

unixd.c:579:5: error: implicit declaration of function ‘apr_signal’; did you mean ‘strsignal’? [-Werror=implicit-function-declaration]

apr_signal(SIGPIPE, SIG_IGN);

^~~~~~~~~~

strsignal

Not sure where it comes from, maybe related to r1812301.

mod_substitute: add runtime traces. PR 61132.

In verify_ocsp_status in ssl_engine_ocsp.c, the log message, "OCSP response not successful: %d" should print the value of r instead of rc.

The value of rc will always be 0.

PR 61876 [sam <sam.eastman.4114 gmail.com>]

Success of 'SHGetMalloc()' should be tested with the SUCCEEDED macro.

/!\ This commit is _NOT COMPILE TESTED_. (I don't have a windows build environment available)

See PR 60086.

Axe some dead code.

See PR 60086.

Fix typo

Fix a potential un-intialized variable usage warning.

This can not be a runtime ixsue, because, in such a case, we would assert and abort before.

PR 59819.

Submitted by: minfrin, jailletc36, jailletc36, jailletc36, ylavic, jailletc36, jailletc36, jailletc36, jailletc36, jailletc36

Reviewed by: jailletc36, ylavic, covener

  1. … 11 more files in changeset.
  1. … 30 more files in changeset.
Merge r1809302, r1809303, r1809305, r1809311, r1809314, r1809713 from trunk:

config: allow to specify flags when registering modules.

First one is AP_MODULE_FLAG_ALWAYS_MERGE.

mod_ssl: follow up to r1809302.

Make use of AP_MODULE_FLAG_ALWAYS_MERGE.

config: follow up to r1809302.

We need to check that the module itself is at the right version.

config: follow up to r1809302.

Provide a convenient function to get module flags, and remove useless

AP_MODULE_HAS_FLAGS checks in the core, core's version is at current MMN.

config: follow up to r1809302.

Associate ap_get_module_flags() to MMN bump.

On the trunk:

mod_ssl: make the new module flag used.

Submitted by: ylavic, icing

Reviewed by: icing, ylavic, covener

  1. … 5 more files in changeset.
Merge r1814968 from trunk:

core: silently ignore a not existent file path when IncludeOptional

is used.

In https://bz.apache.org/bugzilla/show_bug.cgi?id=57585 some use cases

were reported in which IncludeOptional seems to be too strict in its

sanity checks.

This change is a proposal to relax IncludeOptional checks to silently

fail when a file path is not existent rather than returning SyntaxError.

Submitted by: elukey

Reviewed by: elukey, jim, niq

  1. … 4 more files in changeset.
Merge r1713043, r1802305, r1802309 from trunk:

Save a few bytes in conf pool when processing 'Define'.

+ some minor style issues

+ split long lines

Be explicit and safe (const) with the strings stored in ap_server_config_defines.

Follow up to r1713043.

ap_server_config_defines and ap_server_{pre,post}_read_config are arrays of

*const* strings (must not change after being inserted), make it explicit.

Submitted by: jailletc36, ylavic, ylavic

Reviewed by: ylavic, jorton, jim

  1. … 6 more files in changeset.
Merge r1756038 from trunk:

Fix spelling in comments and text files.

No functional change.

PR 59990

Submitted by: rjung

Reviewed/backported by: jim

  1. … 72 more files in changeset.
core: Add -DDUMP_INCLUDES configtest to show the Include tree.

Example:

Included configuration files:

(*) .../conf/httpd.conf

(517) .../conf/extra/proxy-html.conf

(91) /dev/null

Submitted by: Jacob Champion <champion.pxi gmail.com>

Reviewed by: covener, gsmith, minfrin

  1. … 5 more files in changeset.
Merge r1744980 from trunk:

Save a few bytes in the conf pool.

The directive's names don't need to be duplicated in this pool when parsing the configuration file.

Either they match a known directive name and we can use it directly if needed. Otherwise, it is still possible to make a copy afterwards.

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 2 more files in changeset.
Merge r1719018, r1719189, r1719190 from trunk:

Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable in order to save a few cycles.

Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable in order to save a few cycles.

Fix some minor style issue.

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1657692, r1660800 from trunk

* Save a few bytes in conf pool when parsing some directives. Use temp_pool

when applicable.

Submitted by: jailletc36

Reviewed by: jailletc36, ylavic, covener

Backported by: jailletc36

  1. … 4 more files in changeset.
Merge r1618541 from trunk:

Avoid useless warning message when parsing a section guarded by <IfDefine foo> if $(foo) is used within the section.

PR 56503

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1496709,r1601995 from trunk:

core: factor out DEFAULT_HANDLER_NAME

Submitted by: jailletc36

Reviewed by: ylavic, trawick

  1. … 3 more files in changeset.
Merge r1389339, r1498880 from trunk:

add pre_htaccess hook; in conjunction with earlier dirwalk_stat

and post_perdir_config hooks, this should allow mpm-itk to be

used without patches to httpd core

Replace pre_htaccess hook with more flexible open_htaccess hook

Submitted by: trawick, sf

Reviewed/backported by: jim

  1. … 10 more files in changeset.
Merge r1463056 from trunk:

Use %pm available since apr 1.3 instead of an extra call to apr_strerror

Submitted by: sf

Reviewed/backported by: jim

  1. … 7 more files in changeset.
Merge r1442865, r1442759, r1442326, r1442309, r1448171, r1418556, r1448453, r1425771, r1425772, r1425775 from trunk:

Change bzero/bcopy into memset/memcpy

PR 54346

Can't figure out why we allocate len+2 bytes here. Len+1 should be enough.

Fix valgrind warning about uninitialized memory in argument to semctl

PR: 53690

Submitted by: Mikhail T. <mi+apache aldan algebra com>

fix valgrind warnings about uninitialized memory in syscall arguments

This is useful info for mod_status ;)

Add some __attribute__ for automatic format checking.

Correct one catch in sed0.c.

Correct some spelling.

Replace strdup by ap_malloc to ensure a proper error message if out-of-memory.

While there, only allocate memory for the string part we actually use.

PR: 54345

Exit with error message if out of mem

htdbm, htpasswd: print error message if out of memory

PR: 54345

Submitted by: jailletc36, sf, sf, jim, jailletc36, minfrin, sf, sf, sf

Reviewed/backported by: jim

  1. … 19 more files in changeset.
Merge r1415023 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

PR54223: 2.4 generates AH00554 when Include points to a directory with no wildcard.

r931435 refactored ap_process_resource_config() so it didn't read through

directories, but also changed a path non-fnmatch directories are passed

through to call ap_process_resource_config().

  1. … 3 more files in changeset.
Merge r1397172 from trunk:

"Iterate" directives: Report an error if no arguments are provided.

Submitted by: trawick

Reviewed/backported by: jim

  1. … 3 more files in changeset.
sync style fix from trunk r1359881
Backport:

core: Add ap_runtime_dir_relative() and DefaultRuntimeDir.

Submitted by: trawick

Reviewed by: jim, minfrin

  1. … 7 more files in changeset.
Merge r1229021 from trunk:

Core configuration: add AllowOverride option to treat syntax

errors in .htaccess as non-fatal.

PR 52439

Submitted by: niq

Reviewed/backported by: jim

  1. … 6 more files in changeset.
Clean up size_t abuse, part 2. ap_malloc/calloc/realloc are explicitly

excluded from this cleanup as they must be signature identical to the

clib functions, and although the definition of size_t has been flakey,

the definition of those functions appears to be generally clean since

ANSI C.

Backports: r1228323

  1. … 10 more files in changeset.
Merge r1213338:

Limit length of lines in .htaccess to 8K again, to reduce DoS potential.

Make ap_varbuf_cfg_getline() strictly enforce the max_len parameter.

  1. … 6 more files in changeset.
Backport r1209766, r1210252, r1210284:

Add lots of unique tags to error log messages

ssl_util.c: Downgrade some dynamic locking messages from level DEBUG

to TRACE1-3

  1. … 164 more files in changeset.