php53 as name in ac

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

diff --git a/php-fcgi-graceful.patch b/php-fcgi-graceful.patch
index c89be51c268128f1bd7b8cb8c3d07b59cc7ab8d2..6cf0d2c4f0f295317ce601e6614312675e9a6798 100644 (file)
--- a/php-fcgi-graceful.patch
+++ b/php-fcgi-graceful.patch
@@ -1,11 +1,25 @@
 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/
 
---- php5.3-200711071330/sapi/cgi/cgi_main.c    2007-11-01 13:32:38.000000000 +0200
-+++ php5.3-200711071330-graceful2/sapi/cgi/cgi_main.c  2007-11-07 22:12:10.025949153 +0200
+test script too:
+<?php
+echo php_sapi_name(), ' running ', PHP_VERSION, "<br>\n";
+$i = 0;
+while ($i < 35) {
+    echo (++$i), "<br>\n";
+    flush();
+    sleep(1);
+}
+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;
@@ -51,10 +65,8 @@ http://php-fpm.anight.org/
  
                                        /* don't catch our signals */
 -                                      sigaction(SIGTERM, &old_term, 0);
--                                      sigaction(SIGQUIT, &old_quit, 0);
--                                      sigaction(SIGINT,  &old_int,  0);
-+                                      sigaction(SIGQUIT, &act, &old_quit);
-+                                      sigaction(SIGINT, &act, &old_int);
+                                       sigaction(SIGQUIT, &old_quit, 0);
+                                       sigaction(SIGINT,  &old_int,  0);
 +
 +                                      /* call graceful shutdown handler for SIGTERM */
 +                                      act.sa_flags = 0;