*) mod_rewrite: Add RewriteOptions InheritDown, InheritDownBefore,
     and IgnoreInherit to allow RewriteRules to be pushed from parent scopes
     to child scopes without explicitly configuring each child scope.
     PR56153. 

Submitted By: Edward Lu
Committed By: covener

Submitted by: covener
Reviewed/backported by: jim


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

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

PR: 54852. Only use a dummy_connection for idle processes
Reviewed/backported by: jim


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

FreeBSD: Disable IPv4-mapped listening sockets by default for versions
5+ instead of just for FreeBSD 5.

PR: 53824

Submitted by: trawick
Reviewed/backported by: jim


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

handle POLLERR/POLLHUP during poll() to avoid high CPU busy loop.

Submitted By: Joffroy Christen <joffroy.christen solvaxis com>, Eric Covener]
Committed By: covener
 

Submitted by: covener
Reviewed/backported by: jim


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

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

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

mod_proxy_fcgi: Fix error message when an unexpected protocol version
number is received from the application.

PR: 56110

Submitted by: trawick
Reviewed/backported by: jim


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

Correct the trusted proxy match test in mod_remoteip. PR 54651.\n\nSubmitted By: Yoshinori Ehara <yoshinori ehara gmail com>\nEndorsed By: Eugene L <eugenel amazon com>\nCommited By: mrumph
Submitted by: mrumph
Reviewed/backported by: jim


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

Use the correct IP addresses to populate the proxy_ips field 
in mod_remoteip.c.  PR 55972.

Submitted by: mrumph
Reviewed/backported by: jim


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

mod_lua: Fix r:setcookie() to add, rather than replace,
the Set-Cookie header. PR56105

Submitted By: Kevin J Walters <kjw ms com>, Edward Lu <Chaosed0 gmail com>
Committed By: covener




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

Add %{CONN_REMOTE_ADDR} to mod_rewrite. PR56094

Submitted By: Edward Lu <Chaosed0 gmail com>
Committed By: covener

Submitted by: covener
Reviewed/backported by: jim


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

Backport r1564727: Fix support for uploading files by using pushlstring instead of pushstring when pushing binary data.

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

In 2.4, the MPM leaves a copy of the non-disconnected FD sitting in
context->accept_socket. This FD will be closed a second time, often
shortly after a worker picks it up in this same FD being reused.  The
first recv fails with WSAENOTSOCK since the same FD was closed in the
listener thread while the worker was pulling it off the queue

(The second close is of the underlying FD/socket, not a shared
apr_socket_t, so it's not short-circuited)

This patch makes it a bit more 2.2.x-ish and solves my problem -- the
context->accept_socket gets zapped at the bottom of the loop if
!disconnected.


Submitted by: covener
Reviewed/backported by: jim


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

of r1523974 in 9/2013, so they were in 2.4.7. retcon them
into the bottom of 2.4.7 CHANGES.


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

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

mod_session: When we have a session we were unable to decode, behave as if there was no session at all.

Submitted by: minfrin
Reviewed/backported by: jim


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

mod_session: Fix problems interpreting the SessionInclude and
SessionExclude configuration.

PR: 56038
Submitted by: Erik Pearson <erik adaptations.com>
Reviewed by: trawick

Submitted by: trawick
Reviewed/backported by: jim


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

Merge r1451633, r1451905, r1451921, r1452259, r1453981, r1501913, r1513508, r1531340, r1531370, r1531962, r1533065, r1540052 from trunk:

Add in rough uds support (Bugx 54101) from Blaise Tarr <blaise.tarr@gmail.com>

Make AF_UNIX aware... fix Windows/Netware??

Follow-up to r1451905 to fix NetWare/Windows compilation.


apr trunk-able


message tag for dom sock

Note about new UDS support

UDS subsequent request on a connection fix

Reformat the UDS support inline with a new naming structure.
Use a flag for speed for testing.

syntax sugar... if the worker is associated w/ a UDS,
then make sure the log reporting has a visual clue.

Ensure that userland format of UDS is the same as how it is
configured, no matter how we store and use it internally.

Eclipse code analysis warning

UDS urls need to be desockified when configuring...
Submitted by: jim, fuankg, jim, jim, druggeri, druggeri, jim, jim, jim, jim, jim
Reviewed/backported by: jim


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

Providers defined in <AuthnProviderAlias have not been usable under
in virtual hosts since migrating from mod_authn_alias to mod_authn_core.
PR 55622.


Submitted by: covener
Reviewed/backported by: jim


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

Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.


Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.

Document r1524368 in CHANGES.

Submitted by: jkaluza
Reviewed/backported by: jim


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

Explicitly list in which directories to look for config*.m4 files.

If some distributor patches a config*.m4 file with quilt, that will
place a copy of the original file in .pc/ . Doing a naive "find ."
will then cause both the original and the patched m4 file to be included,
causing havoc later on.

PR: 55787

Submitted by: sf
Reviewed by: trawick, covener


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

mod_cache_disk: Fix potential hangs on Windows when using mod_cache_disk.

PR: 55833
Submitted by: covener
Reviewed by: jim, trawick


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

Add support for OpenSSL configuration commands by introducing
the SSLOpenSSLConfCmd directive.

Proposed by: kbrand
Reviewed by: drh, trawick


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

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

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

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

Remove <Proxy ~ wildcard-url> syntax which:
   - is equivalent to <ProxyMatch wildcard-url>
   - has never been documented
   - incorrectly checks parameters (!cmd->path should be !cmd->path[0])
   - is buggy (! is missing in front of strncasecmp)
Submitted by: jailletc36
Reviewed/backported by: jim


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

mod_authz_user: Support the expression parser within the require directives.

Submitted by: minfrin
Reviewed/backported by: jim


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

mod_authnz_host: Support the expression parser within the require directives.

Submitted by: minfrin
Reviewed/backported by: jim


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

mod_authnz_groupfile: Support the expression parser within the require directives.


Pass the correct pointer that made it past the test suite.

Submitted by: minfrin
Reviewed/backported by: jim


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

mod_authnz_dbm: Support the expression parser within the require directives.


Pass the correct pointer that made it past the test suite.

Submitted by: minfrin
Reviewed/backported by: jim


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

mod_authnz_dbd: Support the expression parser within the require directives.


Pass the correct pointer that made it past the test suite.

Submitted by: minfrin
Reviewed/backported by: jim


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

mod_authnz_ldap: Support the expression parser within the require
directives.

Submitted by: minfrin
Reviewed/backported by: jim


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

trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1534321
             http://svn.apache.org/viewvc?view=revision&revision=1550061

Submitted by: Jan Kaluza <jkaluza redhat.com>
Reviewed by: jim, jorton, minfrin


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

mod_socache_shmcb.c: Remove arbitrary restriction on shared memory size
previously limited to 64MB.


Limit SHMCB_MAX_SIZE to min(UINT_MAX, APR_SIZE_MAX) to match the current code

Submitted by: minfrin, sf
Reviewed/backported by: jim


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

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

to the 2.4.x branch in r1542560


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

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

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