scottmac                Sat May 30 09:48:18 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/main       main.c 
  Log:
  MFH: 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.640.2.23.2.57.2.52&r2=1.640.2.23.2.57.2.53&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.52 
php-src/main/main.c:1.640.2.23.2.57.2.53
--- php-src/main/main.c:1.640.2.23.2.57.2.52    Mon May  4 21:18:21 2009
+++ php-src/main/main.c Sat May 30 09:48:16 2009
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.57.2.52 2009/05/04 21:18:21 kalle Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.53 2009/05/30 09:48:16 scottmac Exp $ */
 
 /* {{{ includes
  */
@@ -1276,7 +1276,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);
 }
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to