pajoye Thu, 08 Sep 2011 09:17:21 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316405
Log:
- fix build when no zend signal support
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
U php/php-src/trunk/Zend/zend_execute_API.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c 2011-09-08
05:59:38 UTC (rev 316404)
+++ php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c 2011-09-08
09:17:21 UTC (rev 316405)
@@ -1328,6 +1328,7 @@
TSRMLS_FETCH();
if (zend_on_timeout) {
+#ifdef ZEND_SIGNALS
/*
We got here because we got a timeout signal, so we are in a
signal handler
at this point. However, we want to be able to timeout any
user-supplied
@@ -1335,6 +1336,7 @@
calling these
*/
SIGG(running) = 0;
+#endif
zend_on_timeout(EG(timeout_seconds) TSRMLS_CC);
}
Modified: php/php-src/trunk/Zend/zend_execute_API.c
===================================================================
--- php/php-src/trunk/Zend/zend_execute_API.c 2011-09-08 05:59:38 UTC (rev
316404)
+++ php/php-src/trunk/Zend/zend_execute_API.c 2011-09-08 09:17:21 UTC (rev
316405)
@@ -1328,6 +1328,7 @@
TSRMLS_FETCH();
if (zend_on_timeout) {
+#ifdef ZEND_SIGNALS
/*
We got here because we got a timeout signal, so we are in a
signal handler
at this point. However, we want to be able to timeout any
user-supplied
@@ -1335,6 +1336,7 @@
calling these
*/
SIGG(running) = 0;
+#endif
zend_on_timeout(EG(timeout_seconds) TSRMLS_CC);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
