diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-05-14 14:54:30 +0300 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2019-05-15 08:44:16 +0000 |
| commit | 53c1b485741f31a17b24f4db2b39afeb9f4c8aba (patch) | |
| tree | 21e524509ae20ad5a63ff704a62f61ac67769c76 /ext/opcache/ZendAccelerator.h | |
| parent | 40235e7eefb7057c2d41e3d86dc8f0dfb2e8b3e0 (diff) | |
| download | php-git-php-7.3.6RC1.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3php-7.3.6RC1
* PHP-7.2:
Fixed possible crashes, because of inconsistent PCRE cache and opcache SHM reset
Diffstat (limited to 'ext/opcache/ZendAccelerator.h')
| -rw-r--r-- | ext/opcache/ZendAccelerator.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h index 82d666ccdd..fb626fb09a 100644 --- a/ext/opcache/ZendAccelerator.h +++ b/ext/opcache/ZendAccelerator.h @@ -195,6 +195,8 @@ typedef struct _zend_accel_globals { int counted; /* the process uses shared memory */ zend_bool enabled; zend_bool locked; /* thread obtained exclusive lock */ + zend_bool accelerator_enabled; /* accelerator enabled for current request */ + zend_bool pcre_reseted; HashTable bind_hash; /* prototype and zval lookup table */ zend_accel_directives accel_directives; zend_string *cwd; /* current working directory or NULL */ |