From: Derick Rethans <derick@php.net>
Date: Fri, 3 Mar 2006 07:54:36 +0000 (+0000)
Subject: - MF51: Fixed bug #36599 (DATE_W3C format constant incorrect)
X-Git-Tag: RELEASE_1_2~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ae66c021dbfb3a0f5723d925fb615ff230e3a8b;p=php

- MF51: Fixed bug #36599 (DATE_W3C format constant incorrect)
---

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index b3f8a1e546..337fe69857 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -277,7 +277,7 @@ PHP_MINIT_FUNCTION(date)
 	REGISTER_STRING_CONSTANT("DATE_RFC2822", DATE_FORMAT_RFC2822, CONST_CS | CONST_PERSISTENT);
  	REGISTER_STRING_CONSTANT("DATE_RFC3339", DATE_FORMAT_RFC3339, CONST_CS | CONST_PERSISTENT);
 	REGISTER_STRING_CONSTANT("DATE_RSS",     DATE_FORMAT_RFC1123, CONST_CS | CONST_PERSISTENT);
-	REGISTER_STRING_CONSTANT("DATE_W3C",     DATE_FORMAT_ISO8601, CONST_CS | CONST_PERSISTENT);
+	REGISTER_STRING_CONSTANT("DATE_W3C",     DATE_FORMAT_RFC3339, CONST_CS | CONST_PERSISTENT);
 
 	REGISTER_LONG_CONSTANT("SUNFUNCS_RET_TIMESTAMP", SUNFUNCS_RET_TIMESTAMP, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SUNFUNCS_RET_STRING", SUNFUNCS_RET_STRING, CONST_CS | CONST_PERSISTENT);
diff --git a/ext/date/tests/bug36599.phpt b/ext/date/tests/bug36599.phpt
new file mode 100644
index 0000000000..b34a7c288f
--- /dev/null
+++ b/ext/date/tests/bug36599.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Bug #36599 (DATE_W3C format constant incorrect).
+--FILE--
+<?php
+date_default_timezone_set("UTC");
+
+echo date( DATE_ATOM, strtotime( "2006-03-03 08:47:55" ) ), "\n";
+echo date( DATE_W3C,  strtotime( "2006-03-03 08:47:55" ) ), "\n";
+?>
+--EXPECT--
+2006-03-03T08:47:55+00:00
+2006-03-03T08:47:55+00:00