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

diff --git a/php-fcgi-graceful.patch b/php-fcgi-graceful.patch
index a275bd0..1f25713 100644
--- a/php-fcgi-graceful.patch
+++ b/php-fcgi-graceful.patch
@@ -2,6 +2,7 @@ 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:
@@ -16,22 +17,25 @@ while ($i < 35) {
 echo "end!<br>\n";
 ?>
 
---- php5.3-200711071330/sapi/cgi/cgi_main.c	2007-11-01 13:32:38.000000000 +0200
-+++ php5.3-200711071330-graceful2/sapi/cgi/cgi_main.c	2007-11-07 22:12:10.025949153 +0200
-@@ -101,6 +101,9 @@
+--- 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 */
++#if PHP_FASTCGI
++/* Socket we are listening on incoming FastCGI connections */
 +static int fcgi_fd = 0;
++#endif
 +
  /**
   * Process group
   */
-@@ -1221,6 +1224,21 @@
- 	exit(0);
+@@ -1157,6 +1162,22 @@
  }
+ #endif
  
++#if PHP_FASTCGI
 +/**
 + * Graceful shutdown. Close listening sockets.
 + */
@@ -45,12 +49,12 @@ echo "end!<br>\n";
 +	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)
-@@ -1328,7 +1346,6 @@
+@@ -1275,7 +1296,6 @@
  	int requests = 0;
  	int fastcgi = fcgi_is_fastcgi();
  	char *bindpath = NULL;
@@ -58,20 +62,22 @@ echo "end!<br>\n";
  	fcgi_request request;
  	int repeats = 1;
  	int benchmark = 0;
-@@ -1579,9 +1596,13 @@
+@@ -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);
-+					sigaction(SIGQUIT, &act, &old_quit);
-+					sigaction(SIGINT, &act, &old_int);
+ 					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)");