This change keeps the server from allowing multiple instances to bind to

the same port.  Previously, this was necessary, because the Windows MPM
was binding to the socket in both the parent and child.  Today's code
passes the attached socket to the child from the parent, so we don't need
to re-attach in the child.

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

diff --git a/STATUS b/STATUS
index 473cf29a2572f4552de4de66a0665e5cdcbd5145..12c19dd83bc083355dfede56f7321688cba43ae6 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                             -*-text-*-
-Last modified at [$Date: 2002/02/05 04:38:18 $]
+Last modified at [$Date: 2002/02/05 06:16:03 $]
 
 Release:
 
@@ -92,11 +92,6 @@ RELEASE SHOWSTOPPERS:
             * anon shared memory not allocating enough 
                 (fix is apr/shm/unix/shm.c 1.14)
 
-    * Win32 allows multiple processes to attach to the same port.  This
-      means that I can open three DOS prompts, and run the same Apache
-      binary with the same config file three different times, and the
-      server won't complain.
-
     * ap_directory_walk skips some per-dir config merge functions
       if there is no "<Directory />" block in the configuration
         Message-ID: <m3itbdiijq.fsf@rdu163-40-092.nc.rr.com>

diff --git a/server/listen.c b/server/listen.c
index b94f3f10ac0ac993a5dc4e422141ecf04688d037..4f06f44e39dfc1a33e8cca6dc853ef4674b47c4a 100644 (file)
--- a/server/listen.c
+++ b/server/listen.c
@@ -89,15 +89,6 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
     int one = 1;
     apr_status_t stat;
 
-    stat = apr_setsocketopt(s, APR_SO_REUSEADDR, one);
-    if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
-        ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
-                    "make_sock: for address %pI, setsockopt: (SO_REUSEADDR)", 
-                     server->bind_addr);
-        apr_socket_close(s);
-        return stat;
-    }
-    
     stat = apr_setsocketopt(s, APR_SO_KEEPALIVE, one);
     if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
         ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,