You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2008/01/18 21:31:30 UTC

svn commit: r613260 - /httpd/httpd/trunk/server/mpm/prefork/prefork.c

Author: jorton
Date: Fri Jan 18 12:31:28 2008
New Revision: 613260

URL: http://svn.apache.org/viewvc?rev=613260&view=rev
Log:
* server/mpm/prefork/prefork.c (child_main): If apr_pollset_poll()
  fails with EINTR and die_now has been set (indicating a graceful
  stop/restart), terminate the child quickly rather than re-entering
  poll().

Modified:
    httpd/httpd/trunk/server/mpm/prefork/prefork.c

Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=613260&r1=613259&r2=613260&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Fri Jan 18 12:31:28 2008
@@ -557,6 +557,12 @@
                         if (one_process && shutdown_pending) {
                             return;
                         }
+                        else if (die_now) {
+                            /* In graceful stop/restart; drop the mutex
+                             * and terminate the child. */
+                            SAFE_ACCEPT(accept_mutex_off());
+                            clean_child_exit(0);
+                        }
                         continue;
                     }
                     /* Single Unix documents select as returning errnos