]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 13 Dec 2019 10:05:41 +0000 (11:05 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 13 Dec 2019 10:05:41 +0000 (11:05 +0100)
* PHP-7.4:
  Introduce extra counter to avoid RTD key collisions

1  2 
Zend/zend.c
Zend/zend_compile.c
Zend/zend_globals.h
ext/opcache/zend_accelerator_util_funcs.c

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