[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-cvs
Subject:    cvs commit: httpd-2.0/server/mpm/prefork prefork.c
From:       jerenkrantz () apache ! org
Date:       2003-12-27 6:15:48
[Download RAW message or body]

jerenkrantz    2003/12/26 22:15:48

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES
               server/mpm/prefork Tag: APACHE_2_0_BRANCH prefork.c
  Log:
  Prevent slow graceful restarts on some platforms:
  
  * prefork.c (ap_mpm_run): Only make as many dummy connections as slots
  used, not as many as slots are available.
  
  Backport of server/mpm/prefork/prefork.c r1.280 from httpd-2.1
  Reviewed by:	Joe Orton, Jeff Trawick, Justin Erenkrantz
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.201 +2 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.200
  retrieving revision 1.988.2.201
  diff -u -u -r1.988.2.200 -r1.988.2.201
  --- CHANGES	27 Dec 2003 06:10:05 -0000	1.988.2.200
  +++ CHANGES	27 Dec 2003 06:15:47 -0000	1.988.2.201
  @@ -1,5 +1,7 @@
   Changes with Apache 2.0.49
   
  +  *) Fix slow graceful restarts with prefork MPM.  [Joe Orton]
  +
     *) Fix a problem with namespace mappings being dropped in mod_dav_fs;
        if any property values were set which defined namespaces these
        came out mangled in the PROPFIND response.  PR 11637.
  
  
  
  No                   revision
  No                   revision
  1.272.2.4 +1 -1      httpd-2.0/server/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
  retrieving revision 1.272.2.3
  retrieving revision 1.272.2.4
  diff -u -u -r1.272.2.3 -r1.272.2.4
  --- prefork.c	5 Sep 2003 19:00:53 -0000	1.272.2.3
  +++ prefork.c	27 Dec 2003 06:15:48 -0000	1.272.2.4
  @@ -1167,7 +1167,7 @@
   		    "Graceful restart requested, doing restart");
   
   	/* kill off the idle ones */
  -        ap_mpm_pod_killpg(pod, ap_daemons_limit);
  +        ap_mpm_pod_killpg(pod, ap_max_daemons_limit);
   
   	/* This is mostly for debugging... so that we know what is still
   	    * gracefully dealing with existing request.  This will break
  
  
  
[prev in list] [next in list] [prev in thread] [next in thread]