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

Changeset 1838054 is being indexed.

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

Propose a few monitoring improvements.

mod_status: Cumulate CPU time of exited child

processes in the "cu" and "cs" values.

Add CPU time of the parent process to the

"c" and "s" values.

mod_status: Add cumulated response duration time

in milliseconds.

mod_status: Complete the data shown for async

MPMs in "auto" mode. Added number of processes,

number of stopping processes and number

of busy and idle workers.

mod_proxy: Improve the balancer member data shown

in mod_status when "ProxyStatus" is "On":

add "busy" count and show byte counts in auto

mode always in units of kilobytes.


Follow up to r1833368 and r1837435: update APLOGNO.