summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/main.c4
-rw-r--r--main/php_globals.h1
2 files changed, 2 insertions, 3 deletions
diff --git a/main/main.c b/main/main.c
index f47bf0b7a2..41496d26cf 100644
--- a/main/main.c
+++ b/main/main.c
@@ -432,7 +432,6 @@ PHP_INI_BEGIN()
PHP_INI_ENTRY_EX("highlight.keyword", HL_KEYWORD_COLOR, PHP_INI_ALL, NULL, php_ini_color_displayer_cb)
PHP_INI_ENTRY_EX("highlight.string", HL_STRING_COLOR, PHP_INI_ALL, NULL, php_ini_color_displayer_cb)
- STD_PHP_INI_BOOLEAN("allow_call_time_pass_reference", "1", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, allow_call_time_pass_reference, zend_compiler_globals, compiler_globals)
STD_PHP_INI_BOOLEAN("asp_tags", "0", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, asp_tags, zend_compiler_globals, compiler_globals)
STD_PHP_INI_ENTRY_EX("display_errors", "1", PHP_INI_ALL, OnUpdateDisplayErrors, display_errors, php_core_globals, core_globals, display_errors_mode)
STD_PHP_INI_BOOLEAN("display_startup_errors", "0", PHP_INI_ALL, OnUpdateBool, display_startup_errors, php_core_globals, core_globals)
@@ -2066,7 +2065,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
struct {
const long error_level;
const char *phrase;
- const char *directives[6]; /* Remember to change this if the number of directives change */
+ const char *directives[7]; /* Remember to change this if the number of directives change */
} directives[] = {
{
E_CORE_WARNING,
@@ -2088,6 +2087,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
"register_globals",
"register_long_arrays",
"zend.ze1_compatibility_mode",
+ "allow_call_time_pass_reference",
NULL
}
}
diff --git a/main/php_globals.h b/main/php_globals.h
index 6619bb30c9..09615738c8 100644
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -60,7 +60,6 @@ struct _php_core_globals {
zend_bool safe_mode;
- zend_bool allow_call_time_pass_reference;
zend_bool implicit_flush;
long output_buffering;