- handle graceful restart on SIGTERM, so scripts need not to be modified

- in childs handle only SIGTERM because parent sends SIGTERM to childs on any of the signales

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

diff --git a/php-fcgi-graceful.patch b/php-fcgi-graceful.patch
index 3eefc01a895953a27c7961bcf59ea2aa118f19a6..ec0702060d6c4aaa3c6e5f024338d8467ea9256c 100644 (file)
--- a/php-fcgi-graceful.patch
+++ b/php-fcgi-graceful.patch
@@ -1,11 +1,5 @@
-Related links:
-
-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-graceful/sapi/cgi/cgi_main.c   2007-11-07 17:40:37.884171760 +0200
++++ php5.3-200711071330-graceful2/sapi/cgi/cgi_main.c  2007-11-07 22:12:10.025949153 +0200
 @@ -101,6 +101,9 @@
   */
  static int parent = 1;
@@ -16,24 +10,7 @@ http://php-fpm.anight.org/
  /**
   * Process group
   */
-@@ -1211,16 +1215,35 @@
- #endif
- 
- #ifndef PHP_WIN32
--      sigaction(SIGTERM, &old_term, 0);
--
-       /* Kill all the processes in our process group */
--      kill(-pgroup, SIGTERM);
-+      if (signal == SIGINT) {
-+              sigaction(SIGTERM, &old_int, 0);
-+              kill(-pgroup, SIGINT);
-+      } else {
-+              sigaction(SIGTERM, &old_term, 0);
-+              kill(-pgroup, SIGTERM);
-+      }
- #endif
- 
-       /* We should exit at this point, but MacOSX doesn't seem to */
+@@ -1221,6 +1224,21 @@
        exit(0);
  }
  
@@ -46,7 +23,7 @@ http://php-fpm.anight.org/
 +      fprintf(stderr, "FastCGI graceful shutdown, pid %d\n", getpid());
 +#endif
 +
-+      /* Close the listeing socket so new processes can reuse the same port */
++      /* Close the listening socket so new processes can reuse the same port */
 +      closesocket(fcgi_fd);
 +      fcgi_fd = 0;
 +}
@@ -55,7 +32,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 +1351,6 @@
+@@ -1328,7 +1346,6 @@
        int requests = 0;
        int fastcgi = fcgi_is_fastcgi();
        char *bindpath = NULL;
@@ -63,15 +40,20 @@ http://php-fpm.anight.org/
        fcgi_request request;
        int repeats = 1;
        int benchmark = 0;
-@@ -1581,7 +1603,10 @@
+@@ -1579,9 +1596,13 @@
+                                       parent = 0;
+ 
                                        /* don't catch our signals */
-                                       sigaction(SIGTERM, &old_term, 0);
-                                       sigaction(SIGQUIT, &old_quit, 0);
+-                                      sigaction(SIGTERM, &old_term, 0);
+-                                      sigaction(SIGQUIT, &old_quit, 0);
 -                                      sigaction(SIGINT,  &old_int,  0);
-+                                      /* handler for SIGINT */
++                                      sigaction(SIGQUIT, &act, &old_quit);
++                                      sigaction(SIGINT, &act, &old_int);
++
++                                      /* call graceful shutdown handler for SIGTERM */
 +                                      act.sa_flags = 0;
 +                                      act.sa_handler = fastcgi_graceful_shutdown;
-+                                      sigaction(SIGINT, &act, &old_int);
++                                      sigaction(SIGTERM, &act, &old_term);
                                        break;
                                case -1:
                                        perror("php (pre-forking)");