cvs: php4 / main.c

thies Sun Jun 11 03:27:37 2000 EDT Modified files: /php4 main.c Log: (set_time_limit) converted to new API. # for some weird reason this fixes a newly introduced crash. Index: php4/main.c diff -u php4/main.c:1.265 php4/main.c:1.266 --- php4/main.c:1.265 Thu Jun 8 19:18:50 2000 +++ php4/main.c Sun Jun 11 03:27:36 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.265 2000/06/09 02:18:50 zeev Exp $ */ +/* $Id: main.c,v 1.266 2000/06/11 10:27:36 thies Exp $ */ #include <stdio.h> @@ -497,17 +497,19 @@ Sets the maximum time a script can run */ PHP_FUNCTION(set_time_limit) { - pval *new_timeout; + zval **new_timeout; PLS_FETCH(); if (PG(safe_mode)) { php_error(E_WARNING, "Cannot set time limit in safe mode"); RETURN_FALSE; } - if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &new_timeout) == FAILURE) { + + if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &new_timeout) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_long(new_timeout); + + convert_to_long_ex(new_timeout); /* FIXME ** This is BAD...in a threaded situation, any user can set the timeout for php on a server wide basis. INI variables should not be reset via a user script @@ -519,7 +521,7 @@ there no way to do per-thread timers on WIN32? */ php_unset_timeout(); - php_set_timeout(new_timeout->value.lval); + php_set_timeout(Z_LVAL_PP(new_timeout)); } /* }}} */