php-fcgi-graceful.patch

   1 Related links:
   2
   3 http://bugs.php.net/bug.php?id=43224 this patch
   4
   5 http://bugs.php.net/bug.php?id=41593
   6 http://bugs.php.net/bug.php?id=36158
   7 http://php-fpm.anight.org/
   8
   9 test script too:
  10 <?php
  11 echo php_sapi_name(), ' running ', PHP_VERSION, "<br>\n";
  12 $i = 0;
  13 while ($i < 35) {
  14     echo (++$i), "<br>\n";
  15     flush();
  16     sleep(1);
  17 }
  18 echo "end!<br>\n";
  19 ?>
  20
  21 diff -urNp -x '*.orig' php-5.5.38.org/sapi/cgi/cgi_main.c php-5.5.38/sapi/cgi/cgi_main.c
  22 --- php-5.5.38.org/sapi/cgi/cgi_main.c  2016-07-20 10:41:48.000000000 +0200
  23 +++ php-5.5.38/sapi/cgi/cgi_main.c      2021-08-23 23:02:49.659949364 +0200
  24 @@ -107,6 +107,9 @@ static void (*php_php_import_environment
  25  static int children = 0;
  26
  27
  28 +/* Socket we are listening on incoming connections */
  29 +static int fcgi_fd = 0;
  30 +
  31  /**
  32   * Set to non-zero if we are the parent process
  33   */
  34 @@ -1453,6 +1456,21 @@ void fastcgi_cleanup(int signal)
  35  }
  36  #endif
  37
  38 +/**
  39 + * Graceful shutdown. Close listening sockets.
  40 + */
  41 +void fastcgi_graceful_shutdown(int signal)
  42 +{
  43 +#ifdef DEBUG_FASTCGI
  44 +       fprintf(stderr, "FastCGI graceful shutdown, pid %d\n", getpid());
  45 +#endif
  46 +
  47 +       /* Close the listening socket so new processes can reuse the same port */
  48 +       closesocket(fcgi_fd);
  49 +       fcgi_fd = 0;
  50 +}
  51 +
  52 +
  53  PHP_INI_BEGIN()
  54         STD_PHP_INI_ENTRY("cgi.rfc2616_headers",     "0",  PHP_INI_ALL,    OnUpdateBool,   rfc2616_headers, php_cgi_globals_struct, php_cgi_globals)
  55         STD_PHP_INI_ENTRY("cgi.nph",                 "0",  PHP_INI_ALL,    OnUpdateBool,   nph, php_cgi_globals_struct, php_cgi_globals)
  56 @@ -1756,7 +1774,6 @@ int main(int argc, char *argv[])
  57         int requests = 0;
  58         int fastcgi;
  59         char *bindpath = NULL;
  60 -       int fcgi_fd = 0;
  61         fcgi_request *request = NULL;
  62         int repeats = 1;
  63         int benchmark = 0;
  64 @@ -2049,9 +2066,13 @@ consult the installation file that came
  65                                         parent = 0;
  66
  67                                         /* don't catch our signals */
  68 -                                       sigaction(SIGTERM, &old_term, 0);
  69                                         sigaction(SIGQUIT, &old_quit, 0);
  70                                         sigaction(SIGINT,  &old_int,  0);
  71 +
  72 +                                       /* call graceful shutdown handler for SIGTERM */
  73 +                                       act.sa_flags = 0;
  74 +                                       act.sa_handler = fastcgi_graceful_shutdown;
  75 +                                       sigaction(SIGTERM, &act, &old_term);
  76                                         break;
  77                                 case -1:
  78                                         perror("php (pre-forking)");