Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed ZTS cache usage

Author: dstogov

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 \

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)