From: Bill Stoddard <stoddard@apache.org>
Date: Thu, 25 Mar 2004 02:32:54 +0000 (+0000)
Subject: Fix crash when Apache was started with no Listen directives.
X-Git-Tag: 2.0.50~287
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e12b445780f7080fcfe9da3ac93e938f0aefe7d4;p=thirdparty%2Fapache%2Fhttpd.git

Fix crash when Apache was started with no Listen directives.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103148 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 6cbcae59be7..21d08246f3d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.50
 
+  *) Fix crash when Apache was started with no Listen directives.
+     [Michael Corcoran <mcorcoran warpsolutions.com>]
+
   *) core_output_filter: Fix bug that could result in sending
      garbage over the network when module handlers construct
      bucket brigades containing multiple file buckets all referencing
diff --git a/STATUS b/STATUS
index b0133586a68..e89b8edd842 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/03/25 02:20:27 $]
+Last modified at [$Date: 2004/03/25 02:32:52 $]
 
 Release:
 
@@ -88,11 +88,6 @@ PATCHES TO BACKPORT FROM 2.1
            modules/dav/fs/lock.c: r1.31
        +1: trawick
 
-    *) Michael Corcoran's patch to listen.c to avoid segfault when
-       there are no Listen directives.
-           server/listen.c: r1.101
-       +1: trawick, stoddard, rederpj
-
     *) Limit the concurrency in 'ab' to MAX_CONCURRENCY to prevent a 
        segmentation fault.
            support/ab.c: r1.140, r1.141
diff --git a/server/listen.c b/server/listen.c
index cad3fc90aed..28933e14089 100644
--- a/server/listen.c
+++ b/server/listen.c
@@ -335,7 +335,7 @@ static int ap_listen_open(apr_pool_t *pool, apr_port_t port)
      * 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;