You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2008/05/31 13:57:54 UTC
svn commit: r662012 - in /httpd/httpd/branches/2.2.x: STATUS
server/mpm/prefork/prefork.c
Author: jim
Date: Sat May 31 04:57:54 2008
New Revision: 662012
URL: http://svn.apache.org/viewvc?rev=662012&view=rev
Log:
Merge r552029 from trunk:
* server/mpm/prefork/prefork.c (child_main): Stop processing new
connections if shutdown_pending is set, i.e. when SIGTERM is received
in single-proecss mode.
Submitted by: Garrett Rooney <rooneg apache.org>
PR: 38848
Submitted by: jorton
Reviewed by: jim
Modified:
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=662012&r1=662011&r2=662012&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sat May 31 04:57:54 2008
@@ -107,15 +107,6 @@
Trunk version of patch works
+1: jim, jorton, rpluem
- * prefork: Stop processing new connections if shutdown_pending is set,
- i.e. when SIGTERM is received in single-process mode.
- PR 38848
- Trunk version of patch:
- http://svn.apache.org/viewvc?view=rev&revision=552029
- Backport version for 2.2.x of patch:
- Trunk version of patch works
- +1: jim, jorton, rpluem
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c?rev=662012&r1=662011&r2=662012&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c Sat May 31 04:57:54 2008
@@ -536,7 +536,10 @@
bucket_alloc = apr_bucket_alloc_create(pchild);
- while (!die_now) {
+ /* die_now is set when AP_SIG_GRACEFUL is received in the child;
+ * shutdown_pending is set when SIGTERM is received when running
+ * in single process mode. */
+ while (!die_now && !shutdown_pending) {
conn_rec *current_conn;
void *csd;