Merge r1776575, r1776578, r1776624, r1776627, r1776674, r1776734, r1776740, r1778268, r1780725, r1781030, r1781031, r1781701, r1788674, r1789800, r1790169, r1790457, r1790691, r1806985, r1812332, r1818279 from trunk:
Merge new PROXY protocol code into mod_remoteip
Fix typo in mod_remoteip's doc
Shorten RemoteIPProxyProtocolEnable to RemoteIPProxyProtocol and correct references in docs
Move attribution for mod_remoteip RemoteIPProxyProtocol from file to CHANGES
On the trunk:
* mod_remoteip: added cast to fix clang compiler error
Reinsert attribution to mod_remoteip.c for PROXY protocol
* Silence compiler warning
Set all read buckets aside in case we need to restore all during optional header processing
* modules/metadata/mod_remoteip.c: Fix GCC strict-aliasing warning
by moving deference of header array via a different pointer type
("type-punning") out of line.
* modules/metadata/mod_remoteip.c (register_hooks,
remoteip_hook_pre_connection): Reference the filter by handle rather
than name (avoiding tree lookup by name on use).
Change tactic for PROXY processing in Optional case
Finally include feedback from Ruediger Pluem. Add slave "backoff" verified by Sander Hoentjen
Update PROXY handling by removing Optional processing
Rename RemoteIPProxyProtocolDisableHosts to RemoteIPProxyProtocolExceptions
Fix directive name in
(s/RemoteIPProxyProtocolDisableNetworks/RemoteIPProxyProtocolExceptions/)
Use cmd->cmd->name instead to be future proof.
XML update plus typo in mod_remoteip.xml.
PROXY protocol proposal corrections
Fix format pattern (%lu => %APR_SIZE_T_FMT).
Detected by maintainer mode compilation and GCC error:
.../modules/metadata/mod_remoteip.c:
In function 'remoteip_input_filter':
.../include/http_log.h:117:33:
error: format '%lu' expects argument of type
'long unsigned int', but argument 8 has type
'apr_size_t {aka unsigned int}' [-Werror=format=]
APR-ize uint types
Submitted by: druggeri, elukey, druggeri, druggeri, druggeri, icing, druggeri, rpluem, druggeri, jorton, jorton, druggeri, druggeri, druggeri, druggeri, jailletc36, lgentis, mrumph, rjung, jim
Reviewed by: druggeri, jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1824248 13f79535-47bb-0310-9956-
ffa450edef68