Index: src/main/http_main.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.560
diff -u -r1.560 http_main.c
--- src/main/http_main.c	2001/10/17 14:45:29	1.560
+++ src/main/http_main.c	2001/11/15 06:23:08
@@ -5911,7 +5911,8 @@
     APD2("signal prefix %s", signal_name_prefix);
 }
 
-#ifndef NETWARE
+#ifdef OLD_WIN32_PARENT_CHILD_LISTENERS
+/* ...which covers the prior ifndef NETWARE */
 static void setup_inherited_listeners(pool *p)
 {
     HANDLE pipe;
@@ -6229,13 +6230,16 @@
 	exit(0);
     }
     /* start_mutex obtained, continue into the select() loop */
+#ifdef OLD_WIN32_PARENT_CHILD_LISTENERS
     if (one_process) {
         setup_listeners(pconf);
     } else {
         /* Get listeners from the parent process */
         setup_inherited_listeners(pconf);
     }
-
+#else
+    setup_listeners(pconf);
+#endif
     if (listenmaxfd == -1) {
 	/* Help, no sockets were made, better log something and exit */
 	ap_log_error(APLOG_MARK, APLOG_CRIT|APLOG_NOERRNO, NULL,
@@ -6456,9 +6460,6 @@
 
     STARTUPINFO si;           /* Filled in prior to call to CreateProcess */
     PROCESS_INFORMATION pi;   /* filled in on call to CreateProces */
-    LPWSAPROTOCOL_INFO  lpWSAProtocolInfo;
-    listen_rec *lr;
-    DWORD BytesWritten;
     HANDLE hPipeRead = NULL;
     HANDLE hPipeWrite = NULL;
     HANDLE hPipeWriteDup;
@@ -6580,6 +6581,12 @@
         return -1;
     }
     else {
+#ifdef OLD_WIN32_PARENT_CHILD_LISTENERS
+        DWORD BytesWritten;
+        LPWSAPROTOCOL_INFO  lpWSAProtocolInfo;
+        listen_rec *lr;
+#endif
+
         ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_INFO, server_conf,
                      "Parent: Created child process %d", pi.dwProcessId);
 
@@ -6591,6 +6598,7 @@
         /* We never store the thread's handle, so close it now. */
         CloseHandle(pi.hThread);
 
+#ifdef OLD_WIN32_PARENT_CHILD_LISTENERS
         /* Run the chain of open sockets. For each socket, duplicate it 
          * for the target process then send the WSAPROTOCOL_INFO 
          * (returned by dup socket) to the child */
@@ -6619,6 +6627,7 @@
             if (lr == ap_listeners)
                 break;
         }
+#endif
     }
     CloseHandle(hPipeRead);
     CloseHandle(hPipeWrite);        
@@ -6735,13 +6744,17 @@
 	if (!is_graceful) {
 	    ap_restart_time = time(NULL);
 	}
+#ifdef OLD_WIN32_PARENT_CHILD_LISTENERS
         copy_listeners(pconf);
+#endif
 	ap_clear_pool(pconf);
 	pparent = ap_make_sub_pool(pconf);
 
 	server_conf = ap_read_config(pconf, pparent, ap_server_confname);
+#ifdef OLD_WIN32_PARENT_CHILD_LISTENERS
         setup_listeners(pconf);
-	ap_clear_pool(plog);
+#endif
+        ap_clear_pool(plog);
 	ap_open_logs(server_conf, plog);
 	ap_set_version();
 	ap_init_modules(pconf, server_conf);