]> git.pld-linux.org Git - packages/php.git/commitdiff
- init fcgi_fd as 0, otherwise it gets into infinitive spawning loop
authorElan Ruusamäe <glen@pld-linux.org>
Wed, 7 Nov 2007 18:49:17 +0000 (18:49 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    php-fcgi-graceful.patch -> 1.2

php-fcgi-graceful.patch

index 10aba26c06199543b10a06fe6e17c18e642e671f..8323fc3c9fb0d78407836130b5c3856dfe385e81 100644 (file)
@@ -1,3 +1,9 @@
+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
 @@ -101,6 +101,9 @@
  static int parent = 1;
  
 +/* Socket we are listening on incoming connections */
-+static int fcgi_fd = -1;
++static int fcgi_fd = 0;
 +
  /**
   * Process group
   */
-@@ -116,6 +119,7 @@
- static char *php_optarg = NULL;
- static int php_optind = 1;
- static zend_module_entry cgi_module_entry;
-+static int accept_socket = -1;
- static const opt_struct OPTIONS[] = {
-       {'a', 0, "interactive"},
 @@ -1211,16 +1215,38 @@
  #endif
  
@@ -53,7 +51,7 @@
 +
 +      /* Whoever we also close the listeing socket (which PHP itself doesn't seem to do?!) */
 +      closesocket(fcgi_fd);
-+      fcgi_fd = -1;
++      fcgi_fd = 0;
 +}
 +
 +
This page took 2.3321 seconds and 4 git commands to generate.