Author: glen Date: Wed Nov 7 22:54:43 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- update to 5.2.5RC2, FASTCGI #ifdefines
---- Files affected:
SOURCES:
php-fcgi-graceful.patch (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SOURCES/php-fcgi-graceful.patch
diff -u SOURCES/php-fcgi-graceful.patch:1.6 SOURCES/php-fcgi-graceful.patch:1.7
--- SOURCES/php-fcgi-graceful.patch:1.6 Wed Nov 7 21:38:06 2007
+++ SOURCES/php-fcgi-graceful.patch Wed Nov 7 23:54:38 2007
@@ -16,22 +16,25 @@
echo "end!<br>\n";
?>
---- 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
-@@ -101,6 +101,9 @@
+--- php-5.2.5RC2/sapi/cgi/cgi_main.c 2007-11-01 17:23:14.000000000 +0200
++++ php-5.2.5RC2-graceful/sapi/cgi/cgi_main.c 2007-11-08 00:46:38.999355875
+0200
+@@ -103,6 +103,11 @@
*/
static int parent = 1;
-+/* Socket we are listening on incoming connections */
++#if PHP_FASTCGI
++/* Socket we are listening on incoming FastCGI connections */
+static int fcgi_fd = 0;
++#endif
+
/**
* Process group
*/
-@@ -1221,6 +1224,21 @@
- exit(0);
+@@ -1157,6 +1162,22 @@
}
+ #endif
++#if PHP_FASTCGI
+/**
+ * Graceful shutdown. Close listening sockets.
+ */
@@ -45,12 +48,12 @@
+ closesocket(fcgi_fd);
+ fcgi_fd = 0;
+}
-+
++#endif
+
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 +1346,6 @@
+@@ -1275,7 +1296,6 @@
int requests = 0;
int fastcgi = fcgi_is_fastcgi();
char *bindpath = NULL;
@@ -58,20 +61,22 @@
fcgi_request request;
int repeats = 1;
int benchmark = 0;
-@@ -1579,9 +1596,13 @@
+@@ -1538,9 +1558,17 @@
parent = 0;
/* 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);
++#if PHP_FASTCGI
+
+ /* call graceful shutdown handler for
SIGTERM */
+ act.sa_flags = 0;
+ act.sa_handler =
fastcgi_graceful_shutdown;
+ sigaction(SIGTERM, &act, &old_term);
++#else
++ sigaction(SIGTERM, &old_term, 0);
++#endif
break;
case -1:
perror("php (pre-forking)");
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-fcgi-graceful.patch?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
