cvs commit: apache/htdocs/manual/mod core.html

[Marc Slemko <ma...@hyperreal.com>]

marc        97/06/09 17:28:34

  Modified:    src       http_core.c
               htdocs/manual/mod  core.html
  Log:
  SendBufferSize is not valid in a VirtualHost, so make Apache say so.
  
  Note that allowing this to be set on a per socket (ie. per Listen
  directive) basis could be useful for some, but isn't currently
  implemented.  Also note that the code as written may fail to work
  correctly on some systems that don't copy the socket settings fully
  on an accept().
  
  Reviewed by:	Randy Terbush, Dean Gaudet
  
  Revision  Changes    Path
  1.82      +3 -0      apache/src/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_core.c,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -C3 -r1.81 -r1.82
  *** http_core.c	1997/05/08 13:09:24	1.81
  --- http_core.c	1997/06/10 00:28:31	1.82
  ***************
  *** 867,872 ****
  --- 867,875 ----
    
    const char *set_send_buffer_size (cmd_parms *cmd, void *dummy, char *arg) {
        int s = atoi (arg);
  +     if (cmd->server->is_virtual) {
  +         return "SendBufferSize directive can not be used in <VirtualHost>";
  +     }
        if (s < 512 && s != 0) {
            return "SendBufferSize must be >= 512 bytes, or 0 for system default.";
        }
  
  
  
  1.57      +1 -1      apache/htdocs/manual/mod/core.html
  
  Index: core.html
  ===================================================================
  RCS file: /export/home/cvs/apache/htdocs/manual/mod/core.html,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -C3 -r1.56 -r1.57
  *** core.html	1997/06/04 16:14:13	1.56
  --- core.html	1997/06/10 00:28:33	1.57
  ***************
  *** 1158,1164 ****
    <A name="sendbuffersize"><h2>SendBufferSize directive</h2></A>
    <!--%plaintext &lt;?INDEX {\tt SendBufferSize} directive&gt; -->
    <strong>Syntax:</strong> SendBufferSize <em>bytes</em><br>
  ! <strong>Context:</strong> server config, virtual host<br>
    <strong>Status:</strong> core<p>
    
    The server will set the TCP buffer size to the number of bytes
  --- 1158,1164 ----
    <A name="sendbuffersize"><h2>SendBufferSize directive</h2></A>
    <!--%plaintext &lt;?INDEX {\tt SendBufferSize} directive&gt; -->
    <strong>Syntax:</strong> SendBufferSize <em>bytes</em><br>
  ! <strong>Context:</strong> server config<br>
    <strong>Status:</strong> core<p>
    
    The server will set the TCP buffer size to the number of bytes
  
  
  

Re: cvs commit: apache/htdocs/manual/mod core.html

[Dean Gaudet <dg...@arctic.org>]

On Mon, 9 Jun 1997, Marc Slemko wrote:
>   Note that allowing this to be set on a per socket (ie. per Listen
>   directive) basis could be useful for some, but isn't currently
>   implemented.  Also note that the code as written may fail to work
>   correctly on some systems that don't copy the socket settings fully
>   on an accept().

Actually I looked into this a few months back when I learned that nagle
isn't copied across the accept() (because it is IPPROTO_TCP).  SO_SNDBUF
is *supposed* to be copied because it is SOL_SOCKET.  Not that helps
reality any.

Dean