From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 14 Sep 2015 22:54:04 +0000 (+0300)
Subject: Use shorter php.ini directive name "opcache.huge_code_pages" and disable it by default.
X-Git-Tag: php-7.1.0alpha1~1171^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c104d329e1e3b0fe10b1291b6a3704a1f6ce4d26;p=php

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 d6fd2622eb..2bbfb44481 100644
--- 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 da3fc66a4c..93344ec0f5 100644
--- 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 5dfa8c100c..11d631c538 100644
--- 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()