Merge r573911 from trunk:

Check all IP addresses listed in ProxyBlock
PR 36987

Submitted by: niq
Reviewed by: jim

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

diff --git a/CHANGES b/CHANGES
index 2d8761619f08dfe8b5d67ddcb966a09921fb3060..a7fe2e119bf41bc8c8489761f717300acbee9f40 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.7
 
+  *) mod_proxy: check ProxyBlock for all blocked addresses
+     PR 36987 [Timo Viipuri <timo.viipuri f-secure.com>]
+
   *) mod_proxy: Don't lose bytes when a response line arrives in small chunks.
      PR 40894 [Andrew Rucker Jones <arjones simultan.dyndns.org>]
 

diff --git a/STATUS b/STATUS
index db73cb7efaf5b485db403397deb984c732494419..25269a47007c300a3286fc50bedf3cfca8b5d59c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -94,11 +94,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       http://svn.apache.org/viewvc?view=rev&revision=573939
       +1: niq, rpluem, jim
 
-    * mod_proxy: check ProxyBlock for all blocked addresses
-      PR 36987
-      http://svn.apache.org/viewvc?view=rev&revision=573911
-      +1: niq, rpluem, jim
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mpm_winnt: Eliminate wait_for_many_objects.  Allows the clean 

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index b7f1a806d2b7f42e076c058c8b2864ea696d2ea5..d0ac438decc9e4162f48fd911a9805c299ddf63b 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -907,6 +907,7 @@ PROXY_DECLARE(int) ap_proxy_checkproxyblock(request_rec *r, proxy_server_conf *c
             return HTTP_FORBIDDEN;
         }
         while (conf_addr) {
+            uri_addr = src_uri_addr;
             while (uri_addr) {
                 char *conf_ip;
                 char *uri_ip;