diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-31 23:24:30 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-31 23:24:30 -0800 |
| commit | b68e7bd7ba481dac7e84beab9c951cde1ffc28d9 (patch) | |
| tree | e4fc933b98ffcd551302523b8d2855abf20405a5 | |
| parent | 6c06982d2d8f297154a871fe32860b3bace32900 (diff) | |
| parent | 9b6f8bfd4d3d9e64ba8024742661e0147c1ea1b9 (diff) | |
| download | php-git-b68e7bd7ba481dac7e84beab9c951cde1ffc28d9.tar.gz | |
Merge branch 'pull-request/1040'
* pull-request/1040:
Added two missing opcache ini directives (restrict_api and mmap_base)
| -rw-r--r-- | php.ini-development | 10 | ||||
| -rw-r--r-- | php.ini-production | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/php.ini-development b/php.ini-development index c619678878..9cf44fbffd 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1957,6 +1957,16 @@ ldap.max_links = -1 ; Useful for internal debugging only. ;opcache.protect_memory=0 +; Allows calling OPcache API functions only from PHP scripts which path is +; started from specified string. The default "" means no restriction +;opcache.restrict_api= + +; Mapping base of shared memory segments (for Windows only). All the PHP +; processes have to map shared memory into the same address space. This +; directive allows to manually fix the "Unable to reattach to base address" +; errors. +;opcache.mmap_base= + [curl] ; A default value for the CURLOPT_CAINFO option. This is required to be an ; absolute path. diff --git a/php.ini-production b/php.ini-production index 1310f6c1c6..2c3fa4d307 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1957,6 +1957,16 @@ ldap.max_links = -1 ; Useful for internal debugging only. ;opcache.protect_memory=0 +; Allows calling OPcache API functions only from PHP scripts which path is +; started from specified string. The default "" means no restriction +;opcache.restrict_api= + +; Mapping base of shared memory segments (for Windows only). All the PHP +; processes have to map shared memory into the same address space. This +; directive allows to manually fix the "Unable to reattach to base address" +; errors. +;opcache.mmap_base= + [curl] ; A default value for the CURLOPT_CAINFO option. This is required to be an ; absolute path. |