You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2014/02/17 15:12:31 UTC
svn commit: r1569006 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
modules/metadata/mod_remoteip.c
Author: jim
Date: Mon Feb 17 14:12:30 2014
New Revision: 1569006
URL: http://svn.apache.org/r1569006
Log:
Merge r1564052 from trunk:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1564052
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1569006&r1=1569005&r2=1569006&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Feb 17 14:12:30 2014
@@ -2,6 +2,9 @@
Changes with Apache 2.4.8
+ *) mod_remoteip: Correct the trusted proxy match test. PR 54651.
+ [Yoshinori Ehara <yoshinori ehara gmail com>, Eugene L <eugenel amazon com>]
+
*) mod_remoteip: Use the correct IP addresses to populate the proxy_ips field.
PR 55972. [Mike Rumph]
Modified: httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c?rev=1569006&r1=1569005&r2=1569006&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c (original)
+++ httpd/httpd/branches/2.4.x/modules/metadata/mod_remoteip.c Mon Feb 17 14:12:30 2014
@@ -246,14 +246,14 @@ static int remoteip_modify_request(reque
while (remote) {
- /* verify c->client_addr is trusted if there is a trusted proxy list
+ /* verify user agent IP against the trusted proxy list
*/
if (config->proxymatch_ip) {
int i;
remoteip_proxymatch_t *match;
match = (remoteip_proxymatch_t *)config->proxymatch_ip->elts;
for (i = 0; i < config->proxymatch_ip->nelts; ++i) {
- if (apr_ipsubnet_test(match[i].ip, c->client_addr)) {
+ if (apr_ipsubnet_test(match[i].ip, temp_sa)) {
internal = match[i].internal;
break;
}