From 0249f6b6b6fd600374841f5a1c574a665beb0c1d Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Tue, 31 Jan 2006 18:44:19 +0000 Subject: [PATCH] - MFH: Fixed bug #36224 (date(DATE_ATOM) gives wrong results). --- NEWS | 2 ++ ext/date/php_date.c | 11 ++++++++--- ext/date/tests/bug36224.phpt | 13 +++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 ext/date/tests/bug36224.phpt diff --git a/NEWS b/NEWS index e8cb4ea8de..8aac2af185 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,8 @@ PHP NEWS 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 diff --git a/ext/date/php_date.c b/ext/date/php_date.c index dd72624940..17e160f603 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -235,6 +235,7 @@ PHP_RSHUTDOWN_FUNCTION(date) #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 @@ PHP_MINIT_FUNCTION(date) #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 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca char buffer[33]; timelib_time_offset *offset; timelib_sll isoweek, isoyear; + int rfc_colon = 0; if (!format_len) { return estrdup(""); @@ -537,9 +539,11 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca /* 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 @@ static void date_register_classes(TSRMLS_D) #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 @@ static void date_register_classes(TSRMLS_D) 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); diff --git a/ext/date/tests/bug36224.phpt b/ext/date/tests/bug36224.phpt new file mode 100644 index 0000000000..1690f4e7b2 --- /dev/null +++ b/ext/date/tests/bug36224.phpt @@ -0,0 +1,13 @@ +--TEST-- +Bug #36224 (date(DATE_ATOM) gives wrong resulsts) +--FILE-- + +--EXPECT-- +2006-01-31T20:23:56+01:00 +2006-01-31T19:23:56+01:00 -- 2.50.1