]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorDmitry Stogov <dmitry@zend.com>
Tue, 12 Mar 2019 14:36:02 +0000 (17:36 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 12 Mar 2019 14:36:02 +0000 (17:36 +0300)
* PHP-7.4:
  Avoid reinitailization of ZTS cache pointer. Initialize it once in TSRM.c

1  2 
Zend/zend.c
sapi/apache2handler/sapi_apache2.c
sapi/cli/php_cli.c

diff --cc Zend/zend.c
Simple merge
Simple merge
Simple merge