Re: cvs: php-src(PHP_5_2) /ext/standard assert.c

From: Date: Fri, 23 Jun 2006 11:59:38 +0000
Subject: Re: cvs: php-src(PHP_5_2) /ext/standard assert.c
References: 1  Groups: php.cvs 
Request: Send a blank email to php-cvs+get-38879@lists.php.net to get a copy of this message
Hi Ilia, Ilia Alshanetsky wrote:
iliaa Fri Jun 23 11:37:53 2006 UTC
  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/standard	assert.c   Log:
Change E_ERROR to E_RECOVERABLE_ERROR http://cvs.php.net/viewvc.cgi/php-src/ext/standard/assert.c?r1=1.60.2.3&r2=1.60.2.3.2.1&diff_format=u Index: php-src/ext/standard/assert.c diff -u php-src/ext/standard/assert.c:1.60.2.3 php-src/ext/standard/assert.c:1.60.2.3.2.1 --- php-src/ext/standard/assert.c:1.60.2.3 Sun Jan 1 12:50:14 2006 +++ php-src/ext/standard/assert.c Fri Jun 23 11:37:53 2006 @@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
*/ -/* $Id: assert.c,v 1.60.2.3 2006/01/01 12:50:14 sniper Exp $ */ +/* $Id: assert.c,v 1.60.2.3.2.1 2006/06/23 11:37:53 iliaa Exp $ */ /* {{{ includes/startup/misc */ @@ -151,7 +151,7 @@ compiled_string_description = zend_make_compiled_string_description("assert code" TSRMLS_CC); if (zend_eval_string(myeval, &retval, compiled_string_description TSRMLS_CC) == FAILURE) { efree(compiled_string_description); - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Failure evaluating code: %s%s", PHP_EOL, myeval); + php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "Failure evaluating code: %s%s", PHP_EOL, myeval); /* php_error_docref() does not return in this case. */ See this comment, not sure about E_RECOVERABLE_ERROR, but if does return, then
the comment does not hold any more and probably more has to be changed?
} efree(compiled_string_description);
Regards, Andrey

« previous php.cvs (#38879) next »