Re: com php-src: Use shorter php.ini directive name "opcache.huge_code_pages" and disable it by default.: ext/opcache/ZendAccelerator.c
ext/opcache/ZendAccelerator.h ext/opcache/zend_accelerator_module.c

Looks like you forgot to add these into the actual php.ini-development and php.ini-production. The option itself should at least be included with the default value, even though it isn't documented yet. -Hannes On Mon, Sep 14, 2015 at 3:54 PM, Dmitry Stogov <dmitry@php.net> wrote: > Commit: c104d329e1e3b0fe10b1291b6a3704a1f6ce4d26 > Author: Dmitry Stogov <dmitry@zend.com> Tue, 15 Sep 2015 01:54:04 +0300 > Parents: f2480582fbf8b15de934cceaeee86da7313e8acf > Branches: PHP-7.0 master > > Link: > http://git.php.net/?p=php-src.git;a=commitdiff;h=c104d329e1e3b0fe10b1291b6a3704a1f6ce4d26 > > Log: > Use shorter php.ini directive name "opcache.huge_code_pages" and disable it by > default. > > Changed paths: > M ext/opcache/ZendAccelerator.c > M ext/opcache/ZendAccelerator.h > M ext/opcache/zend_accelerator_module.c > > > Diff: > diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c > index d6fd262..2bbfb44 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 da3fc66..93344ec 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 5dfa8c1..11d631c 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() > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php >