com php-src: use the delivered global arg instead of fetching it: Zend/zend.c

From: Date: Tue, 21 Feb 2017 11:12:42 +0000
Subject: com php-src: use the delivered global arg instead of fetching it: Zend/zend.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-97145@lists.php.net to get a copy of this message
Commit: b59f3cf1679a5bc3c4f1466f81596cffbe6bf7ed Author: Anatol Belski <ab@php.net> Tue, 21 Feb 2017 12:12:42 +0100 Parents: 298b62af47a7dc34b1f2f30690e3f84a53142062 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b59f3cf1679a5bc3c4f1466f81596cffbe6bf7ed Log: use the delivered global arg instead of fetching it Changed paths: M Zend/zend.c Diff: diff --git a/Zend/zend.c b/Zend/zend.c index bb1bc17..f6da573 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -623,7 +623,7 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{ ZEND_TSRMLS_CACHE_UPDATE(); zend_startup_constants(); - zend_copy_constants(EG(zend_constants), GLOBAL_CONSTANTS_TABLE); + zend_copy_constants(executor_globals->zend_constants, GLOBAL_CONSTANTS_TABLE); zend_init_rsrc_plist(); zend_init_exception_op(); zend_init_call_trampoline_op();

« previous php.cvs (#97145) next »