cvs commit: apache-1.3/src/main http_main.c

[brian]

brian       98/05/20 21:07:23

  Modified:    src      CHANGES
               htdocs/manual/mod core.html
               src/main http_main.c
  Log:
  PR: 2099
  
  Don't commit suicide.
  
  Revision  Changes    Path
  1.857     +2 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.856
  retrieving revision 1.857
  diff -u -r1.856 -r1.857
  --- CHANGES   1998/05/21 03:37:22     1.856
  +++ CHANGES   1998/05/21 04:07:11     1.857
  @@ -1,5 +1,7 @@
   Changes with Apache 1.3b7
   
  +  *) Ignore MaxRequestsPerChild on WIN32. [Brian Behlendorf]
  +
     *) Fix discrepancy in proxy_ftp.c which was causing failures when 
        trying to connect to certain ftpd's, such as anonftpd.  
        [Rick Ohnemus <[EMAIL PROTECTED]>]
  
  
  
  1.121     +5 -1      apache-1.3/htdocs/manual/mod/core.html
  
  Index: core.html
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
  retrieving revision 1.120
  retrieving revision 1.121
  diff -u -r1.120 -r1.121
  --- core.html 1998/05/20 18:40:35     1.120
  +++ core.html 1998/05/21 04:07:17     1.121
  @@ -1675,7 +1675,11 @@
   memory leakage;
   <LI> by giving processes a finite lifetime, it helps reduce the
   number of processes when the server load reduces.
  -</UL><P><HR>
  +</UL>
  +
  +<P>This directive has no effect on Win32.
  +
  +<P><HR>
   
   <H2><A NAME="maxspareservers">MaxSpareServers directive</A></H2>
   <!--%plaintext &lt;?INDEX {\tt MaxSpareServers} directive&gt; -->
  
  
  
  1.354     +4 -0      apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.353
  retrieving revision 1.354
  diff -u -r1.353 -r1.354
  --- http_main.c       1998/05/14 21:58:26     1.353
  +++ http_main.c       1998/05/21 04:07:21     1.354
  @@ -3393,10 +3393,14 @@
            clean_child_exit(0);
        }
   
  +#ifndef WIN32
        if ((ap_max_requests_per_child > 0
             && ++requests_this_child >= ap_max_requests_per_child)) {
            clean_child_exit(0);
        }
  +#else
  +     ++requests_this_child;
  +#endif
   
        (void) ap_update_child_status(my_child_num, SERVER_READY, (request_rec 
*) NULL);