Fixed unnecessary invokation of setitimer when timeouts have been disabled (Arvind...

diff --git a/NEWS b/NEWS
index 427f4603c79c5c14f399156c443d5ffb30d61644..f9edc5c4d4ea4764e0588872b4422af695742850 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ PHP                                                                        NEWS
   number of file uploads per-request to 100 by default, to prevent possible
   DOS via temporary file exhaustion. (Ilia)
 
+- Fixed unnecessary invokation of setitimer when timeouts have been disabled
+  (Arvind Srinivasan)
 - Fixed crash in com_print_typeinfo when an invalid typelib is given.
   (Pierre)
 - Fixed a safe_mode bypass in tempnam() identified by Grzegorz Stachowiak.  

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index f2655729b2e1bbb29a315c299a1d742128cf2929..f402017f99e619c89349e0f326ec8261d258cf4c 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1511,7 +1511,7 @@ void zend_unset_timeout(TSRMLS_D)
        }
 #else
 #      ifdef HAVE_SETITIMER
-       {
+       if (EG(timeout_seconds)) {
                struct itimerval no_timeout;
 
                no_timeout.it_value.tv_sec = no_timeout.it_value.tv_usec = no_timeout.it_interval.tv_sec = no_timeout.it_interval.tv_usec = 0;