X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=php-fcgi-graceful.patch;h=ef4a32aa6dcd9f343eb41c240554ac6a59a80fb4;hb=refs%2Fheads%2FPHP_5_5;hp=6cf0d2c4f0f295317ce601e6614312675e9a6798;hpb=c0240cb1083b142e8f952c49b4d7a4fb2288ccfb;p=packages%2Fphp.git

diff --git a/php-fcgi-graceful.patch b/php-fcgi-graceful.patch
index 6cf0d2c..ef4a32a 100644
--- a/php-fcgi-graceful.patch
+++ b/php-fcgi-graceful.patch
@@ -18,21 +18,22 @@ while ($i < 35) {
 echo "end!<br>\n";
 ?>
 
---- php5.3-200711090930/sapi/cgi/cgi_main.c	2007-11-01 13:32:38.000000000 +0200
-+++ php5.3-200711090930-graceful/sapi/cgi/cgi_main.c	2007-11-09 13:34:22.974559020 +0200
-@@ -101,6 +101,9 @@
-  */
- static int parent = 1;
+diff -urNp -x '*.orig' php-5.5.38.org/sapi/cgi/cgi_main.c php-5.5.38/sapi/cgi/cgi_main.c
+--- php-5.5.38.org/sapi/cgi/cgi_main.c	2016-07-20 10:41:48.000000000 +0200
++++ php-5.5.38/sapi/cgi/cgi_main.c	2021-08-23 23:02:49.659949364 +0200
+@@ -107,6 +107,9 @@ static void (*php_php_import_environment
+ static int children = 0;
+ 
  
 +/* Socket we are listening on incoming connections */
 +static int fcgi_fd = 0;
 +
  /**
-  * Process group
+  * Set to non-zero if we are the parent process
   */
-@@ -1221,6 +1224,21 @@
- 	exit(0);
+@@ -1453,6 +1456,21 @@ void fastcgi_cleanup(int signal)
  }
+ #endif
  
 +/**
 + * Graceful shutdown. Close listening sockets.
@@ -52,15 +53,15 @@ echo "end!<br>\n";
  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 @@
+@@ -1756,7 +1774,6 @@ int main(int argc, char *argv[])
  	int requests = 0;
- 	int fastcgi = fcgi_is_fastcgi();
+ 	int fastcgi;
  	char *bindpath = NULL;
 -	int fcgi_fd = 0;
- 	fcgi_request request;
+ 	fcgi_request *request = NULL;
  	int repeats = 1;
  	int benchmark = 0;
-@@ -1579,9 +1596,13 @@
+@@ -2049,9 +2066,13 @@ consult the installation file that came
  					parent = 0;
  
  					/* don't catch our signals */