icu rebuild

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

diff --git a/php-fcgi-graceful.patch b/php-fcgi-graceful.patch
index 505462fa8eefb3452220554a982339631a0a1fff..b2626026ddaf77d64b34ce0ce9cc73ea4451dbe3 100644 (file)
--- a/php-fcgi-graceful.patch
+++ b/php-fcgi-graceful.patch
@@ -18,21 +18,22 @@ while ($i < 35) {
 echo "end!<br>\n";
 ?>
 
---- php-7.0.0beta1/sapi/cgi/cgi_main.c~        2015-07-13 16:14:53.000000000 +0300
-+++ php-7.0.0beta1/sapi/cgi/cgi_main.c 2015-07-15 13:51:32.072326529 +0300
-@@ -101,6 +101,9 @@
-  */
- static int parent = 1;
+diff -urNp -x '*.orig' php-7.0.33.org/sapi/cgi/cgi_main.c php-7.0.33/sapi/cgi/cgi_main.c
+--- php-7.0.33.org/sapi/cgi/cgi_main.c 2018-12-04 18:23:01.000000000 +0100
++++ php-7.0.33/sapi/cgi/cgi_main.c     2021-08-23 23:36:16.728416784 +0200
+@@ -110,6 +110,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);
+@@ -1433,6 +1436,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)
-@@ -1764,7 +1764,6 @@
+@@ -1728,7 +1746,6 @@ int main(int argc, char *argv[])
        int requests = 0;
        int fastcgi;
        char *bindpath = NULL;
 -      int fcgi_fd = 0;
        fcgi_request *request = NULL;
+       int warmup_repeats = 0;
        int repeats = 1;
-       int benchmark = 0;
-@@ -2050,10 +2050,13 @@
+@@ -2036,10 +2053,13 @@ consult the installation file that came
                                                 */
                                                parent = 0;