(SSL failures on Windows with AcceptFilter https none)?

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

ab fixes

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

remove a non-controversial concept vote, replace with a real example

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

xforms

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

Remove reference to the iPlanet SDK, as it doesn't seem to exist anymore

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

Update links that were either broken of just slightly off

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

Committed revision 1371208

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

Merge r1369995, r1369999, r1370001 from trunk:

Use apr_pcalloc for rewritemap_entry struct, to avoid uninitialized entries.

PR: 53663
Submitted by: Mikhail T. <mi apache aldan algebra com>

remove now unecessary assignment

Add changes entry for r1369995, r1369999

Submitted by: sf
Reviewed/backported by: jim

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

promote patch

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

Votes on prposals

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

NetWare build tweaks.
mwccnlm: search directory of referencing file first for #includes.
(backport r1370592, 1370615)
Make use of CFLAGS from environment.
Added default maxerrors value 1 so that the compiler breaks
after 1st error; can be overwritten with CC_MAX_ERRORS var.
(backport 1370616)

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

Added new symbol introduced with r1366693.

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

xforms

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

typo fixes

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

typo fix

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

conceptual proposals

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

grab r1370907 from trunk:

fix subversion project URL

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

xforms

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

grab 1370764 from trunk:

fix broken module identifiers

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

Vote.

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

xforms

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

fix grammar and remove some scopes within which some directives do not work

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

Update proposal

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

propose, comment

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

Update.

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

Push out

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

Update proposal

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

Fix proposal

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

Comment.

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

xforms

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

clarify that the 2.4 pidfile APIs process paths relative to ServerRoot

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

Propose + vote

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

Up to date with .en version of the document.

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

Fixing link as reported by Louise Hope @ http://httpd.apache.org/docs/2.2/howto/htaccess.html#comment_184

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

Fix revision number in backport proposal.

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

Propose + vote

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

Adding new .fr translation for mod_session documentation.

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

merge r1364709 from trunk:

doc fixes for r1299718:

The value of ScriptSock is relative to DefaultRuntimeDir.

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

mod_ssl: Add new directive SSLCompression to disable
TLS-level compression.

PR 53219.

Backport of r1345319 and r1348656 from trunk.

Submitted by: Bjoern Jacke <bjoern j3e de>, sf
Reviewed by: rjung, trawick
Backported by: rjung

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

Merge r1369568 from trunk:

bytes is not a unit of filename

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

SSLCompression directive approved

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

Big mod_lua backport:

r1201460: Add some todos from apachecon notes.
          Submitted by: covener

r1351012: Change prototype of vm_construct, to work around gcc bug which
          causes a segfault.  PR: 52779
          Submitted by: Dick Snippe <Dick Snippe tech omroep nl>

r1351013: Allow tail call optimization in log methods, remove foo method.
          Submitted by: sf

r1351014: Add a few missing request_rec fields. Rename remote_ip to
          client_ip to match conn_rec.
          Submitted by: sf

r1351017: Change various strings from char * to const char *.
          Submitted by: sf

r1351018: Factor common code into utility function.
          Also improve logging a bit and adjust some log levels.
          Submitted by: sf

r1351019: Use macro to make definition of integer fields more compact.
          Submitted by: sf

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

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

MPM event:
- Keep track of the number of clogged, lingering, and suspended connections.
- Don't count connections in lingering close state when calculating
  how many additional connections may be accepted

Backport of r1361773 and r 1361778 from trunk.

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

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

mod_ssl: Pass the server_rec to ssl_die() and use it to log a message to
the main error log, pointing to the appropriate virtual host error log.

Backport of r1348660 from trunk.

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

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

grab r1369435 from trunk:

fix documented default value of ScoreBoardFile

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

grab r1369300 and 1369431 from trunk:

mention migration from ap_requires() and to ap_runtime_dir_relative()

fix formatting of DEFAULT_REL_RUNTIMEDIR

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

Merge r1369419:

r1364253  added and include to mod_ssl.h
Show the compiler where to find it

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

revert r1369191

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

vote & promote

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

+1 for lua resynch

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

r1364253 forces the build to find mod_ssl.h
This should be CTR, feel free to revert if you do
not like this way of finding the required header.

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

merged

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

Merge r1366319 from trunk:

ap_str(case)cmp_match returns the opposite of what is advertized in the header.
Submitted by: humbedooh
Reviewed/backported by: jim

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

Merge r1361766 from trunk:

Simplify handling of MaxConnectionsPerChild

If we decrement the counter at accept time and not at close time,
we only need to access the counter in the listener thread and the
code gets much simpler.

Submitted by: sf
Reviewed/backported by: jim

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

Merge r1351016 from trunk:

pass the provider name to parse_require_line as pool userdata

This allows a single C function to implement several authz providers.

Submitted by: sf
Reviewed/backported by: jim

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

Merge r1334343 from trunk:

Use short lived pool to avoid memory leaks

Remove the comment about binding upstream and downstream connections. It
seems to be obsolete since r104604, r104605, r105108.

Also avoid allocating memory if we are not handling the connection.

PR: 52275
Submitted by: Naohiro Ooiwa <naohiro ooiwa miraclelinux com>, Stefan Fritsch

Submitted by: sf
Reviewed/backported by: jim

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

Merge r1324760 from trunk:

Your APR does not include SSL/EVP support. Yes, but how do I enable it? --with-crypto
Submitted by: igalic
Reviewed/backported by: jim

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

Merge r1242798 from trunk:

* modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response):
  Treat EAGAIN as an error for a blocking read from the input filter
  stack.

Submitted by: jorton
Reviewed/backported by: jim

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

promotion

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

Votes

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

Propose sync of sf's fixes/refactoring in mod_lua, so we can get the ball rolling on the rest of the changes.

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

xforms.

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

Remove anchor with dublicate id.

Backport of r1368094 from trunk.

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

Complete docs metadata (sourcefile and identifier)
for mod_unixd and mod_privileges.

Backport of r1368058 from trunk.

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

Add a docs link to a configuration example.

Backport of r1368053 from trunk.

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

Dropping the LuaCodeCache proposal until we get the rest of the backports sorted out (tba).

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

xforms

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

Fix an XML bug in the french translation of mod_proxy_html

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

add a missing </p>

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

Change the external reference to mod_proxy_html to an internal one.

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

Fix typo in docs
(miscomception ->misconception)

Backport of r1367778 from trunk.

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

xforms

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

Remove [max|min max] from the LuaScope syntax, since the 'server' scope is not implemented yet.
Add the 'thread' value to the list of possible scopes

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

some votes

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

Propose (see note in diff)

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

correct mis-vote in r1366668

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

Vote

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

Another easy backport. Only header correction,
probably even CTR?

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

Add merge info for r1363908 (r1363186).

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

Add mergeinfo for r1365604 (1365479)
and r1366693 (1365001, 1365020, 1365029).

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

Add some backport proposals. Most of them pretty
small and easy to review.

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

xforms

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

LuaQuickHandler had no syntax, which made the reference sheet look wrong.

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

Comment out LuaCodeCache, which hasn't been implemented yet.

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

   * mod_proxy*: ProxyBlock fixes; PR 43697 and more.
        trunk patch: http://svn.apache.org/viewvc?rev=1365001&view=rev and
                          http://svn.apache.org/viewvc?rev=1365020&view=rev and
                                            http://svn.apache.org/viewvc?rev=1365029&view=rev
                                                 2.4.x patch: http://people.apache.org/~jorton/ap_proxyblock-24x-v2.diff [avoids major MMN bump]
                                                      +1: jorton, rjung, jim

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

Merge r1366344 from trunk:

mod_proxy_balancer: Restore balancing after a failed worker has
recovered when using lbmethod_bybusyness.

PR: 48735

Markus Stoll and Adam C both submitted patches against 2.2.x
to bug 48735.  Compared with those two, this solution

1. resets the busy field in the error-ed worker at the end of
   the request instead of at recovery time
2. leaves the lbstatus field alone
3. covers all possible scenarios where the busy field in the
   error-ed worker needs to be adjusted, since a cleanup to
   perform the decrement is registered at the point of the
   increment

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1366621 from trunk:

LUA_COMPAT_ALL should be defined _before_ including lua headers
Submitted by: humbedooh
Reviewed/backported by: jim

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

Promote

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

Votes on proposals

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

quick votes

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

Propose

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

this is one way to get eyes on a patch...

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

mod_setenvif: Compile the regex used by is_header_regex() only once
during startup This should save some memory, especially with .htaccess

Backport of r1343099.

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

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

Add the port number to the vhost's name in scoreboard.

Backport of r1294358 from trunk.

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

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

Remove historic comment.

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

vote

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

Vote + promote

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

r1365479 done.

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

Merge r1365479 from trunk:

* modules/proxy/proxy_util.c (ap_proxy_location_reverse_map): Fix
  to skip balancer:// prefix where applicable.

Reviewed by: jorton, jim, rjung
PR: 45434 (regressed since 2.2)

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

Fixes for proxyblock patch - thanks to rjung.

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