httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject cvs commit: httpd-2.0 CHANGES
Date Sun, 14 Jul 2002 23:18:46 GMT
brianp      2002/07/14 16:18:46

  Modified:    support  config.m4 apachectl.in
               .        CHANGES
  Log:
  Increase the per-process file descriptor limit in apachectl
  for the benefit of people running multithreaded MPMs or lots
  of vhosts
  
  Revision  Changes    Path
  1.5       +6 -0      httpd-2.0/support/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/config.m4,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- config.m4	7 Feb 2002 23:01:47 -0000	1.4
  +++ config.m4	14 Jul 2002 23:18:45 -0000	1.5
  @@ -81,3 +81,9 @@
   ])
   APACHE_SUBST(checkgid_LTFLAGS)
   
  +if TMP_ULIMIT=`ulimit -H -n` && ulimit -S -n $TMP_ULIMIT ; then
  +  APACHECTL_ULIMIT="ulimit -S -n \`ulimit -H -n\`"
  +else
  +  APACHECTL_ULIMIT=""
  +fi
  +APACHE_SUBST(APACHECTL_ULIMIT)
  
  
  
  1.14      +6 -0      httpd-2.0/support/apachectl.in
  
  Index: apachectl.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/apachectl.in,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- apachectl.in	27 May 2002 11:46:01 -0000	1.13
  +++ apachectl.in	14 Jul 2002 23:18:45 -0000	1.14
  @@ -44,8 +44,14 @@
   # have one, then status and fullstatus will not work.
   STATUSURL="http://localhost:@PORT@/server-status"
   #
  +# the command to increase the limit on open file descriptors
  +ULIMIT_MAX_FILES="@APACHECTL_ULIMIT@"
   # --------------------                              --------------------
   # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
  +
  +if [ "x$ULIMIT_MAX_FILES" != "x" ] ; then
  +    $ULIMIT_MAX_FILES
  +fi
   
   ERROR=0
   if [ "x$ARGV" = "x" ] ; then 
  
  
  
  1.864     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.863
  retrieving revision 1.864
  diff -u -r1.863 -r1.864
  --- CHANGES	13 Jul 2002 03:29:49 -0000	1.863
  +++ CHANGES	14 Jul 2002 23:18:45 -0000	1.864
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.40
   
  +  *) Increase the limit on file descriptors per process in apachectl.
  +     [Brian Pane]
  +
     *) Fix a dependency error when building ApacheMonitor, so that Win32
        and MSVC now trust that the project is current (when it is).
        [James Cox <imajes@php.net>]
  
  
  

Mime
View raw message