Use shorter php.ini directive name "opcache.huge_code_pages" and disable it by default.

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index d6fd2622eba61288060a709b8afa30ecc73c1057..2bbfb44481a97c72a45b431421d876558a1fa706 100644 (file)
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2585,7 +2585,7 @@ static int accel_startup(zend_extension *extension)
 #endif
 
 #ifdef HAVE_HUGE_CODE_PAGES
-       if (ZCG(accel_directives).enable_huge_code_pages &&
+       if (ZCG(accel_directives).huge_code_pages &&
            (strcmp(sapi_module.name, "cli") == 0 ||
             strcmp(sapi_module.name, "cli-server") == 0 ||
                 strcmp(sapi_module.name, "cgi-fcgi") == 0 ||

diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h
index da3fc66a4c4bda978c1093e4c85d464b603bc40c..93344ec0f5a715e763da027143cc0b4397e1e2b3 100644 (file)
--- a/ext/opcache/ZendAccelerator.h
+++ b/ext/opcache/ZendAccelerator.h
@@ -220,7 +220,7 @@ typedef struct _zend_accel_directives {
        zend_bool      file_cache_consistency_checks;
 #endif
 #ifdef HAVE_HUGE_CODE_PAGES
-       zend_bool      enable_huge_code_pages;
+       zend_bool      huge_code_pages;
 #endif
 } zend_accel_directives;
 

diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index 5dfa8c100c5de3e3242b37a85b189ec2c130224f..11d631c538db4e5c62ea53227058dbff40095d4c 100644 (file)
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -310,7 +310,7 @@ ZEND_INI_BEGIN()
        STD_PHP_INI_ENTRY("opcache.file_cache_consistency_checks" , "1"   , PHP_INI_SYSTEM, OnUpdateBool,          accel_directives.file_cache_consistency_checks, zend_accel_globals, accel_globals)
 #endif
 #ifdef HAVE_HUGE_CODE_PAGES
-       STD_PHP_INI_BOOLEAN("opcache.enable_huge_code_pages"      , "1"   , PHP_INI_SYSTEM, OnUpdateBool,      accel_directives.enable_huge_code_pages,        zend_accel_globals, accel_globals)
+       STD_PHP_INI_BOOLEAN("opcache.huge_code_pages"             , "0"   , PHP_INI_SYSTEM, OnUpdateBool,      accel_directives.huge_code_pages,               zend_accel_globals, accel_globals)
 #endif
 ZEND_INI_END()