diff options
| author | Anatol Belski <ab@php.net> | 2016-07-29 13:07:43 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-07-29 13:07:43 +0200 |
| commit | 0596a2561bd29d7438cecb39b574fa523707737e (patch) | |
| tree | f07d4043120cde9ac1b3337a5d0a8370eef9faec | |
| parent | 41d172d20f3c010f43468b1be3e32826fec0fa31 (diff) | |
| parent | 1666e80cb90c3c88bfd00522999e862625222e9b (diff) | |
| download | php-git-0596a2561bd29d7438cecb39b574fa523707737e.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
document file cache fallback ini directive
| -rw-r--r-- | php.ini-development | 5 | ||||
| -rw-r--r-- | php.ini-production | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/php.ini-development b/php.ini-development index 04db058008..b39689f5db 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1843,6 +1843,11 @@ ldap.max_links = -1 ; Enables or disables checksum validation when script loaded from file cache. ;opcache.file_cache_consistency_checks=1 +; Implies opcache.file_cache_only=1 for a certain process that failed to +; reattach to the shared memory (for Windows only). Explicitly enabled file +; cache is required. +;opcache.file_cache_fallback=1 + ; Enables or disables copying of PHP code (text segment) into HUGE PAGES. ; This should improve performance, but requires appropriate OS configuration. ;opcache.huge_code_pages=0 diff --git a/php.ini-production b/php.ini-production index 656c06ad8d..3c07f752dd 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1843,6 +1843,11 @@ ldap.max_links = -1 ; Enables or disables checksum validation when script loaded from file cache. ;opcache.file_cache_consistency_checks=1 +; Implies opcache.file_cache_only=1 for a certain process that failed to +; reattach to the shared memory (for Windows only). Explicitly enabled file +; cache is required. +;opcache.file_cache_fallback=1 + ; Enables or disables copying of PHP code (text segment) into HUGE PAGES. ; This should improve performance, but requires appropriate OS configuration. ;opcache.huge_code_pages=1 |