Checkout Tools
  • last updated 7 hours ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 1838255 is being indexed.

uploading file to keep the ongoing changes

    • ?
Merge r1418761, r1418765, r1510295, r1757147, r1805163, r1818924, r1827374, r1831772, r1832351, r1832951, r1815004 from trunk:

Don't claim "BIO dump follows" if it is not logged due to log level config.

make ssl_io_data_dump respect per-conn loglevel

add high trace level log messages for debugging buffering and write completion

* modules/ssl/ssl_engine_kernel.c (ssl_callback_SessionTicket): Fail

if RAND_bytes() fails; possible per API, although not in practice

with the OpenSSL implementation.

Fix typo in log message.

ap_add_common_vars(): use apr_pstrmemdup().

This avoids a transient replacement/restore of '?' by '\0' in r->filename.

Use 'ap_request_has_body()' instead of duplicating its implemenation.

The logic in 'ap_request_has_body()' is:

has_body = (!r->header_only

&& (r->kept_body

|| apr_table_get(r->headers_in, "Transfer-Encoding")

|| ( (cls = apr_table_get(r->headers_in, "Content-Length"))

&& (apr_strtoff(&cl, cls, &estr, 10) == APR_SUCCESS)

&& (!*estr)

&& (cl > 0) )



So the test is slighly different from the original code. (but this looks fine to me)

This also has the advantage to avoid a redundant call to 'apr_table_get()' and to improve readability.

While at it, move the test '!r->expecting_100' a few lines above because it is cheap.

PR62368: Print the unparsed URI in AH03454

... to include r->args and get otherwise get as close to possible to

what came in over the wire.

Submitted By: Hank Ibell <hwibell>

Committed By: covener

All error handling paths of this function call 'apr_brigade_destroy()' , except this one.

So add it here too.

Probably spotted with the help of the Coccinelle software (Thx Julia for the patch and for Coccinelle)

See PR 53016

* modules/proxy/proxy_util.c (ap_proxy_share_worker): Skip creating subpool

for debugging unless debug-level logging is enabled. No functional change.

mod_watchdog: Correct some log messages and fix

compiler warning

"'rv' may be used uninitialized in this function".

Follow up to r1722154.

Submitted by: sf, jorton, jorton, ylavic, jailletc36, covener, jailletc36, jorton, rjung

Reviewed by: jailletc36, jim, jorton

Merge r1801143 from trunk:

mpm_winnt: Don't forget to close the I/O completion port as part of the

cleanup in the child process.

Submitted by: kotkov

Reviewed by: jailletc36, ylavic (by inspection), covener

add ids

minor bump from r1838055

add tests for host checking

    • ?
    • ?
Add StrictHostCheck

.. to allow ucnonfigured hostnames to be rejected.

The checks happen during NVH mapping and checks that the

mapped VH itself has the host as a name or alias.

don't use workaround on trunk

it breaks the build w/ maintainer mode.

Merge r1797844 from trunk:

allow quoted paths in <IfFile>

The boilerplate code for config sections conflicts with TAKE1

because of the trailing stuff to terminate the opening tag.

Change from TAKE1 to RAW_ARGS and call ap_getword_conf()


Merge r1809135 from trunk:

On the trunk:

mpm_common.h: guarding AP_ENABLE_EXCEPTION_HOOK against use when undefined so that -Wundef does not triggger.


and promote those with 3 +1s

backport votes

Add missing details for CVE-2016-4975 which was mitigated by other changes

Axe some redundant conditions. PR 62549.

Follow up to r1837822: typo.
ap_request_core_filter() can check whether the next filter should yield.

Itself won't yield at this point (its f->bb is empty).

core: ap_filter_output_pending() to flush outer most filters first.

Since previous output filters may use ap_filter_should_yield() to determine

whether they should send more data (e.g. ap_request_core_filter), we need

to flush pending data from the core output filter first, and so on up the


Otherwise we may enter an infinite loop where ap_request_core_filter() does

nothing on ap_filter_output_pending() called from MPM event.

Remove backported items from trunk/CHANGES

needed on my macos system

needed on my macos system.

Patch PR 62567. Fix by Michal Karm Babacek <michal.babacek>


quick fix

Merge r1836469, r1836154 from trunk:

* config.layout: Allow configure --localstatedir to over-ride /var/www

location in Fedora layout.

* (install-suexec*): Fix make -jN install.

Submitted by: Arkadiusz Miskiewicz <arekm>

Submitted by: jorton

Reviewed by: jorton, covener, jim


vote on some backports