diff options
| author | SVN Migration <svn@php.net> | 2008-12-07 19:23:27 +0000 |
|---|---|---|
| committer | SVN Migration <svn@php.net> | 2008-12-07 19:23:27 +0000 |
| commit | 1749f34d99fff5d87c8c5687e57b69d9cf018bf8 (patch) | |
| tree | ceca2a7d332239769793be15c49fafeb4d4a0642 /ext | |
| parent | 1ff15e8260869a22887bc2630082c0a168c5eb46 (diff) | |
| download | php-git-php-5.2.8.tar.gz | |
This commit was manufactured by cvs2svn to create tag 'php_5_2_8'.php-5.2.8
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/filter/filter.c | 2 | ||||
| -rw-r--r-- | ext/session/tests/022.phpt | 32 |
2 files changed, 1 insertions, 33 deletions
diff --git a/ext/filter/filter.c b/ext/filter/filter.c index ed74a44fca..77a4a62f6a 100644 --- a/ext/filter/filter.c +++ b/ext/filter/filter.c @@ -403,7 +403,7 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, unsigned int Z_STRLEN(new_var) = val_len; Z_TYPE(new_var) = IS_STRING; - if (IF_G(default_filter) != FILTER_UNSAFE_RAW || IF_G(default_filter_flags) != 0) { + if (IF_G(default_filter) != FILTER_UNSAFE_RAW) { zval *tmp_new_var = &new_var; Z_STRVAL(new_var) = estrndup(*val, val_len); INIT_PZVAL(tmp_new_var); diff --git a/ext/session/tests/022.phpt b/ext/session/tests/022.phpt deleted file mode 100644 index 5923bbe0bf..0000000000 --- a/ext/session/tests/022.phpt +++ /dev/null @@ -1,32 +0,0 @@ ---TEST-- -session object serialization ---SKIPIF-- -<?php include('skipif.inc'); ?> ---INI-- -session.use_cookies=0 -session.cache_limiter= -session.serialize_handler=php -session.save_handler=files ---FILE-- -<?php -error_reporting(E_ALL); - -class foo { - public $bar = "ok"; - - function method() { $this->yes = "done"; } -} - -$baz = new foo; -$baz->method(); - -$arr[3] = new foo; -$arr[3]->method(); -session_start(); -$_SESSION["baz"] = $baz; -$_SESSION["arr"] = $arr; -var_dump(session_encode()); -session_destroy(); -?> ---EXPECT-- -string(126) "baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";s:4:"done";}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";s:4:"done";}}" |