1 Index: php-5.2.11/Zend/zend_execute_API.c

     2 ===================================================================

     3 --- php-5.2.11/Zend/zend_execute_API.c	(revision 290230)

     4 +++ php-5.2.11/Zend/zend_execute_API.c	(revision 290231)

     5 @@ -1511,7 +1511,7 @@

     6  	}

     7  #else

     8  #	ifdef HAVE_SETITIMER

     9 -	{

    10 +	if (EG(timeout_seconds)) {

    11  		struct itimerval no_timeout;

    12  

    13  		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;

    14 Index: php-5.2.11/main/main.c

    15 ===================================================================

    16 --- php-5.2.11/main/main.c	(revision 290235)

    17 +++ php-5.2.11/main/main.c	(revision 290236)

    18 @@ -205,12 +205,13 @@

    19   */

    20  static PHP_INI_MH(OnUpdateTimeout)

    21  {

    22 -	EG(timeout_seconds) = atoi(new_value);

    23  	if (stage==PHP_INI_STAGE_STARTUP) {

    24  		/* Don't set a timeout on startup, only per-request */

    25 +		EG(timeout_seconds) = atoi(new_value);

    26  		return SUCCESS;

    27  	}

    28  	zend_unset_timeout(TSRMLS_C);

    29 +	EG(timeout_seconds) = atoi(new_value);

    30  	zend_set_timeout(EG(timeout_seconds));

    31  	return SUCCESS;

    32  }