diff options
| author | Bernd Roemer <bernd@php.net> | 2001-12-02 17:31:11 +0000 |
|---|---|---|
| committer | Bernd Roemer <bernd@php.net> | 2001-12-02 17:31:11 +0000 |
| commit | 99639f5812f0e803eea07626084096faec108fe0 (patch) | |
| tree | b83c8ce407d34a9b45902dc12b0748cbb1bba7e6 | |
| parent | 4bffed77698a20d5204da47aaeaf39070e84fc1f (diff) | |
| download | php-git-99639f5812f0e803eea07626084096faec108fe0.tar.gz | |
Allow unserializer_callback_func to be turned off.
| -rw-r--r-- | ext/standard/var_unserializer.c | 2 | ||||
| -rw-r--r-- | ext/standard/var_unserializer.re | 2 | ||||
| -rw-r--r-- | main/main.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index 5aa3bc8cb2..7cc465d01e 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -393,7 +393,7 @@ yy20: } if (zend_hash_find(CG(class_table), class_name, len2 + 1, (void **) &ce) != SUCCESS) { - if (PG(unserialize_callback_func) == NULL) { + if ((PG(unserialize_callback_func) == NULL) || (PG(unserialize_callback_func)[0] == '\0')) { incomplete_class = 1; ce = PHP_IC_ENTRY; } else { diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 92087e0fc3..8820baa113 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -356,7 +356,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) } if (zend_hash_find(CG(class_table), class_name, len2 + 1, (void **) &ce) != SUCCESS) { - if (PG(unserialize_callback_func) == NULL) { + if ((PG(unserialize_callback_func) == NULL) || (PG(unserialize_callback_func)[0] == '\0')) { incomplete_class = 1; ce = PHP_IC_ENTRY; } else { diff --git a/main/main.c b/main/main.c index 2ab207f160..7c1d134859 100644 --- a/main/main.c +++ b/main/main.c @@ -239,7 +239,7 @@ PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("track_errors", "0", PHP_INI_ALL, OnUpdateBool, track_errors, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("y2k_compliance", "0", PHP_INI_ALL, OnUpdateBool, y2k_compliance, php_core_globals, core_globals) - STD_PHP_INI_ENTRY("unserialize_callback_func", NULL, PHP_INI_ALL, OnUpdateStringUnempty, unserialize_callback_func, php_core_globals, core_globals) + STD_PHP_INI_ENTRY("unserialize_callback_func", NULL, PHP_INI_ALL, OnUpdateString, unserialize_callback_func, php_core_globals, core_globals) STD_PHP_INI_ENTRY("arg_separator.output", "&", PHP_INI_ALL, OnUpdateStringUnempty, arg_separator.output, php_core_globals, core_globals) STD_PHP_INI_ENTRY("arg_separator.input", "&", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateStringUnempty, arg_separator.input, php_core_globals, core_globals) |