rel 3

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

diff --git a/php-fcgi-graceful.patch b/php-fcgi-graceful.patch
index ffbcfe9f879a45807e10f14deabdc8def19a5309..6cf0d2c4f0f295317ce601e6614312675e9a6798 100644 (file)
--- a/php-fcgi-graceful.patch
+++ b/php-fcgi-graceful.patch
@@ -1,5 +1,7 @@
 Related links:
 
+http://bugs.php.net/bug.php?id=43224 this patch
+
 http://bugs.php.net/bug.php?id=41593
 http://bugs.php.net/bug.php?id=36158
 http://php-fpm.anight.org/
@@ -16,25 +18,22 @@ while ($i < 35) {
 echo "end!<br>\n";
 ?>
 
---- 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 @@
+--- 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;
  
-+#if PHP_FASTCGI
-+/* Socket we are listening on incoming FastCGI connections */
++/* Socket we are listening on incoming connections */
 +static int fcgi_fd = 0;
-+#endif
 +
  /**
   * Process group
   */
-@@ -1157,6 +1162,22 @@
+@@ -1221,6 +1224,21 @@
+       exit(0);
  }
- #endif
  
-+#if PHP_FASTCGI
 +/**
 + * Graceful shutdown. Close listening sockets.
 + */
@@ -48,12 +47,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)
-@@ -1275,7 +1296,6 @@
+@@ -1328,7 +1346,6 @@
        int requests = 0;
        int fastcgi = fcgi_is_fastcgi();
        char *bindpath = NULL;
@@ -61,22 +60,18 @@ echo "end!<br>\n";
        fcgi_request request;
        int repeats = 1;
        int benchmark = 0;
-@@ -1538,9 +1558,17 @@
+@@ -1579,9 +1596,13 @@
                                        parent = 0;
  
                                        /* don't catch our signals */
 -                                      sigaction(SIGTERM, &old_term, 0);
                                        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)");