Commit 269cf964 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

Fix address-in-use startup failure caused by corruption of the list of 

listen sockets in some configurations with multiple generic Listen
directives.

The logic in error is that which prunes out generic IPv4 listening
sockets when we already have a v4-mapped generic IPv6 listening 
socket for the same port.


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

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
Changes with Apache 2.3.0

  [Remove entries to the current 2.0 and 2.2 section below, when backported]









  *) 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_authn_dbd: Export any additional columns queried in the SQL select









     into the environment with the name AUTHENTICATE_<COLUMN>. This brings









     mod_authn_dbd behaviour in line with mod_authnz_ldap. [Graham Leggett]


































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