X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php-fcgi-graceful.patch;h=1f25713130311a00e5495a2059fe5ab306a4d74c;hb=6d4619bba1a1800f2702286daaf55ee7c08a40ad;hp=10aba26c06199543b10a06fe6e17c18e642e671f;hpb=3e6c63d71213e843aa621c695362a56837a07b4d;p=packages%2Fphp.git

diff --git a/php-fcgi-graceful.patch b/php-fcgi-graceful.patch
index 10aba26..1f25713 100644
--- a/php-fcgi-graceful.patch
+++ b/php-fcgi-graceful.patch
@@ -1,44 +1,41 @@
---- php5.3-200711071330/sapi/cgi/cgi_main.c	2007-11-01 13:32:38.000000000 +0200
-+++ php5.3-200711071330-graceful/sapi/cgi/cgi_main.c	2007-11-07 17:40:37.884171760 +0200
-@@ -101,6 +101,9 @@
+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:
+<?php
+echo php_sapi_name(), ' running ', PHP_VERSION, "<br>\n";
+$i = 0;
+while ($i < 35) {
+    echo (++$i), "<br>\n";
+    flush();
+    sleep(1);
+}
+echo "end!<br>\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;
  
-+/* Socket we are listening on incoming connections */
-+static int fcgi_fd = -1;
++#if PHP_FASTCGI
++/* Socket we are listening on incoming FastCGI connections */
++static int fcgi_fd = 0;
++#endif
 +
  /**
   * Process group
   */
-@@ -116,6 +119,7 @@
- static char *php_optarg = NULL;
- static int php_optind = 1;
- static zend_module_entry cgi_module_entry;
-+static int accept_socket = -1;
- 
- static const opt_struct OPTIONS[] = {
- 	{'a', 0, "interactive"},
-@@ -1211,16 +1215,38 @@
- #endif
- 
- #ifndef PHP_WIN32
--	sigaction(SIGTERM, &old_term, 0);
--
- 	/* Kill all the processes in our process group */
--	kill(-pgroup, SIGTERM);
-+	if (signal == SIGINT) {
-+		sigaction(SIGTERM, &old_int, 0);
-+		kill(-pgroup, SIGINT);
-+	} else {
-+		sigaction(SIGTERM, &old_term, 0);
-+		kill(-pgroup, SIGTERM);
-+	}
- #endif
- 
- 	/* We should exit at this point, but MacOSX doesn't seem to */
- 	exit(0);
+@@ -1157,6 +1162,22 @@
  }
+ #endif
  
++#if PHP_FASTCGI
 +/**
 + * Graceful shutdown. Close listening sockets.
 + */
@@ -48,19 +45,16 @@
 +	fprintf(stderr, "FastCGI graceful shutdown, pid %d\n", getpid());
 +#endif
 +
-+	/* This will make FCGI shutdown itself later in the loop, however we should finish our request cleanly */
-+	fcgi_shutdown();
-+
-+	/* Whoever we also close the listeing socket (which PHP itself doesn't seem to do?!) */
++	/* Close the listening socket so new processes can reuse the same port */
 +	closesocket(fcgi_fd);
-+	fcgi_fd = -1;
++	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)
-@@ -1328,7 +1354,6 @@
+@@ -1275,7 +1296,6 @@
  	int requests = 0;
  	int fastcgi = fcgi_is_fastcgi();
  	char *bindpath = NULL;
@@ -68,15 +62,22 @@
  	fcgi_request request;
  	int repeats = 1;
  	int benchmark = 0;
-@@ -1581,7 +1606,10 @@
+@@ -1538,9 +1558,17 @@
+ 					parent = 0;
+ 
  					/* don't catch our signals */
- 					sigaction(SIGTERM, &old_term, 0);
+-					sigaction(SIGTERM, &old_term, 0);
  					sigaction(SIGQUIT, &old_quit, 0);
--					sigaction(SIGINT,  &old_int,  0);
-+					/* handler for SIGINT */
+ 					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(SIGINT, &act, &old_int);
++					sigaction(SIGTERM, &act, &old_term);
++#else
++					sigaction(SIGTERM, &old_term, 0);
++#endif
  					break;
  				case -1:
  					perror("php (pre-forking)");