xforms

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

Fix old comment from Martijn

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

On the 2.4.x branch:

mod_http2: removing debug logs leftover in previous commit

* modules/http2/h2_bucket_beam.c
 removed log warnings from debug session

Modified:
   httpd/httpd/trunk/modules/http2/h2_bucket_beam.c

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

On the 2.4.x branch: merge of r1775833 from trunk:

Cleanup mod_http2 beamer registry on server reload. Fixes PR60510.

* modules/http2/h2_bucket_beam.c
  register cleanup function on installation that NULLs the beamer
  registry on pool cleanup.

Patch by: Pavel Mateja <pavel@verotel.cz
         me

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

Merge r1775770 from trunk:

pass along error buckets

In 2.4, they are generated by LimitRequestBody failures. trunk no
longer uses error buckets in this path, but someone else could.

PR60375

Submitted By: Eric Covener,Lubos Uhliarik <luhliari  redhat.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@1775832 13f79535-47bb-0310-9956-ffa450edef68

promote

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

vote

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

Merge r1775195 from trunk:

http_header_filter: on check_headers() failure, use AP_FILTER_ERROR and EOC
semantics to respectively warn the caller and cleanly terminate the connection
afterwards.

Suggested by: rpluem

Submitted by: ylavic
Reviewed/backported by: jim

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

Merge r1775199, r1775664 from trunk:

Fix strict Host: header checking on EBCDIC

on zOS, isascii() really means 7 bit ascii, but our strings
are in ebcdic for 99.95% of the lifetime of the server.

remove initial isascii check entirely

We are already checking an even narrower set of characters
just below.

Submitted by: covener
Reviewed/backported by: jim

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

Merge r1775173 from trunk:

Silence compiler warning:
"686: warning: 'ok' may be used uninitialized in
this function"
This is a false positive, because the value of "ok"
will only be used if stapling_get_cached_response()
sets "rsp" to non-NULL in which case it will always
have set "ok".

Submitted by: rjung
Reviewed/backported by: jim

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

Merge r1741570 from trunk:

* Silence compiler warning
Submitted by: rpluem
Reviewed/backported by: jim

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

On the 2.4.x branch:

mod_http2: version bump after backport

* modules/http2/h2_version.h: increased version number

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

On the 2.4.x branch:

Merge r1775813 from trunk:

Fix mod_h2/github issue #126: correct lifetime of data sent on temp pools

* modules/http2/h2_bucket_beam.c
 - ignore send pools that are sub-pools of the existing one
 - added h2_beam_send_from() to allow explicit registering of the
   correct pool for the sending

* modules/http2/h2_bucket_beam.h
 - add prototype for h2_beam_send_from()

* modules/http2/h2_mplx.c
 - adding logging of output beam state

* modules/http2/h2_stream.c
 - register stream pool for sending data on input beam

* modules/http2/h2_task.c
 - register task pool on output beam on creation
 - adding trace logging

* modules/http2/h2_proxy_session.c
 - fixing a type in a comment while we're at it

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

Vote, Promote.

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

Propose.

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

propose ext_filter fix

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

solid morning... votes

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

axe the check entirely

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

fcgi patch

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

* Add proposal

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

update viewvc shortcut

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

ebcdic fix

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

assign logno from trunk

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

Propose.

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

Propose.

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

Rebuild.

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

XML update.

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

Fix exported .mak output of mod_socache_memcache for '../generators' dependency

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

and we are now 2.4.26-dev

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

Roll on 2.4.25

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

Merge r1774609 from trunk:

Add ../generators to include path for Windows
build of mod_socache_memcache. It now needs
mod_status.h.

Untested but exactly analogous to what works for
mod_socache_shmcb and others.

Submitted by: rjung
Reviewed/backported by: jim

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

note CHANGES

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

Merge r1706595 from trunk:

Follow-up to r1702948:

APR_HAVE_foo is checked via #if, not #ifdef (since it should always be
defined, to either 0 or 1)

This fixes a compile error on Windows introduced by r1702948
as well as straightens up two long-time glitches.

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1774602 from trunk:

Use correct format pattern, "%lu" is wrong for
apr_uint64_t on some platforms.

Followup to r1649491.

Submitted by: rjung
Reviewed/backported by: jim

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

Vote, promote.

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

vote...

and Good Catch!

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

And another proposal.

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

Some votes

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

Propose.

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

Propose simple fix observed during 2.4.24
test builds.

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

xforms

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

And we are 2.4.25-dev

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

Get ready to tag 2.4.24

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

revoke

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

Propose.

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

Note.

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

kill 'em early

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

Documentation rebuild.

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

Added a note to mod_ratelimit's documentation.

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

Documentation rebuild

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

Translation variations after doc rebuild

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

documentation rebuild

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

Merge r1772357, r1772399, r1772512 from trunk:

Add a section to mpm-event's documentation to advertise new changes

I tried to add a summary of Stefan's last patches just backported to
2.4.x today. I've read all of them and tried to report Stefan's comment
from PR 53555 as much as possible. Please review and let me know if I wrong
something incorrect or not precise enough.

Fixed some wording in mpm-event's doc page

Added some notes in mpm-event's doc page

Submitted by: elukey

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

Merge r1774286 from trunk:

Follow up to r1773761: restore EOC semantic.

Submitted by: ylavic
Reviewed/backported by: jim

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

promote

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

vote

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

* Vote

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

remove this showstopper, no longer anything contentious

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

Merge r1774288 from trunk:

short-circuit some kinds of looping in RewriteRule.

PR60478

Submitted By: Jeff Wheelouse <apache wheelhouse.org>
Committed By: covener

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

Promote

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

Vote.

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

propose

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

Propose.

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

update transformations.

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

update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by:  Orhan Berent <berent belgeler.gen.tr>

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

Merge r1770951, r1774008, r1774068, r1774069 from trunk:

Allow for initual burst at full speed

Some "error" reporting if we overflow

rate limit notes

xhtml

Reviewed/backported by: jim

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

Vote + Promote

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

Document CHANGES

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

xform

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

Merge r1774023 from trunk:

add buzz word

Reviewed/backported by: jim

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

Merge r1774018 from trunk:

html elements

Reviewed/backported by: jim

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

Merge r1768245, r1770828 from trunk:

heh... bring memcache up to redis :)
mod_status info

From Norm:
NWGNUsocachmem needs to find mod_status.h

Reviewed/backported by: jim

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

promote simple status patch

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

note logging patch

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

Merge r1773293, r1773761, r1773779, r1773812, r1773861, r1773862, r1773865 from trunk:

change error handling for bad resp headers

 - avoid looping between ap_die and the http filter
 - remove the header that failed the check
 - keep calling apr_table_do until our fn stops matching

This is still not great. We get the original body, a 500 status
code and status line.

(r1773285 + fix for first return from check_headers)

Follow up to r1773293.
When check_headers() fails, clear anything (headers and body) from original/errorneous
response before returning 500.

Follow up to r1773761: don't check_headers() more than once.

Follow up to r1773761: don't recurse on internal redirects.

Follow up to r1773761: don't recurse on ap_send_error_response() either.

Follow up to r1773761: we need to check both ap_send_error_response() and internal redirect recursions.

Follow up to r1773761: improved recursion detection.
Submitted by: covener, ylavic, ylavic, ylavic, ylavic, ylavic, ylavic
Reviewed/backported by: jim

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

tested and voted

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

vote

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

Provide all-in-one patch to ease review.

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

This is looking solid

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

Duplicate.

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

Propose.

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

some context

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

drop proposal

surafe two showstoppers discussed elsewhere in STATUS

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

Merge r1773162 from trunk:

After eliminating unusual whitespace in Unsafe mode (e.g. \f \v), we are left
with the same behavior in both of these cases. Simplify. Noted by rpluem.

Submitted by: wrowe
Reviewed/backported by: jim

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

Merge r1773159 from trunk:

Partial port of proposed r1773158 for httpd-2.x only; this change causes all
illegible protocol args to be rejected, irrespective of the strict toggle as
we expect this to occur with a garbage raw SP embedded in the request URI.

Simplifies the code using the protocol 0.9 sentinal to set up an http/1.0
error response.

String duplication of r1773158 is uninteresting, httpd-2.x has a const protocol
member.

Submitted by: rpluem, wrowe

Submitted by: wrowe
Reviewed/backported by: jim

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

Merge r1773346 from trunk:

Drop C-L header and message-body from HTTP 204 responses.

The C-L header can be set in a fcgi/cgi backend or in other
filters like ap_content_length_filter (with the value of 0),
meanwhile the message-body can be returned incorrectly
by any backend. The idea is to remove unnecessary bytes
from a HTTP 204 response.

PR 51350

Submitted by: elukey
Reviewed/backported by: jim

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

Merge r1773397 from trunk:

ProxyPass ! doesn't block per-directory ProxyPass

 *) mod_proxy: Honor a server scoped ProxyPass exception when ProxyPass is
     configured in <Location>, like in 2.2. PR 60458.
     [Eric Covener]

Submitted by: covener
Reviewed/backported by: jim

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

Vote, promote, note.

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

One doesn't seem like the right fix, another appears to be.

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

Propose + vote

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

votes

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

propose

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

propose PR60458

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

80 col

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

update transformation

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

votes

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

xforms

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

cgi "most common"

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

Two issues noted by rpluem

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

Meant to commit this to the merge branch for consideration; reverting r1773158

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