Related links:
http://bugs.php.net/bug.php?id=41593
http://bugs.php.net/bug.php?id=36158
http://bugs.php.net/bug.php?id=43224
http://php-fpm.anight.org/
test script too:
\n";
$i = 0;
while ($i < 35) {
echo (++$i), "
\n";
flush();
sleep(1);
}
echo "end!
\n";
?>
--- php-5.2.5RC2/sapi/cgi/cgi_main.c 2007-11-01 17:23:14.000000000 +0200
+++ php-5.2.5RC2-graceful/sapi/cgi/cgi_main.c 2007-11-08 00:46:38.999355875 +0200
@@ -103,6 +103,11 @@
*/
static int parent = 1;
+#if PHP_FASTCGI
+/* Socket we are listening on incoming FastCGI connections */
+static int fcgi_fd = 0;
+#endif
+
/**
* Process group
*/
@@ -1157,6 +1162,22 @@
}
#endif
+#if PHP_FASTCGI
+/**
+ * Graceful shutdown. Close listening sockets.
+ */
+void fastcgi_graceful_shutdown(int signal)
+{
+#ifdef DEBUG_FASTCGI
+ fprintf(stderr, "FastCGI graceful shutdown, pid %d\n", getpid());
+#endif
+
+ /* Close the listening socket so new processes can reuse the same port */
+ closesocket(fcgi_fd);
+ fcgi_fd = 0;
+}
+#endif
+
PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("cgi.rfc2616_headers", "0", PHP_INI_ALL, OnUpdateBool, rfc2616_headers, php_cgi_globals_struct, php_cgi_globals)
STD_PHP_INI_ENTRY("cgi.nph", "0", PHP_INI_ALL, OnUpdateBool, nph, php_cgi_globals_struct, php_cgi_globals)
@@ -1275,7 +1296,6 @@
int requests = 0;
int fastcgi = fcgi_is_fastcgi();
char *bindpath = NULL;
- int fcgi_fd = 0;
fcgi_request request;
int repeats = 1;
int benchmark = 0;
@@ -1538,9 +1558,17 @@
parent = 0;
/* don't catch our signals */
- sigaction(SIGTERM, &old_term, 0);
sigaction(SIGQUIT, &old_quit, 0);
sigaction(SIGINT, &old_int, 0);
+#if PHP_FASTCGI
+
+ /* call graceful shutdown handler for SIGTERM */
+ act.sa_flags = 0;
+ act.sa_handler = fastcgi_graceful_shutdown;
+ sigaction(SIGTERM, &act, &old_term);
+#else
+ sigaction(SIGTERM, &old_term, 0);
+#endif
break;
case -1:
perror("php (pre-forking)");