diff options
| author | SVN Migration <svn@php.net> | 2004-04-08 19:21:47 +0000 |
|---|---|---|
| committer | SVN Migration <svn@php.net> | 2004-04-08 19:21:47 +0000 |
| commit | 3343bcddd4a01aa3848384d377a135e8a9e1cdde (patch) | |
| tree | a3ca58748fa9006daf9919722a18550317a1c42b | |
| parent | 46d273a2b9039047793474b803b090c795750a92 (diff) | |
| download | php-git-php-4.3.6RC3.tar.gz | |
This commit was manufactured by cvs2svn to create tag 'php_4_3_6RC3'.php-4.3.6RC3
| -rw-r--r-- | ext/standard/parsedate.y | 1 | ||||
| -rw-r--r-- | ext/standard/tests/serialize/bug27469.phpt | 27 |
2 files changed, 1 insertions, 27 deletions
diff --git a/ext/standard/parsedate.y b/ext/standard/parsedate.y index bacfcd4b8e..20b22796f4 100644 --- a/ext/standard/parsedate.y +++ b/ext/standard/parsedate.y @@ -604,6 +604,7 @@ static TABLE const TimezoneTable[] = { { "nt", tZONE, HOUR (11) }, /* Nome */ { "idlw", tZONE, HOUR (12) }, /* International Date Line West */ { "cet", tZONE, -HOUR (1) }, /* Central European */ + { "cest", tDAYZONE, -HOUR (1) }, /* Central European Summer */ { "met", tZONE, -HOUR (1) }, /* Middle European */ { "mewt", tZONE, -HOUR (1) }, /* Middle European Winter */ { "mest", tDAYZONE, -HOUR (1) }, /* Middle European Summer */ diff --git a/ext/standard/tests/serialize/bug27469.phpt b/ext/standard/tests/serialize/bug27469.phpt deleted file mode 100644 index e8d14106a8..0000000000 --- a/ext/standard/tests/serialize/bug27469.phpt +++ /dev/null @@ -1,27 +0,0 @@ ---TEST-- -Bug #27469 (serialize() objects of incomplete class) ---FILE-- -<?php -$str = 'O:9:"TestClass":0:{}'; -$obj = unserialize($str); -var_dump($obj); -echo serialize($obj)."\n"; -var_dump($obj); -echo serialize($obj)."\n"; -var_dump($obj); -?> ---EXPECT-- -object(__PHP_Incomplete_Class)#1 (1) { - ["__PHP_Incomplete_Class_Name"]=> - string(9) "TestClass" -} -O:9:"TestClass":0:{} -object(__PHP_Incomplete_Class)#1 (1) { - ["__PHP_Incomplete_Class_Name"]=> - string(9) "TestClass" -} -O:9:"TestClass":0:{} -object(__PHP_Incomplete_Class)#1 (1) { - ["__PHP_Incomplete_Class_Name"]=> - string(9) "TestClass" -} |