Merge r1332378 from trunk:

If a filename without slashes is specified for LoadFile or
LoadModule and the file cannot be found in the server root directory,
try to use the standard dlopen() search path.

Submitted by: sf
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364603 13f79535-47bb-0310-9956-ffa450edef68

Merge r1345329 from trunk:

remove obsolete comment (PROXY_MAGIC_TYPE is not used anywhere anymore)

Submitted by: sf
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364602 13f79535-47bb-0310-9956-ffa450edef68

Merge r1306426, r1306841 from trunk:

Update worker mpm defaults to match documentation and built-in defaults.
As per https://issues.apache.org/bugzilla/show_bug.cgi?id=52102

Updated event mpm configuration to match the defaults in documentation and header definitions.
Updated prefork defaults to better match documentation and header definition.
Submitted by: humbedooh
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364600 13f79535-47bb-0310-9956-ffa450edef68

Merge r1306350 from trunk:

Adapt Timeout to be the same as DEFAULT_TIMEOUT.
After all it's localted in a file called extra/httpd-default.conf

Submitted by: igalic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364599 13f79535-47bb-0310-9956-ffa450edef68

Merge r1361792 from trunk:

Remove some checking for out-of-mem conditions that cannot be hit
because apr_pcalloc/apr_pool_create will call abort() anyway.

Submitted by: sf
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364598 13f79535-47bb-0310-9956-ffa450edef68

promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364597 13f79535-47bb-0310-9956-ffa450edef68

Votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364596 13f79535-47bb-0310-9956-ffa450edef68

Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364393 13f79535-47bb-0310-9956-ffa450edef68

Add mergeinfo for committs backported in revisions:
r1309579, r1331413, r1203645, r1201445,
r1200983, r1200982.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364345 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364343 13f79535-47bb-0310-9956-ffa450edef68

typo fixes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364342 13f79535-47bb-0310-9956-ffa450edef68

typo fix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364336 13f79535-47bb-0310-9956-ffa450edef68

Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364332 13f79535-47bb-0310-9956-ffa450edef68

Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364330 13f79535-47bb-0310-9956-ffa450edef68

Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364326 13f79535-47bb-0310-9956-ffa450edef68

Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364321 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364317 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364315 13f79535-47bb-0310-9956-ffa450edef68

Merge r1364309 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

copy the context restrictions from sections.html for symlink
related options

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364311 13f79535-47bb-0310-9956-ffa450edef68

Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364310 13f79535-47bb-0310-9956-ffa450edef68

Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364308 13f79535-47bb-0310-9956-ffa450edef68

typo fixes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364307 13f79535-47bb-0310-9956-ffa450edef68

Add mergeinfo for backport done in r1242097.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364305 13f79535-47bb-0310-9956-ffa450edef68

Add mergeinfo for backports done in revisions:
r1203495, r1211353, r1213395, r1213400, r1222931,
r1308862, r1294602

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364304 13f79535-47bb-0310-9956-ffa450edef68

Fix typo in mergeinfo.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364303 13f79535-47bb-0310-9956-ffa450edef68

Add mergeinfo for backports done by jim in r1200981.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364302 13f79535-47bb-0310-9956-ffa450edef68

Add long list of backport proposals.
Those are all very easy to review.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364285 13f79535-47bb-0310-9956-ffa450edef68

Remove backported item from STATUS.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364272 13f79535-47bb-0310-9956-ffa450edef68

Log the value of Status header lines in script responses rather than
than just the fixed header name of "Status".

Backport of r1362538 from trunk.

Submitted by: chrisd
Reviewed by: rpluem, rjung
Backported by: rjung

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364271 13f79535-47bb-0310-9956-ffa450edef68

modules/ssl/ssl_util_ocsp.c (get_line): Don't set line[-1] to 0
when len == 0.

Backport of r1358061 from trunk.

Submitted by: Jim Meyering <meyering redhat.com>
Reviewed by: jorton, trawick, rjung
Backported by: rjung

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364270 13f79535-47bb-0310-9956-ffa450edef68

Remove applied item from STSTUS.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364269 13f79535-47bb-0310-9956-ffa450edef68

Fix MaxConnectionsPerChild

This was broken when the handling of lingering close was moved into the
listener thread.

- Make the connection counting thread safe.
- Do the counting in the connection pool cleanup to ensure that it gets
  also executed if the listener thread closes the connection.
- Add a trace log message when a process is recycled.
- Rename requests_this_child to conns_this_child, which is more accurate

Backport of r1343085 and r1343087.

Submitted by: sf
Reviewed by: humbedooh, rjung
Backported by: rjung

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364268 13f79535-47bb-0310-9956-ffa450edef68

If an expression in "Require expr" returns denied and
references %{REMOTE_USER}, trigger authentication and retry.
Log error if 'Require expr' fails.

PR: 52892

Backport of r1351071, r1351072 and r1351074 from trunk.

Submitted by: sf
Reviewed by: rjung, trawick
Backported by: rjung

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364266 13f79535-47bb-0310-9956-ffa450edef68

Fix typo in CHANGES.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364264 13f79535-47bb-0310-9956-ffa450edef68

Always log if LimitRequestFieldSize triggers.

Backport of r1352911 from trunk.

Submitted by: sf
Reviewed by: rjung, trawick
Backported by: rjung

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364263 13f79535-47bb-0310-9956-ffa450edef68

Fix mod_deflate NetWare build.

Backport of r1363589 from trunk.

Submitted by: normw gknw net.
Reviewed by: fuankg
Backported by: rjung

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364260 13f79535-47bb-0310-9956-ffa450edef68

Make mod_deflate skip compression if compression is enabled at SSL level.

Backport of r1359057 from trunk.

Submitted by: sf
Reviewed by: jorton, rjung
Backported by: rjung

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364253 13f79535-47bb-0310-9956-ffa450edef68

Backport 1363853:
RPM packaging: add the fcgistarter man pages to the RPM.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364089 13f79535-47bb-0310-9956-ffa450edef68

Backport 1363837:
RPM packaging: remove the epoch to be consistent with APR and APR-util.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364088 13f79535-47bb-0310-9956-ffa450edef68

Backport 1363836:
RPM packaging: The PID file goes in /var/run in the RPM layout.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364087 13f79535-47bb-0310-9956-ffa450edef68

Backport 1363832:
RPM packaging: Remove the BuildArch from the manual package, this forces
the target to "noarch" for all packages and breaks the build on CentOS5.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364086 13f79535-47bb-0310-9956-ffa450edef68

Backport 1363829:
RPM packaging: The PID file goes in /var/run in the RPM layout.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364084 13f79535-47bb-0310-9956-ffa450edef68

Merge r1363186 from trunk:  (comment only)

modernize some commentary on APEXIT_foo values

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363908 13f79535-47bb-0310-9956-ffa450edef68

Vote, promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363827 13f79535-47bb-0310-9956-ffa450edef68

another MPM fix from trunk???

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363823 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363818 13f79535-47bb-0310-9956-ffa450edef68

Backport r1341749: Simplyfy Require example.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363816 13f79535-47bb-0310-9956-ffa450edef68

Add missing HTTP status codes taken from

http://www.iana.org/assignments/http-status-codes/http-status-codes.xml

The new codes are now known and some canned error
strings are provided. The web server does not yet actually
produce them in responses or reacts on getting them
from an origin server when acting as a proxy or gateway.

Backport of r1361784, r1361791 and 1362020 from trunk.

Submitted by: rjung
Reviewed by: jorton, trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363802 13f79535-47bb-0310-9956-ffa450edef68

2.4.x ab busted on IPv6-enabled Windows, needs existing fix
(presumably busted for a lot more configurations)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363766 13f79535-47bb-0310-9956-ffa450edef68

simple fix for MinGW?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363745 13f79535-47bb-0310-9956-ffa450edef68

vote, promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363741 13f79535-47bb-0310-9956-ffa450edef68

propose some simple MPM fixes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363585 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363521 13f79535-47bb-0310-9956-ffa450edef68

Remove .* from the equation in the "<Directory ~ ..." example.
Submitted by: Daniel (comment #143 on site)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363516 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363283 13f79535-47bb-0310-9956-ffa450edef68

Add a link to the RFC explaining what 'realm' denotes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363282 13f79535-47bb-0310-9956-ffa450edef68

2009 -> 2012

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363243 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363239 13f79535-47bb-0310-9956-ffa450edef68

old/new -> foo/bar in example, so it matches the description (and the following examples)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363237 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363230 13f79535-47bb-0310-9956-ffa450edef68

Backport some long-forgotten changes from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363228 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363223 13f79535-47bb-0310-9956-ffa450edef68

Add missing highlighting

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363222 13f79535-47bb-0310-9956-ffa450edef68

Moved a </p> that was misplaced

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362952 13f79535-47bb-0310-9956-ffa450edef68

Bringing up the french translation of this page up to date

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362949 13f79535-47bb-0310-9956-ffa450edef68

Fixing the links to ProxyPass* into the note added in r1362933

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362936 13f79535-47bb-0310-9956-ffa450edef68

Adding a note about proxy performance being bad when using rewrite's [P].
Advise the use of ProxyPass* instead

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362933 13f79535-47bb-0310-9956-ffa450edef68

* Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362789 13f79535-47bb-0310-9956-ffa450edef68

Fix typo in docs, s/mod_ext-filter/mod_ext_filter/.

Backport of r1362707 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362713 13f79535-47bb-0310-9956-ffa450edef68

propose r1362538 for backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362543 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362531 13f79535-47bb-0310-9956-ffa450edef68

Merge r1362526 from trunk
Use integer operators when comparing to TIME_HOUR
Reported by Florian in comment #124

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362527 13f79535-47bb-0310-9956-ffa450edef68

Merge r1362506 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

Use integer operators when comparing to TIME_HOUR

Reported by Florian in comment#124.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362510 13f79535-47bb-0310-9956-ffa450edef68

Add a note about the list of not yet proposed
backports.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362188 13f79535-47bb-0310-9956-ffa450edef68

Update mergeinfo.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362170 13f79535-47bb-0310-9956-ffa450edef68

Reduce code drift from trunk.

Style nit.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362160 13f79535-47bb-0310-9956-ffa450edef68

sync style fix from trunk r1359881

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362158 13f79535-47bb-0310-9956-ffa450edef68

Reduce code drift from trunk.
Only whitespace/style, no functional change.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362155 13f79535-47bb-0310-9956-ffa450edef68

Try to clarify what client_ip/client_addr means
and point to useragent_ip.

Backport of r1331115 from trunk.

CTR because only comments.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362122 13f79535-47bb-0310-9956-ffa450edef68

Minor fixes in ab docs.

Backport of r1307790,1308327,1308459,1309536,
1331942,1331977 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362120 13f79535-47bb-0310-9956-ffa450edef68

Propose*2.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362067 13f79535-47bb-0310-9956-ffa450edef68

Review*2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362063 13f79535-47bb-0310-9956-ffa450edef68

r1348036 backported.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362057 13f79535-47bb-0310-9956-ffa450edef68

Merge r1348036 from trunk:

* include/util_ldap.h: Treat LDAP_UNAVAILABLE as a transient error
  with non-MS LDAP SDKs; seen with OpenLDAP against Novell eDirectory.

Submitted by: Filip Valder <filip.valder vsb.cz> (via RH bugzilla)
Reviewed by: jorton, sf, rjung

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362056 13f79535-47bb-0310-9956-ffa450edef68

Lots of votes, one proposal and one promotion.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1362040 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1361950 13f79535-47bb-0310-9956-ffa450edef68

Add information about the possible values of ProxyExpressDBMType

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1361949 13f79535-47bb-0310-9956-ffa450edef68

Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1361700 13f79535-47bb-0310-9956-ffa450edef68

Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1361676 13f79535-47bb-0310-9956-ffa450edef68

Propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1361675 13f79535-47bb-0310-9956-ffa450edef68

fix typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1361578 13f79535-47bb-0310-9956-ffa450edef68

Propose a load of backports. None of these is a blocker for 2.4.3, though.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1361577 13f79535-47bb-0310-9956-ffa450edef68

Merge 1351015:

    Adjust log message: Condition can be caused by configuration error
    not only by bugs

Only text change, therefore CTR.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1361571 13f79535-47bb-0310-9956-ffa450edef68

Merge r1359881 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

r1052419 changed the default value of Options to FollowSymlinks,
but inadvertently made "AllowOverride Options" behave like
"AllowOverride Options=FollowSymLinks".

PR53444

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1361377 13f79535-47bb-0310-9956-ffa450edef68

promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1361360 13f79535-47bb-0310-9956-ffa450edef68

Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1361319 13f79535-47bb-0310-9956-ffa450edef68

Merge r1309602 from trunk:

mod_rewrite: Fix RewriteCond integer checks to be parsed correctly.

PR: 53023
Submitted by: Axel Reinhold <apache freakout.de>
Reviewed/Updated by: nd

Submitted by: nd
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1361281 13f79535-47bb-0310-9956-ffa450edef68

promote proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1361280 13f79535-47bb-0310-9956-ffa450edef68

votes and proposal for 2.4.3

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1361279 13f79535-47bb-0310-9956-ffa450edef68

Add printf as a known function in Perl.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1361162 13f79535-47bb-0310-9956-ffa450edef68