httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r574942 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/proxy/proxy_util.c
Date Wed, 12 Sep 2007 13:17:46 GMT
Author: jim
Date: Wed Sep 12 06:17:46 2007
New Revision: 574942

URL: http://svn.apache.org/viewvc?rev=574942&view=rev
Log:
Merge r573911 from trunk:

Check all IP addresses listed in ProxyBlock
PR 36987

Submitted by: niq
Reviewed by: jim

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=574942&r1=574941&r2=574942&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Wed Sep 12 06:17:46 2007
@@ -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>]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=574942&r1=574941&r2=574942&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Sep 12 06:17:46 2007
@@ -94,11 +94,6 @@
       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 

Modified: httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c?rev=574942&r1=574941&r2=574942&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c Wed Sep 12 06:17:46 2007
@@ -907,6 +907,7 @@
             return HTTP_FORBIDDEN;
         }
         while (conf_addr) {
+            uri_addr = src_uri_addr;
             while (uri_addr) {
                 char *conf_ip;
                 char *uri_ip;



Mime
View raw message