Diff of /httpd/httpd/branches/2.2.x/server/mpm/worker/worker.c

Parent Directory | Revision Log | Patch

--- httpd/httpd/branches/2.2.x/server/mpm/worker/worker.c	2006/04/22 01:53:06	396056
+++ httpd/httpd/branches/2.2.x/server/mpm/worker/worker.c	2006/06/01 20:12:51	410935
@@ -1767,8 +1767,14 @@
                              "removed PID file %s (pid=%" APR_PID_T_FMT ")",
                              pidfile, getpid());
 
-            ap_log_error(APLOG_MARK, APLOG_NOTICE, 0,
-                         ap_server_conf, "caught SIGTERM, shutting down");
+            ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf,
+                         "caught " AP_SIG_GRACEFUL_STOP_STRING
+                         ", shutting down gracefully");
+        }
+
+        if (ap_graceful_shutdown_timeout) {
+            cutoff = apr_time_now() +
+                     apr_time_from_sec(ap_graceful_shutdown_timeout);
         }
 
         /* Don't really exit until each child has finished */