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

diff --git a/main/main.c b/main/main.c
index dd9e409bb3c0087b1004fe979099deffc135eccb..50f3e82e28000cb58e0f432358e7c24a8f22bec1 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -244,12 +244,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), 0);
        return SUCCESS;
 }