diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-26 18:51:33 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-26 18:52:06 +0200 |
| commit | 14cd14ddafceab259accbad84719191c757bc22c (patch) | |
| tree | b3020413b6d04eae26ce228f9c9334e89b28b096 | |
| parent | 557f1ccf0cc185d712597e11ecedff3171a69110 (diff) | |
| parent | c4c3eb55a75f59fd73d0ee034ccaaf81ae46d8ec (diff) | |
| download | php-git-14cd14ddafceab259accbad84719191c757bc22c.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/opcache/shared_alloc_win32.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -24,6 +24,8 @@ PHP NEWS - Intl: . Fixed bug #65732 (grapheme_*() is not Unicode compliant on CR LF sequence). (cmb) +- Opcache: + . Fixed bug #72949 (Typo in opcache error message). (cmb) - PDO_DBlib: . Implemented stringify 'uniqueidentifier' fields. diff --git a/ext/opcache/shared_alloc_win32.c b/ext/opcache/shared_alloc_win32.c index 3b08db6959..cdfd90c14b 100644 --- a/ext/opcache/shared_alloc_win32.c +++ b/ext/opcache/shared_alloc_win32.c @@ -186,7 +186,7 @@ static int zend_shared_alloc_reattach(size_t requested_size, char **error_in) } #endif err = ERROR_INVALID_ADDRESS; - zend_win_error_message(ACCEL_LOG_FATAL, "Base address marks unusable memory region. Please setup opcache.file_cache and opcache.file_cache_callback directives for more convenient Opcache usage", err); + zend_win_error_message(ACCEL_LOG_FATAL, "Base address marks unusable memory region. Please setup opcache.file_cache and opcache.file_cache_fallback directives for more convenient Opcache usage", err); return ALLOC_FAILURE; } |