cvs: php-src(PHP_5_1) / NEWS /ext/date php_date.c /ext/date/tests bug36224.phpt

derick Tue Jan 31 18:44:19 2006 UTC Added files: (Branch: PHP_5_1) /php-src/ext/date/tests bug36224.phpt Modified files: /php-src NEWS /php-src/ext/date php_date.c Log: - MFH: Fixed bug #36224 (date(DATE_ATOM) gives wrong results). http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.387&r2=1.2027.2.388&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.387 php-src/NEWS:1.2027.2.388 --- php-src/NEWS:1.2027.2.387 Tue Jan 31 18:38:52 2006 +++ php-src/NEWS Tue Jan 31 18:44:18 2006 @@ -20,6 +20,8 @@ on error. (Pierre) - Fixed bug #36235 (ocicolumnname returns false before a succesfull fetch). (Tony) +- Fixed bug #36224 (date(DATE_ATOM) gives wrong results). (Derick, Hannes + Magnusson) - Fixed bug #36222 (errorInfo in PDOException is always NULL). (Ilia) - Fixed bug #36185 (str_rot13(NULL) crash). (Pierre) - Fixed bug #36176 (PDO_PGSQL - PDO::exec() does not return number of rows http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.c?r1=1.43.2.39&r2=1.43.2.40&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.39 php-src/ext/date/php_date.c:1.43.2.40 --- php-src/ext/date/php_date.c:1.43.2.39 Sat Jan 28 06:18:01 2006 +++ php-src/ext/date/php_date.c Tue Jan 31 18:44:19 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_date.c,v 1.43.2.39 2006/01/28 06:18:01 fmk Exp $ */ +/* $Id: php_date.c,v 1.43.2.40 2006/01/31 18:44:19 derick Exp $ */ #include "php.h" #include "php_streams.h" @@ -235,6 +235,7 @@ #define DATE_TIMEZONEDB php_date_global_timezone_db ? php_date_global_timezone_db : timelib_builtin_db() +#define DATE_FORMAT_RFC3339 "Y-m-d\\TH:i:sP" #define DATE_FORMAT_ISO8601 "Y-m-d\\TH:i:sO" #define DATE_FORMAT_RFC1036 "l, d-M-y H:i:s T" #define DATE_FORMAT_RFC1123 "D, d M Y H:i:s T" @@ -260,7 +261,7 @@ #ifdef EXPERIMENTAL_DATE_SUPPORT date_register_classes(TSRMLS_C); #endif - REGISTER_STRING_CONSTANT("DATE_ATOM", DATE_FORMAT_ISO8601, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT("DATE_ATOM", DATE_FORMAT_RFC3339, CONST_CS | CONST_PERSISTENT); REGISTER_STRING_CONSTANT("DATE_COOKIE", DATE_FORMAT_RFC1123, CONST_CS | CONST_PERSISTENT); REGISTER_STRING_CONSTANT("DATE_ISO8601", DATE_FORMAT_ISO8601, CONST_CS | CONST_PERSISTENT); REGISTER_STRING_CONSTANT("DATE_RFC822", DATE_FORMAT_RFC1123, CONST_CS | CONST_PERSISTENT); @@ -459,6 +460,7 @@ char buffer[33]; timelib_time_offset *offset; timelib_sll isoweek, isoyear; + int rfc_colon = 0; if (!format_len) { return estrdup(""); @@ -537,9 +539,11 @@ /* timezone */ case 'I': snprintf(buffer, 32, "%d", localtime ? offset->is_dst : 0); break; - case 'O': snprintf(buffer, 32, "%c%02d%02d", + case 'P': rfc_colon = 1; /* break intentionally missing */ + case 'O': snprintf(buffer, 32, "%c%02d%s%02d", localtime ? ((offset->offset < 0) ? '-' : '+') : '+', localtime ? abs(offset->offset / 3600) : 0, + rfc_colon ? ":" : "", localtime ? abs((offset->offset % 3600) / 60) : 0 ); break; @@ -1198,7 +1202,7 @@ #define REGISTER_DATE_CLASS_CONST_STRING(const_name, value) \ zend_declare_class_constant_stringl(date_ce_date, const_name, sizeof(const_name)-1, value, sizeof(value)-1 TSRMLS_CC); - REGISTER_DATE_CLASS_CONST_STRING("ATOM", DATE_FORMAT_ISO8601); + REGISTER_DATE_CLASS_CONST_STRING("ATOM", DATE_FORMAT_RFC3339); REGISTER_DATE_CLASS_CONST_STRING("COOKIE", DATE_FORMAT_RFC1123); REGISTER_DATE_CLASS_CONST_STRING("ISO8601", DATE_FORMAT_ISO8601); REGISTER_DATE_CLASS_CONST_STRING("RFC822", DATE_FORMAT_RFC1123); @@ -1206,6 +1210,7 @@ REGISTER_DATE_CLASS_CONST_STRING("RFC1036", DATE_FORMAT_RFC1036); REGISTER_DATE_CLASS_CONST_STRING("RFC1123", DATE_FORMAT_RFC1123); REGISTER_DATE_CLASS_CONST_STRING("RFC2822", DATE_FORMAT_RFC2822); + REGISTER_DATE_CLASS_CONST_STRING("RFC3339", DATE_FORMAT_RFC3339); REGISTER_DATE_CLASS_CONST_STRING("RSS", DATE_FORMAT_RFC1123); REGISTER_DATE_CLASS_CONST_STRING("W3C", DATE_FORMAT_ISO8601); http://cvs.php.net/viewcvs.cgi/php-src/ext/date/tests/bug36224.phpt?view=markup&rev=1.1 Index: php-src/ext/date/tests/bug36224.phpt +++ php-src/ext/date/tests/bug36224.phpt --TEST-- Bug #36224 (date(DATE_ATOM) gives wrong resulsts) --FILE-- <?php date_default_timezone_set("Europe/Oslo"); echo date(DATE_ATOM, strtotime('2006-01-31T19:23:56Z')) . "\n"; echo date(DATE_ATOM, strtotime('2006-01-31T19:23:56')) . "\n"; ?> --EXPECT-- 2006-01-31T20:23:56+01:00 2006-01-31T19:23:56+01:00