httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r483958 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS server/listen.c
Date Fri, 08 Dec 2006 12:23:37 GMT
Author: trawick
Date: Fri Dec  8 04:23:33 2006
New Revision: 483958

URL: http://svn.apache.org/viewvc?view=rev&rev=483958
Log:
backport simple list manipulation fix:

  *) Fix address-in-use startup failure caused by corruption of the list of
     listen sockets in some configurations with multiple generic Listen
     directives.  [Jeff Trawick]

Reviewed by: jim, wrowe  

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/server/listen.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=483958&r1=483957&r2=483958
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Dec  8 04:23:33 2006
@@ -1,6 +1,10 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.4
 
+  *) Fix address-in-use startup failure caused by corruption of the list of
+     listen sockets in some configurations with multiple generic Listen
+     directives.  [Jeff Trawick]
+
   *) mod_headers: support regexp-based editing of HTTP headers [Nick Kew]
 
    * mod_proxy: Add explicit flushing feature.

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=483958&r1=483957&r2=483958
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Dec  8 04:23:33 2006
@@ -98,15 +98,6 @@
         Trunk version works
       +1: rpluem, trawick, wrowe
 
-   * Fix address-in-use startup failure caused by corruption of the list of
-     listen sockets in some configurations with multiple generic Listen
-     directives.
-     Trunk version of patch:
-       http://svn.apache.org/viewvc?view=rev&revision=467034
-     2.2.x version of patch:
-       Trunk version works
-     +1: trawick, jim, wrowe
-
    * mod_dbd: Key the storage of prepared statements on the hex string
      value of server_rec, rather than the server name, as the server name
      may change (eg when the server name is set) at any time, causing

Modified: httpd/httpd/branches/2.2.x/server/listen.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/listen.c?view=diff&rev=483958&r1=483957&r2=483958
==============================================================================
--- httpd/httpd/branches/2.2.x/server/listen.c (original)
+++ httpd/httpd/branches/2.2.x/server/listen.c Fri Dec  8 04:23:33 2006
@@ -415,6 +415,9 @@
 
                 /* Remove the current listener from the list */
                 previous->next = lr->next;
+                lr = previous; /* maintain current value of previous after
+                                * post-loop expression is evaluated
+                                */
                 continue;
             }
 #endif



Mime
View raw message