- fcgi_shutdown() makes it print data also to stdount not only fcgi server pipe

Changed files:
    php-fcgi-graceful.patch -> 1.3

diff --git a/php-fcgi-graceful.patch b/php-fcgi-graceful.patch
index 8323fc3c9fb0d78407836130b5c3856dfe385e81..3eefc01a895953a27c7961bcf59ea2aa118f19a6 100644 (file)
--- a/php-fcgi-graceful.patch
+++ b/php-fcgi-graceful.patch
@@ -16,7 +16,7 @@ http://php-fpm.anight.org/
  /**
   * Process group
   */
-@@ -1211,16 +1215,38 @@
+@@ -1211,16 +1215,35 @@
  #endif
  
  #ifndef PHP_WIN32
@@ -46,10 +46,7 @@ http://php-fpm.anight.org/
 +      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 listeing socket so new processes can reuse the same port */
 +      closesocket(fcgi_fd);
 +      fcgi_fd = 0;
 +}
@@ -58,7 +55,7 @@ http://php-fpm.anight.org/
  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 @@
+@@ -1328,7 +1351,6 @@
        int requests = 0;
        int fastcgi = fcgi_is_fastcgi();
        char *bindpath = NULL;
@@ -66,7 +63,7 @@ http://php-fpm.anight.org/
        fcgi_request request;
        int repeats = 1;
        int benchmark = 0;
-@@ -1581,7 +1606,10 @@
+@@ -1581,7 +1603,10 @@
                                        /* don't catch our signals */
                                        sigaction(SIGTERM, &old_term, 0);
                                        sigaction(SIGQUIT, &old_quit, 0);