From: Nick Kew <niq@apache.org>
Date: Sat, 8 Sep 2007 21:43:47 +0000 (+0000)
Subject: Check all IP addresses listed in ProxyBlock
X-Git-Tag: 2.3.0~1442
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c763f831e43e79edec166c32108b47ad5039fde;p=thirdparty%2Fapache%2Fhttpd.git

Check all IP addresses listed in ProxyBlock
PR 36987


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@573911 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 3eccf04be51..7c1a1d0f0c1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) 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/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 6a7e9daef91..17085ac5c50 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -906,6 +906,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;