From: André Malo <nd@apache.org>
Date: Sat, 24 Apr 2004 11:23:14 +0000 (+0000)
Subject: disable the use of acceptex on Win9x systems automatically
X-Git-Tag: pre_ajp_proxy~329
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=892380b0e33e616fd942d00650b86c43bd472be3;p=apache

disable the use of acceptex on Win9x systems automatically

PR: 28529


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

diff --git a/CHANGES b/CHANGES
index af25689ae6..8a1ba1f4ff 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Restore the ability to disable the use of AcceptEx on Win9x systems
+     automatically. PR 28529.  [André Malo]
+
   *) ap_set_sub_req_protocol and ap_finalize_sub_req_protocol are now
      exported on Win32 as well.  PR 28523.
      [Edward Rudd <eddie omegaware.com>, André Malo]
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 578c88fa7d..7dd58c444e 100644
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -1364,6 +1364,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;