Commit 03f53ebf authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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  


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

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                        -*- 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.


































STATUS



+0
−9



























Changes for STATUS: 0 added lines, 9 removed lines.



Original line number
Diff line number
Diff line







@@ -98,15 +98,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:







        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


































server/listen.c



+3
−0



























Changes for server/listen.c: 3 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -415,6 +415,9 @@ static int open_listeners(apr_pool_t *pool)

















                /* 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