diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-12-13 11:05:41 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-12-13 11:05:41 +0100 |
| commit | a40a69fdd058cdcb7da5d4527ea6c7dd261417b7 (patch) | |
| tree | 57e5c25e24516650f5d8dc7d7d608a9f8993d060 /Zend/zend.c | |
| parent | 01875e8b26788f97232f45cf1d22e6570ad7dd75 (diff) | |
| parent | 0f2cdbf214efd98b4bdaf5ca41728faf00e7c037 (diff) | |
| download | php-git-a40a69fdd058cdcb7da5d4527ea6c7dd261417b7.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Introduce extra counter to avoid RTD key collisions
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index d85135d287..3561b36af1 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -524,6 +524,8 @@ static void zend_set_default_compile_time_values(void) /* {{{ */ /* default compile-time values */ CG(short_tags) = short_tags_default; CG(compiler_options) = compiler_options_default; + + CG(rtd_key_counter) = 0; } /* }}} */ |