From: Dmitry Stogov <dmitry@php.net>
Date: Thu, 5 Nov 2009 10:38:56 +0000 (+0000)
Subject: Avoid invoking setitimer when timeouts have been disabled (Arvind Srinivasan)
X-Git-Tag: php-5.4.0alpha1~191^2~2427
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7234245e4ac5291d5e89e3cf54f4851eed6c52b4;p=php

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

diff --git a/main/main.c b/main/main.c
index dd9e409bb3..50f3e82e28 100644
--- 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;
 }