Avoid invoking setitimer when timeouts have been disabled (Arvind Srinivasan)

diff --git a/main/main.c b/main/main.c
index e4a5c3bc64756c9147ac6272a9ca6e0fd52a68e6..4261b520cb25e38a63bfa6acc9d707bd2d0fe2c8 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -204,12 +204,13 @@ static void php_disable_classes(TSRMLS_D)
  */
 static PHP_INI_MH(OnUpdateTimeout)
 {
-       EG(timeout_seconds) = atoi(new_value);
        if (stage==PHP_INI_STAGE_STARTUP) {
                /* Don't set a timeout on startup, only per-request */
+               EG(timeout_seconds) = atoi(new_value);
                return SUCCESS;
        }
        zend_unset_timeout(TSRMLS_C);
+       EG(timeout_seconds) = atoi(new_value);
        zend_set_timeout(EG(timeout_seconds));
        return SUCCESS;
 }