cvs: php-src(PHP_5_3) /main main.c

felipe Fri Jul 25 13:46:56 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/main main.c Log: - MFB: Fixed the parameter type expected. set_time_limit() should accept only integer. http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.26&r2=1.640.2.23.2.57.2.27&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.640.2.23.2.57.2.26 php-src/main/main.c:1.640.2.23.2.57.2.27 --- php-src/main/main.c:1.640.2.23.2.57.2.26 Mon Jul 21 09:40:59 2008 +++ php-src/main/main.c Fri Jul 25 13:46:56 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.640.2.23.2.57.2.26 2008/07/21 09:40:59 bjori Exp $ */ +/* $Id: main.c,v 1.640.2.23.2.57.2.27 2008/07/25 13:46:56 felipe Exp $ */ /* {{{ includes */ @@ -1028,23 +1028,27 @@ Sets the maximum time a script can run */ PHP_FUNCTION(set_time_limit) { - zval **new_timeout; + long new_timeout; + char *new_timeout_str; + int new_timeout_strlen; if (PG(safe_mode)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot set time limit in safe mode"); RETURN_FALSE; } - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &new_timeout) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &new_timeout) == FAILURE) { return; } + + new_timeout_strlen = zend_spprintf(&new_timeout_str, 0, "%ld", new_timeout); - convert_to_string_ex(new_timeout); - if (zend_alter_ini_entry_ex("max_execution_time", sizeof("max_execution_time"), Z_STRVAL_PP(new_timeout), Z_STRLEN_PP(new_timeout), PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC) == SUCCESS) { - RETURN_TRUE; + if (zend_alter_ini_entry_ex("max_execution_time", sizeof("max_execution_time"), new_timeout_str, new_timeout_strlen, PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC) == SUCCESS) { + RETVAL_TRUE; } else { - RETURN_FALSE; + RETVAL_FALSE; } + efree(new_timeout_str); } /* }}} */