diff options
| author | Zeev Suraski <zeev@php.net> | 2004-02-25 10:57:10 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2004-02-25 10:57:10 +0000 |
| commit | eb6fd52e21919c3a78fe71c6a719af67b5a9ab1c (patch) | |
| tree | bab01ef9983f16c90916fd884d8967494dc15ff6 /Zend/zend.c | |
| parent | ca64573e1b96527d56ba7e584a48533b497846bb (diff) | |
| download | php-git-eb6fd52e21919c3a78fe71c6a719af67b5a9ab1c.tar.gz | |
- Rename compatiblity mode to zend.ze2_compatibility_mode (it doesn't only affect auto-clone).
- Perform implementation checks even with simple inheritance (off when
compatibility mode is enabled).
- Restore default arguments in interfaces and handle it correctly.
- Move registration of internal classes later in the startup sequence
in order to have INI options available.
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 8005076a4e..316abaec9f 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -73,20 +73,9 @@ static ZEND_INI_MH(OnUpdateErrorReporting) } -static ZEND_INI_MH(OnUpdateImplicitClone) -{ - if (!new_value) { - EG(implicit_clone) = 0; - } else { - EG(implicit_clone) = atoi(new_value) ? 1 : 0; - } - return SUCCESS; -} - - ZEND_INI_BEGIN() - ZEND_INI_ENTRY("error_reporting", NULL, ZEND_INI_ALL, OnUpdateErrorReporting) - ZEND_INI_ENTRY("zend2.implicit_clone", NULL, ZEND_INI_ALL, OnUpdateImplicitClone) + ZEND_INI_ENTRY("error_reporting", NULL, ZEND_INI_ALL, OnUpdateErrorReporting) + STD_ZEND_INI_BOOLEAN("zend.ze1_compatibility_mode", "0", ZEND_INI_ALL, OnUpdateBool, ze1_compatibility_mode, zend_executor_globals, executor_globals) ZEND_INI_END() @@ -643,7 +632,6 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i if (start_builtin_functions) { zend_startup_builtin_functions(TSRMLS_C); } - zend_register_default_classes(TSRMLS_C); zend_ini_startup(TSRMLS_C); |