com php-src: better fix for script encoding ini: Zend/zend.c

From: Date: Tue, 23 Dec 2014 16:33:30 +0000
Subject: com php-src: better fix for script encoding ini: Zend/zend.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83842@lists.php.net to get a copy of this message
Commit: e46852d2d5b7f2a2b9282978103da3aea36ab07d Author: Anatol Belski <ab@php.net> Tue, 23 Dec 2014 17:33:30 +0100 Parents: e2e5ed06d1e6a7cc0c7148ada9768a0c0aa16313 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e46852d2d5b7f2a2b9282978103da3aea36ab07d Log: better fix for script encoding ini Changed paths: M Zend/zend.c Diff: diff --git a/Zend/zend.c b/Zend/zend.c index 6913d51..942b0a0 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -89,13 +89,13 @@ static ZEND_INI_MH(OnUpdateGCEnabled) /* {{{ */ static ZEND_INI_MH(OnUpdateScriptEncoding) /* {{{ */ { - if (!CG(multibyte) || !new_value) { + if (!CG(multibyte)) { return FAILURE; } if (!zend_multibyte_get_functions()) { return SUCCESS; } - return zend_multibyte_set_script_encoding_by_string(new_value->val, new_value->len); + return zend_multibyte_set_script_encoding_by_string(new_value ? new_value->val : NULL, new_value ? new_value->len : 0); } /* }}} */

« previous php.cvs (#83842) next »