com php-src: Fixed ZTS cache usage: sapi/fpm/config.m4 sapi/fpm/fpm/fpm_main.c

From: Date: Tue, 12 Mar 2019 12:25:51 +0000
Subject: com php-src: Fixed ZTS cache usage: sapi/fpm/config.m4 sapi/fpm/fpm/fpm_main.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-105106@lists.php.net to get a copy of this message
Commit: cf4ee57dc9024362aaf009ac82013cb86f9aa350 Author: Dmitry Stogov <dmitry@zend.com> Tue, 12 Mar 2019 15:25:51 +0300 Parents: 25d4af9413b478393b9bc92fdb585495d56d8e25 Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cf4ee57dc9024362aaf009ac82013cb86f9aa350 Log: Fixed ZTS cache usage Changed paths: M sapi/fpm/config.m4 M sapi/fpm/fpm/fpm_main.c Diff: diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 index 2fbfc79..b23a674 100644 --- a/sapi/fpm/config.m4 +++ b/sapi/fpm/config.m4 @@ -685,7 +685,7 @@ if test "$PHP_FPM" != "no"; then PHP_FPM_TRACE_FILES="fpm/fpm_trace.c fpm/fpm_trace_$fpm_trace_type.c" fi - PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm" + PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" PHP_FPM_FILES="fpm/fpm.c \ fpm/fpm_children.c \ diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index 33dc5f8..843e5d9 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -182,7 +182,7 @@ static void user_config_cache_entry_dtor(zval *el) #ifdef ZTS static int php_cgi_globals_id; -#define CGIG(v) TSRMG(php_cgi_globals_id, php_cgi_globals_struct *, v) +#define CGIG(v) ZEND_TSRMG(php_cgi_globals_id, php_cgi_globals_struct *, v) #else static php_cgi_globals_struct php_cgi_globals; #define CGIG(v) (php_cgi_globals.v)

« previous php.cvs (#105106) next »