com php-src: Load "black list" only if O+ is enabled: ext/opcache/ZendAccelerator.c ext/opcache/zend_accelerator_ module.c
| From: | Dmitry Stogov | Date: | Sun, 17 Mar 2013 08:17:04 +0000 |
| Subject: | com php-src: Load "black list" only if O+ is enabled: ext/opcache/ZendAccelerator.c ext/opcache/zend_accelerator_ module.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71591@lists.php.net to get a copy of this message | ||
Commit: dcc927d3f2d199b0799152c9100906e64b94b5ea
Author: Dmitry Stogov <dmitry@zend.com> Sun, 17 Mar 2013 12:17:04 +0400
Parents: e66c8681c7e559c0893ec84ff16a4de3ea6d5f32
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dcc927d3f2d199b0799152c9100906e64b94b5ea
Log:
Load "black list" only if O+ is enabled
Changed paths:
M ext/opcache/ZendAccelerator.c
M ext/opcache/zend_accelerator_module.c
Diff:
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index daf80ce..a85b7e4 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2489,6 +2489,15 @@ static int accel_startup(zend_extension *extension)
/* Override file_exists(), is_file() and is_readable() */
zend_accel_override_file_functions(TSRMLS_C);
+ /* Load black list */
+ accel_blacklist.entries = NULL;
+ if (ZCG(enabled) && accel_startup_ok &&
+ ZCG(accel_directives).user_blacklist_filename &&
+ *ZCG(accel_directives.user_blacklist_filename)) {
+ zend_accel_blacklist_init(&accel_blacklist);
+ zend_accel_blacklist_load(&accel_blacklist, ZCG(accel_directives.user_blacklist_filename));
+ }
+
#if 0
/* FIXME: We probably don't need it here */
zend_accel_copy_internal_functions(TSRMLS_C);
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index e6c6939..4223a1f 100644
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -177,31 +177,6 @@ static ZEND_INI_MH(OnUpdateMaxWastedPercentage)
return SUCCESS;
}
-static ZEND_INI_MH(OnUpdateAccelBlacklist)
-{
- char **p;
-#ifndef ZTS
- char *base = (char *) mh_arg2;
-#else
- char *base = (char *) ts_resource(*((int *) mh_arg2));
-#endif
-
- /* keep the compiler happy */
- (void)entry; (void)new_value_length; (void)mh_arg2; (void)mh_arg3; (void)stage;
-
- if (new_value && !new_value[0]) {
- return FAILURE;
- }
-
- p = (char **) (base + (size_t)mh_arg1);
- *p = new_value;
-
- zend_accel_blacklist_init(&accel_blacklist);
- zend_accel_blacklist_load(&accel_blacklist, *p);
-
- return SUCCESS;
-}
-
ZEND_INI_BEGIN()
STD_PHP_INI_BOOLEAN("opcache.enable" , "1", PHP_INI_SYSTEM,
OnUpdateBool, enabled , zend_accel_globals, accel_globals)
STD_PHP_INI_BOOLEAN("opcache.use_cwd" , "1", PHP_INI_SYSTEM,
OnUpdateBool, accel_directives.use_cwd , zend_accel_globals, accel_globals)
@@ -221,7 +196,7 @@ ZEND_INI_BEGIN()
STD_PHP_INI_ENTRY("opcache.force_restart_timeout" , "180" , PHP_INI_SYSTEM,
OnUpdateLong, accel_directives.force_restart_timeout, zend_accel_globals,
accel_globals)
STD_PHP_INI_ENTRY("opcache.revalidate_freq" , "2" , PHP_INI_ALL ,
OnUpdateLong, accel_directives.revalidate_freq, zend_accel_globals,
accel_globals)
STD_PHP_INI_ENTRY("opcache.preferred_memory_model", "" , PHP_INI_SYSTEM,
OnUpdateStringUnempty, accel_directives.memory_model, zend_accel_globals,
accel_globals)
- STD_PHP_INI_ENTRY("opcache.blacklist_filename" , "" , PHP_INI_SYSTEM,
OnUpdateAccelBlacklist, accel_directives.user_blacklist_filename, zend_accel_globals,
accel_globals)
+ STD_PHP_INI_ENTRY("opcache.blacklist_filename" , "" , PHP_INI_SYSTEM,
OnUpdateString, accel_directives.user_blacklist_filename, zend_accel_globals,
accel_globals)
STD_PHP_INI_ENTRY("opcache.max_file_size" , "0" , PHP_INI_SYSTEM,
OnUpdateLong, accel_directives.max_file_size, zend_accel_globals,
accel_globals)
STD_PHP_INI_ENTRY("opcache.protect_memory" , "0" , PHP_INI_SYSTEM,
OnUpdateBool, accel_directives.protect_memory, zend_accel_globals,
accel_globals)
@@ -328,9 +303,6 @@ static ZEND_MINIT_FUNCTION(zend_accelerator)
{
(void)type; /* keep the compiler happy */
- /* must be 0 before the ini entry OnUpdate function is called */
- accel_blacklist.entries = NULL;
-
REGISTER_INI_ENTRIES();
#if ZEND_EXTENSION_API_NO < PHP_5_3_X_API_NO
zend_set_user_opcode_handler(ZEND_DECLARE_INHERITED_CLASS_DELAYED,
ZEND_DECLARE_INHERITED_CLASS_DELAYED_HANDLER);