Author: glen Date: Fri Nov 9 11:45:11 2007 GMT Module: SOURCES Tag: DEVEL ---- Log message: - modify only SIGTERM signal handler for childs
---- Files affected: SOURCES: php-fcgi-graceful.patch (1.6 -> 1.6.2.1) ---- Diffs: ================================================================ Index: SOURCES/php-fcgi-graceful.patch diff -u SOURCES/php-fcgi-graceful.patch:1.6 SOURCES/php-fcgi-graceful.patch:1.6.2.1 --- SOURCES/php-fcgi-graceful.patch:1.6 Wed Nov 7 21:38:06 2007 +++ SOURCES/php-fcgi-graceful.patch Fri Nov 9 12:45:06 2007 @@ -1,5 +1,7 @@ Related links: +http://bugs.php.net/bug.php?id=43224 this patch + http://bugs.php.net/bug.php?id=41593 http://bugs.php.net/bug.php?id=36158 http://php-fpm.anight.org/ @@ -16,8 +18,8 @@ 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 +--- php5.3-200711090930/sapi/cgi/cgi_main.c 2007-11-01 13:32:38.000000000 +0200 ++++ php5.3-200711090930-graceful/sapi/cgi/cgi_main.c 2007-11-09 13:34:22.974559020 +0200 @@ -101,6 +101,9 @@ */ static int parent = 1; @@ -63,10 +65,8 @@ /* 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); + + /* call graceful shutdown handler for SIGTERM */ + act.sa_flags = 0; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-fcgi-graceful.patch?r1=1.6&r2=1.6.2.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
