Author: glen Date: Wed Nov 7 18:49:22 2007 GMT Module: SOURCES Tag: HEAD ---- Log message: - init fcgi_fd as 0, otherwise it gets into infinitive spawning loop
---- Files affected: SOURCES: php-fcgi-graceful.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/php-fcgi-graceful.patch diff -u SOURCES/php-fcgi-graceful.patch:1.1 SOURCES/php-fcgi-graceful.patch:1.2 --- SOURCES/php-fcgi-graceful.patch:1.1 Wed Nov 7 17:37:43 2007 +++ SOURCES/php-fcgi-graceful.patch Wed Nov 7 19:49:17 2007 @@ -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 @@ @@ -5,19 +11,11 @@ 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; +} + + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-fcgi-graceful.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
