disable the use of acceptex on Win9x systems automatically

PR: 28529
Reviewed by: Jeff Tawick, Bill Stoddard

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

diff --git a/CHANGES b/CHANGES
index 65942590f2d18a30ceb0f1c6b9bc44303df65fdc..5db6e8a279e67149b324c295dbed0e78eca22291 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.50
 
+  *) Restore the ability to disable the use of AcceptEx on Win9x systems
+     automatically (broken in 2.0.49). PR 28529.  [André Malo]
+
   *) <VirtualHost myhost> now applies to all IP addresses for myhost
      instead of just the first one reported by the resolver.  This
      corrects a regression since 1.3.  [Jeff Trawick]

diff --git a/STATUS b/STATUS
index 19b672819e976a95ccd3c71a9971df22f57b6237..9c4fd3108be41bb5f203e98d231da76d73fe717d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/06/11 19:39:10 $]
+Last modified at [$Date: 2004/06/11 20:27:26 $]
 
 Release:
 
@@ -112,11 +112,6 @@ PATCHES TO BACKPORT FROM 2.1
          modules/mappers/mod_actions.c: r1.32, r1.34
        +1: nd
 
-    *) Disable AcceptEx on Win9x systems automatically. (broken in 2.0.49)
-       PR 28529
-         server/mpm/winnt/mpm_winnt.c: 1.311
-       +1: nd, trawick, stoddard
-
     *) export ap_set_sub_req_protocol and ap_finalize_sub_req_protocol on Win32 and NetWare.
        (should be a minor MMN bump). PR 28523.
          server/protocol.c: r1.147

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 2cfde3fe53bead28290e89a28e093048dbc3caa8..aa52706c8743fc61fdf4554766034af3d4b50f73 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -1361,6 +1361,11 @@ static int winnt_pre_config(apr_pool_t *pconf_, apr_pool_t *plog, apr_pool_t *pt
         exit(APEXIT_INIT);
     }
 
+    /* Win9x: disable AcceptEx */
+    if (osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
+        use_acceptex = 0;
+    }
+
     ap_listen_pre_config();
     ap_threads_per_child = DEFAULT_THREADS_PER_CHILD;
     ap_pid_fname = DEFAULT_PIDLOG;