httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/docs/manual/mod mpm_winnt.html.en mpm_winnt.xml quickreference.html.en quickreference.html.ru.koi8-r
Date Tue, 09 Mar 2004 20:47:46 GMT
nd          2004/03/09 12:47:46

  Modified:    docs/manual/mod Tag: APACHE_2_0_BRANCH mpm_winnt.html.en
                        mpm_winnt.xml quickreference.html.en
                        quickreference.html.ru.koi8-r
  Log:
  backport changes from 2.1
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.11.2.6  +15 -7     httpd-2.0/docs/manual/mod/mpm_winnt.html.en
  
  Index: mpm_winnt.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mpm_winnt.html.en,v
  retrieving revision 1.11.2.5
  retrieving revision 1.11.2.6
  diff -u -u -r1.11.2.5 -r1.11.2.6
  --- mpm_winnt.html.en	21 Feb 2004 00:37:47 -0000	1.11.2.5
  +++ mpm_winnt.html.en	9 Mar 2004 20:47:46 -0000	1.11.2.6
  @@ -56,21 +56,29 @@
   <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
   <div class="directive-section"><h2><a name="Win32DisableAcceptEx" id="Win32DisableAcceptEx">Win32DisableAcceptEx</a>
<a name="win32disableacceptex" id="win32disableacceptex">Directive</a></h2>
   <table class="directive">
  -<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>This
directive instructs the MPM to use accept() rather than AcceptEx() to accept network connections</td></tr>
  +<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Use
accept() rather than AcceptEx() to accept network connections</td></tr>
   <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Win32DisableAcceptEx</code></td></tr>
  -<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AcceptEx
is enabled by default. Use this directive to disable use of AcceptEx</code></td></tr>
  +<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>AcceptEx()
is enabled by default. Use this directive to disable use of
  +    AcceptEx()</code></td></tr>
   <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server
config</td></tr>
   <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>MPM</td></tr>
   <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mpm_winnt</td></tr>
  +<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available
in Version 2.0.49 and later</td></tr>
   </table>
  -    <p>AcceptEx() is a Microsoft WinSock v2 API that provides
  +    <p><code>AcceptEx()</code> 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
  +    <code>accept()</code> 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().</p>
  +    <code>AcceptEx()</code>. If you encounter an error condition like:</p>
  +
  +    <div class="example"><p><code>
  +        [error] (730038)An operation was attempted on something that is
  +        not a socket.: winnt_accept: AcceptEx failed. Attempting to recover.
  +    </code></p></div>
  +
  +    <p>you should use this directive to disable the use of
  +    <code>AcceptEx()</code>.</p>
   
   </div>
   </div>
  
  
  
  1.4.2.7   +15 -7     httpd-2.0/docs/manual/mod/mpm_winnt.xml
  
  Index: mpm_winnt.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mpm_winnt.xml,v
  retrieving revision 1.4.2.6
  retrieving revision 1.4.2.7
  diff -u -u -r1.4.2.6 -r1.4.2.7
  --- mpm_winnt.xml	19 Feb 2004 17:33:39 -0000	1.4.2.6
  +++ mpm_winnt.xml	9 Mar 2004 20:47:46 -0000	1.4.2.7
  @@ -57,20 +57,28 @@
   
   <directivesynopsis>
   <name>Win32DisableAcceptEx</name>
  -<description>This directive instructs the MPM to use accept() rather than AcceptEx()
to accept network connections</description>
  +<description>Use accept() rather than AcceptEx() to accept network connections</description>
   <syntax>Win32DisableAcceptEx</syntax>
  -<default>AcceptEx is enabled by default. Use this directive to disable use of AcceptEx</default>
  +<default>AcceptEx() is enabled by default. Use this directive to disable use of
  +    AcceptEx()</default>
   <contextlist><context>server config</context></contextlist>
  +<compatibility>Available in Version 2.0.49 and later</compatibility>
   
   <usage>
  -    <p>AcceptEx() is a Microsoft WinSock v2 API that provides
  +    <p><code>AcceptEx()</code> 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
  +    <code>accept()</code> 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().</p>
  +    <code>AcceptEx()</code>. If you encounter an error condition like:</p>
  +
  +    <example>
  +        [error] (730038)An operation was attempted on something that is
  +        not a socket.: winnt_accept: AcceptEx failed. Attempting to recover.
  +    </example>
  +
  +    <p>you should use this directive to disable the use of
  +    <code>AcceptEx()</code>.</p>
   </usage>
   </directivesynopsis>
   
  
  
  
  1.47.2.43 +1 -1      httpd-2.0/docs/manual/mod/quickreference.html.en
  
  Index: quickreference.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/quickreference.html.en,v
  retrieving revision 1.47.2.42
  retrieving revision 1.47.2.43
  diff -u -u -r1.47.2.42 -r1.47.2.43
  --- quickreference.html.en	21 Feb 2004 00:37:48 -0000	1.47.2.42
  +++ quickreference.html.en	9 Mar 2004 20:47:46 -0000	1.47.2.43
  @@ -685,7 +685,7 @@
   a given virtual host</td></tr>
   <tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP
<em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr
class="odd"><td class="descr" colspan="4">Dynamically configure the location of the
cgi directory for
   a given virtual host</td></tr>
  -<tr><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr><td
class="descr" colspan="4">This directive instructs the MPM to use accept() rather than
AcceptEx() to accept network connections</td></tr>
  +<tr><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr><td
class="descr" colspan="4">Use accept() rather than AcceptEx() to accept network connections</td></tr>
   <tr class="odd"><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack
on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr
class="odd"><td class="descr" colspan="4">Parse SSI directives in files with the
execute bit
   set</td></tr>
   </table></div>
  
  
  
  1.1.2.24  +1 -1      httpd-2.0/docs/manual/mod/Attic/quickreference.html.ru.koi8-r
  
  Index: quickreference.html.ru.koi8-r
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/Attic/quickreference.html.ru.koi8-r,v
  retrieving revision 1.1.2.23
  retrieving revision 1.1.2.24
  diff -u -u -r1.1.2.23 -r1.1.2.24
  --- quickreference.html.ru.koi8-r	21 Feb 2004 00:37:48 -0000	1.1.2.23
  +++ quickreference.html.ru.koi8-r	9 Mar 2004 20:47:46 -0000	1.1.2.24
  @@ -685,7 +685,7 @@
   a given virtual host</td></tr>
   <tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP
<em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr
class="odd"><td class="descr" colspan="4">Dynamically configure the location of the
cgi directory for
   a given virtual host</td></tr>
  -<tr><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr><td
class="descr" colspan="4">This directive instructs the MPM to use accept() rather than
AcceptEx() to accept network connections</td></tr>
  +<tr><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr><td
class="descr" colspan="4">Use accept() rather than AcceptEx() to accept network connections</td></tr>
   <tr class="odd"><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack
on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr
class="odd"><td class="descr" colspan="4">Parse SSI directives in files with the
execute bit
   set</td></tr>
   </table></div>
  
  
  

Mime
View raw message