Merge branch 'release/1.3.3' into develop

chusiang · May 5, 2017 · ee95101 · ee95101
2 parents 0184279 + 7c47baa
commit ee95101
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/templates/php.ini.centos.j2 b/templates/php.ini.centos.j2
@@ -1612,6 +1612,17 @@ ldap.max_links = -1
 [dba]
 ;dba.default_handler=
 
+[opcache]
+; Determines if Zend OPCache is enabled
+;   Default Value: 0
+opcache.enable={{ php_opcache_enable }}
+
+; How often (in seconds) to check file timestamps for changes to the shared
+; memory storage allocation. ("1" means validate once per second, but only
+; once per request. "0" means always validate)
+;   Default Value: 2
+opcache.revalidate_freq={{ php_opcache_revalidate_freq }}
+
 [curl]
 ; A default value for the CURLOPT_CAINFO option. This is required to be an
 ; absolute path.
@@ -1638,5 +1649,3 @@ ldap.max_links = -1
 ; Local Variables:
 ; tab-width: 4
 ; End:
-opcache.enable=1
-opcache.revalidate_freq=0
diff --git a/templates/php.ini.ubuntu.j2 b/templates/php.ini.ubuntu.j2
@@ -1765,6 +1765,7 @@ ldap.max_links = -1
 [opcache]
 ; Determines if Zend OPCache is enabled
 ;opcache.enable=0
+opcache.enable={{ php_opcache_enable }}
 
 ; Determines if Zend OPCache is enabled for the CLI version of PHP
 ;opcache.enable_cli=0
@@ -1795,7 +1796,7 @@ ldap.max_links = -1
 ; How often (in seconds) to check file timestamps for changes to the shared
 ; memory storage allocation. ("1" means validate once per second, but only
 ; once per request. "0" means always validate)
-opcache.revalidate_freq=0
+opcache.revalidate_freq={{ php_opcache_revalidate_freq }}
 
 ; Enables or disables file search in include_path optimization
 ;opcache.revalidate_path=0
@@ -1916,4 +1917,3 @@ opcache.revalidate_freq=0
 ; Local Variables:
 ; tab-width: 4
 ; End:
-opcache.enable=1