]> granicus.if.org Git - apache/commit
projects / apache / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 92f77bd) | patch
Merge r1832580, r1832581 from trunk:
authorJim Jagielski <jim@apache.org>
Wed, 6 Jun 2018 19:04:45 +0000 (19:04 +0000)
committerJim Jagielski <jim@apache.org>
Wed, 6 Jun 2018 19:04:45 +0000 (19:04 +0000)
commita5358d3bf97cebd373820681dc4c6cf6dc176a62
tree2d7036efe77fe2eae7b6dd97fd408361d9d07054tree | snapshot
parent92f77bdd2cee184779e06b46411c2cb26c1e12f6commit | diff
Merge r1832580, r1832581 from trunk:

mod_remoteip: Fix RemoteIP{Trusted,Internal}ProxyList loading broken by 2.4.30.

Overwriting server config in pre_config hook breaks EXEC_ON_READ directives,
it's automatically created on purpose anyway.

PR 62220.

Follow up to r1832580: correct CHANGES entry.
Submitted by: ylavic
Reviewed by: ylavic, wrowe, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833070 13f79535-47bb-0310-9956-ffa450edef68
CHANGES diff | blob | history
STATUS diff | blob | history
modules/metadata/mod_remoteip.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.