hholzgra Wed Nov 19 11:22:11 2003 EDT
Added files: (Branch: PHP_4_3)
/php-src/ext/standard/tests/time bug26317.phpt
Modified files:
/php-src/ext/standard parsedate.y
Log:
MFH
Index: php-src/ext/standard/parsedate.y
diff -u php-src/ext/standard/parsedate.y:1.34.2.3
php-src/ext/standard/parsedate.y:1.34.2.4
--- php-src/ext/standard/parsedate.y:1.34.2.3 Tue Nov 11 21:58:37 2003
+++ php-src/ext/standard/parsedate.y Wed Nov 19 11:22:10 2003
@@ -8,7 +8,7 @@
** This code is in the public domain and has no copyright.
*/
-/* $Id: parsedate.y,v 1.34.2.3 2003/11/12 02:58:37 iliaa Exp $ */
+/* $Id: parsedate.y,v 1.34.2.4 2003/11/19 16:22:10 hholzgra Exp $ */
#include "php.h"
@@ -620,30 +620,30 @@
/* Military timezone table. */
static TABLE const MilitaryTable[] = {
- { "a", tZONE, HOUR ( 1) },
- { "b", tZONE, HOUR ( 2) },
- { "c", tZONE, HOUR ( 3) },
- { "d", tZONE, HOUR ( 4) },
- { "e", tZONE, HOUR ( 5) },
- { "f", tZONE, HOUR ( 6) },
- { "g", tZONE, HOUR ( 7) },
- { "h", tZONE, HOUR ( 8) },
- { "i", tZONE, HOUR ( 9) },
- { "k", tZONE, HOUR ( 10) },
- { "l", tZONE, HOUR ( 11) },
- { "m", tZONE, HOUR ( 12) },
- { "n", tZONE, HOUR (- 1) },
- { "o", tZONE, HOUR (- 2) },
- { "p", tZONE, HOUR (- 3) },
- { "q", tZONE, HOUR (- 4) },
- { "r", tZONE, HOUR (- 5) },
- { "s", tZONE, HOUR (- 6) },
- { "t", tZONE, HOUR (- 7) },
- { "u", tZONE, HOUR (- 8) },
- { "v", tZONE, HOUR (- 9) },
- { "w", tZONE, HOUR (-10) },
- { "x", tZONE, HOUR (-11) },
- { "y", tZONE, HOUR (-12) },
+ { "a", tZONE, HOUR (- 1) },
+ { "b", tZONE, HOUR (- 2) },
+ { "c", tZONE, HOUR (- 3) },
+ { "d", tZONE, HOUR (- 4) },
+ { "e", tZONE, HOUR (- 5) },
+ { "f", tZONE, HOUR (- 6) },
+ { "g", tZONE, HOUR (- 7) },
+ { "h", tZONE, HOUR (- 8) },
+ { "i", tZONE, HOUR (- 9) },
+ { "k", tZONE, HOUR (-10) },
+ { "l", tZONE, HOUR (-11) },
+ { "m", tZONE, HOUR (-12) },
+ { "n", tZONE, HOUR ( 1) },
+ { "o", tZONE, HOUR ( 2) },
+ { "p", tZONE, HOUR ( 3) },
+ { "q", tZONE, HOUR ( 4) },
+ { "r", tZONE, HOUR ( 5) },
+ { "s", tZONE, HOUR ( 6) },
+ { "t", tZONE, HOUR ( 7) },
+ { "u", tZONE, HOUR ( 8) },
+ { "v", tZONE, HOUR ( 9) },
+ { "w", tZONE, HOUR ( 10) },
+ { "x", tZONE, HOUR ( 11) },
+ { "y", tZONE, HOUR ( 12) },
{ "z", tZONE, HOUR ( 0) },
{ NULL, 0, 0 }
};
Index: php-src/ext/standard/tests/time/bug26317.phpt
+++ php-src/ext/standard/tests/time/bug26317.phpt
--TEST--
Bug #xxxxx (military timezone offset signedness)
--SKIP--
if ([EMAIL PROTECTED]("TZ=GMT0") || getenv("TZ") != 'GMT0') {
die("skip unable to change TZ enviroment variable\n");
}
--FILE--
<?php
putenv("TZ=GMT0");
echo date("Y-m-d H:i:s\n", strtotime("2003-11-19 12:30:42 Z"));
echo date("Y-m-d H:i:s\n", strtotime("2003-11-19 12:30:42 T"));
echo date("Y-m-d H:i:s\n", strtotime("2003-11-19 12:30:42 k"));
?>
--EXPECT--
2003-11-19 12:30:42
2003-11-19 05:30:42
2003-11-19 22:30:42
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
