You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2004/03/19 12:19:37 UTC
cvs commit: httpd-2.0/server listen.c
trawick 2004/03/19 03:19:37
Modified: . CHANGES
server listen.c
Log:
Fix crash when Apache was started with no Listen directives.
Submitted by: Michael Corcoran <mcorcoran warpsolutions.com>
Reviewed by: Jeff Trawick
Revision Changes Path
1.1430 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.1429
retrieving revision 1.1430
diff -u -r1.1429 -r1.1430
--- CHANGES 19 Mar 2004 11:16:02 -0000 1.1429
+++ CHANGES 19 Mar 2004 11:19:37 -0000 1.1430
@@ -2,6 +2,9 @@
[Remove entries to the current 2.0 section below, when backported]
+ *) Fix crash when Apache was started with no Listen directives.
+ [Michael Corcoran <mcorcoran warpsolutions.com>]
+
*) mod_dav: Fix a problem that could cause crashes when manipulating
locks on some platforms. [Jeff Trawick]
1.101 +1 -1 httpd-2.0/server/listen.c
Index: listen.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/listen.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- listen.c 19 Mar 2004 11:16:03 -0000 1.100
+++ listen.c 19 Mar 2004 11:19:37 -0000 1.101
@@ -389,7 +389,7 @@
* is already forgotten about by the time we call accept, we won't
* be hung until another connection arrives on that port
*/
- if (ap_listeners->next) {
+ if (ap_listeners && ap_listeners->next) {
for (lr = ap_listeners; lr; lr = lr->next) {
apr_status_t status;