From c1644afbcbf4e53ac6248fc78c36fcd657d27811 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andr=C3=A9=20Malo?=
Date: Tue, 9 Mar 2004 20:47:46 +0000
Subject: [PATCH] backport changes from 2.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@102915 13f79535-47bb-0310-9956-ffa450edef68
---
docs/manual/mod/mpm_winnt.html.en | 22 +++++++++++++------
docs/manual/mod/mpm_winnt.xml | 22 +++++++++++++------
docs/manual/mod/quickreference.html.en | 2 +-
docs/manual/mod/quickreference.html.ru.koi8-r | 2 +-
4 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/docs/manual/mod/mpm_winnt.html.en b/docs/manual/mod/mpm_winnt.html.en
index cc028aee2c9..935abf395f3 100644
--- a/docs/manual/mod/mpm_winnt.html.en
+++ b/docs/manual/mod/mpm_winnt.html.en
@@ -56,21 +56,29 @@ NT.

-| Description: | This directive instructs the MPM to use accept() rather than AcceptEx() to accept network connections |
+| Description: | Use accept() rather than AcceptEx() to accept network connections |
| Syntax: | Win32DisableAcceptEx |
-| Default: | AcceptEx is enabled by default. Use this directive to disable use of AcceptEx |
+| Default: | AcceptEx() is enabled by default. Use this directive to disable use of
+ AcceptEx() |
| Context: | server config |
| Status: | MPM |
| Module: | mpm_winnt |
+| Compatibility: | Available in Version 2.0.49 and later |
-
AcceptEx() is a Microsoft WinSock v2 API that provides
+
AcceptEx() is a Microsoft WinSock v2 API that provides
some performance improvements over the use of the BSD style
- accept() API in certain circumstances. Some popular Windows
+ accept() API in certain circumstances. Some popular Windows
products, typically virus scanning or virtual private network
packages, have bugs that interfere with the proper operation of
- AcceptEx(). If you encounter any of the conditions described
- in the FAQ, you should use this directive to disable the use
- of AcceptEx().
+
AcceptEx(). If you encounter an error condition like:
+
+
+ [error] (730038)An operation was attempted on something that is
+ not a socket.: winnt_accept: AcceptEx failed. Attempting to recover.
+
+
+
you should use this directive to disable the use of
+ AcceptEx().
diff --git a/docs/manual/mod/mpm_winnt.xml b/docs/manual/mod/mpm_winnt.xml
index c8f0b8e25ed..8f24444f455 100644
--- a/docs/manual/mod/mpm_winnt.xml
+++ b/docs/manual/mod/mpm_winnt.xml
@@ -57,20 +57,28 @@ NT.
Win32DisableAcceptEx
-This directive instructs the MPM to use accept() rather than AcceptEx() to accept network connections
+Use accept() rather than AcceptEx() to accept network connections
Win32DisableAcceptEx
-AcceptEx is enabled by default. Use this directive to disable use of AcceptEx
+AcceptEx() is enabled by default. Use this directive to disable use of
+ AcceptEx()
server config
+Available in Version 2.0.49 and later
- AcceptEx() is a Microsoft WinSock v2 API that provides
+
AcceptEx() is a Microsoft WinSock v2 API that provides
some performance improvements over the use of the BSD style
- accept() API in certain circumstances. Some popular Windows
+ accept() API in certain circumstances. Some popular Windows
products, typically virus scanning or virtual private network
packages, have bugs that interfere with the proper operation of
- AcceptEx(). If you encounter any of the conditions described
- in the FAQ, you should use this directive to disable the use
- of AcceptEx().
+ AcceptEx(). If you encounter an error condition like:
+
+
+ [error] (730038)An operation was attempted on something that is
+ not a socket.: winnt_accept: AcceptEx failed. Attempting to recover.
+
+
+ you should use this directive to disable the use of
+ AcceptEx().
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index c6bf2a54917..f54304be0f2 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -685,7 +685,7 @@ hostname or IP address
a given virtual host
| VirtualScriptAliasIP interpolated-directory|none | none | sv | E |
| Dynamically configure the location of the cgi directory for
a given virtual host |
-| Win32DisableAcceptEx | | s | M |
| This directive instructs the MPM to use accept() rather than AcceptEx() to accept network connections |
+| Win32DisableAcceptEx | | s | M |
| Use accept() rather than AcceptEx() to accept network connections |
| XBitHack on|off|full | off | svdh | B |
| Parse SSI directives in files with the execute bit
set |
diff --git a/docs/manual/mod/quickreference.html.ru.koi8-r b/docs/manual/mod/quickreference.html.ru.koi8-r
index 7e8a5c9eeec..abb36e11af9 100644
--- a/docs/manual/mod/quickreference.html.ru.koi8-r
+++ b/docs/manual/mod/quickreference.html.ru.koi8-r
@@ -685,7 +685,7 @@ hostname or IP address
a given virtual host
| VirtualScriptAliasIP interpolated-directory|none | none | sv | E |
| Dynamically configure the location of the cgi directory for
a given virtual host |
-| Win32DisableAcceptEx | | s | M |
| This directive instructs the MPM to use accept() rather than AcceptEx() to accept network connections |
+| Win32DisableAcceptEx | | s | M |
| Use accept() rather than AcceptEx() to accept network connections |
| XBitHack on|off|full | off | svdh | B |
| Parse SSI directives in files with the execute bit
set |
--
2.47.3