- rediff patches, merged duplicate triggers

[packages/php.git] / php-fcgi-graceful.patch

diff --git a/php-fcgi-graceful.patch b/php-fcgi-graceful.patch
index 26f86f34a2b3e3ca8cb7c9ecfe5bc567ce1969df..e779ba77273ab734e13899eac2591ffd605b9949 100644 (file)
--- a/php-fcgi-graceful.patch
+++ b/php-fcgi-graceful.patch
@@ -18,21 +18,22 @@ while ($i < 35) {
 echo "end!<br>\n";
 ?>
 
---- php-5.4.0alpha2/sapi/cgi/cgi_main.c~       2011-08-05 13:26:14.000000000 +0300
-+++ php-5.4.0alpha2/sapi/cgi/cgi_main.c        2011-08-05 13:57:17.564708456 +0300
-@@ -101,6 +101,9 @@
-  */
- static int parent = 1;
+diff -urNp -x '*.orig' php-5.6.40.org/sapi/cgi/cgi_main.c php-5.6.40/sapi/cgi/cgi_main.c
+--- php-5.6.40.org/sapi/cgi/cgi_main.c 2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/sapi/cgi/cgi_main.c     2021-08-23 23:19:27.222458494 +0200
+@@ -111,6 +111,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);
+@@ -1461,6 +1464,21 @@ void fastcgi_cleanup(int signal)
  }
+ #endif
  
 +/**
 + * Graceful shutdown. Close listening sockets.
@@ -52,7 +53,7 @@ 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)
-@@ -1764,7 +1764,6 @@
+@@ -1759,7 +1777,6 @@ int main(int argc, char *argv[])
        int requests = 0;
        int fastcgi;
        char *bindpath = NULL;
@@ -60,7 +61,7 @@ echo "end!<br>\n";
        fcgi_request *request = NULL;
        int repeats = 1;
        int benchmark = 0;
-@@ -1579,9 +1596,13 @@
+@@ -2058,9 +2075,13 @@ consult the installation file that came
                                        parent = 0;
  
                                        /* don't catch our signals */