You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2004/04/24 13:23:15 UTC
cvs commit: httpd-2.0/server/mpm/winnt mpm_winnt.c
nd 2004/04/24 04:23:14
Modified: . CHANGES
server/mpm/winnt mpm_winnt.c
Log:
disable the use of acceptex on Win9x systems automatically
PR: 28529
Revision Changes Path
1.1468 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.1467
retrieving revision 1.1468
diff -u -u -r1.1467 -r1.1468
--- CHANGES 22 Apr 2004 07:21:54 -0000 1.1467
+++ CHANGES 24 Apr 2004 11:23:13 -0000 1.1468
@@ -2,6 +2,9 @@
[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]
1.311 +5 -0 httpd-2.0/server/mpm/winnt/mpm_winnt.c
Index: mpm_winnt.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -u -r1.310 -r1.311
--- mpm_winnt.c 28 Feb 2004 19:02:24 -0000 1.310
+++ mpm_winnt.c 24 Apr 2004 11:23:14 -0000 1.311
@@ -1364,6 +1364,11 @@
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;