cvs: php-src /main main.c

From: Date: Sat, 30 May 2009 09:47:39 +0000
Subject: cvs: php-src /main main.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-58413@lists.php.net to get a copy of this message
scottmac Sat May 30 09:47:39 2009 UTC Modified files: /php-src/main main.c Log: Make sure the timeout is checked in the shutdown function, patch from Etienne http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.799&r2=1.800&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.799 php-src/main/main.c:1.800 --- php-src/main/main.c:1.799 Mon May 4 19:55:33 2009 +++ php-src/main/main.c Sat May 30 09:47:39 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.799 2009/05/04 19:55:33 derick Exp $ */ +/* $Id: main.c,v 1.800 2009/05/30 09:47:39 scottmac Exp $ */ /* {{{ includes */ @@ -1378,7 +1378,7 @@ void php_on_timeout(int seconds TSRMLS_DC) /* {{{ */ { PG(connection_status) |= PHP_CONNECTION_TIMEOUT; - zend_set_timeout(EG(timeout_seconds), 0); + zend_set_timeout(EG(timeout_seconds), 1); if(PG(exit_on_timeout)) sapi_terminate_process(TSRMLS_C); } /* }}} */

« previous php.cvs (#58413) next »