clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix DATE_FORMAT_COOKIE definition

Browse Source 
In all of http://curl.haxx.se/rfc/cookie_spec.html,
https://docs.microsoft.com/de-de/windows/win32/wininet/http-cookies
and https://tools.ietf.org/html/rfc7234#section-5.3 the cookie
datetime is specified as Mon, DD-Mon-YYYY HH:MM:SS GMT. However,
the current definition returns Monday, DD-Mon-YYY HH:MM:SS GMT.
Therefore, the "l" in "l, d-M-Y H:i:s T" must be changed to "D".

Closes GH-6783.
This commit is contained in:
Mahmood Dhia 2021-03-17 12:23:33 +01:00 committed by Nikita Popov
parent 1c178569b4
commit ac34648cf6
7 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UPGRADING
View File

@ -19,6 +19,10 @@ PHP 8.2 UPGRADE NOTES
1. Backward Incompatible Changes
========================================
- Datetime:
. DateTime::COOKIE has been changed from "l, d-M-Y H:i:s T" to
"D, d-M-Y H:i:s T" in line with IETF RFC 7234 section 5.3.
========================================
2. New Features
========================================

2
ext/date/php_date.c
View File

@ -375,7 +375,7 @@ ZEND_MODULE_POST_ZEND_DEACTIVATE_D(date)
* http://msdn.microsoft.com/en-us/library/windows/desktop/aa384321%28v=vs.85%29.aspx
* and http://curl.haxx.se/rfc/cookie_spec.html
*/
#define DATE_FORMAT_COOKIE "l, d-M-Y H:i:s T"
#define DATE_FORMAT_COOKIE "D, d-M-Y H:i:s T"
#define SUNFUNCS_RET_TIMESTAMP 0
#define SUNFUNCS_RET_STRING 1

2
ext/date/tests/DateTime_format_basic2.phpt
View File

@ -24,7 +24,7 @@ var_dump( $date->format( DateTime::W3C) ) ;
--EXPECT--
*** Testing date_format() : basic functionality - formatting coinstants ***
string(25) "2005-07-14T22:30:41+01:00"
string(34) "Thursday, 14-Jul-2005 22:30:41 BST"
string(29) "Thu, 14-Jul-2005 22:30:41 BST"
string(24) "2005-07-14T22:30:41+0100"
string(29) "Thu, 14 Jul 05 22:30:41 +0100"
string(32) "Thursday, 14-Jul-05 22:30:41 BST"

4
ext/date/tests/bug52063.phpt
View File

@ -11,5 +11,5 @@ echo $a->format(DateTime::COOKIE);
echo "\n";
?>
--EXPECT--
Thursday, 01-Jan-2009 00:00:00 WET
Thursday, 01-Jan-2009 00:00:00 WET
Thu, 01-Jan-2009 00:00:00 WET
Thu, 01-Jan-2009 00:00:00 WET

4
ext/date/tests/date_constants.phpt
View File

@ -41,8 +41,8 @@ Date constants
--EXPECT--
string(25) "2006-07-01T14:27:30+02:00"
string(25) "2006-05-30T14:32:13+02:00"
string(35) "Saturday, 01-Jul-2006 14:27:30 CEST"
string(34) "Tuesday, 30-May-2006 14:32:13 CEST"
string(30) "Sat, 01-Jul-2006 14:27:30 CEST"
string(30) "Tue, 30-May-2006 14:32:13 CEST"
string(24) "2006-07-01T14:27:30+0200"
string(24) "2006-05-30T14:32:13+0200"
string(29) "Sat, 01 Jul 06 14:27:30 +0200"

2
ext/date/tests/gmdate_variation13.phpt
View File

@ -39,7 +39,7 @@ string(25) "2008-08-08T08:08:08+00:00"
string(%d) "%s"
--DATE_COOKIE Constant--
string(32) "Friday, 08-Aug-2008 08:08:08 GMT"
string(29) "Fri, 08-Aug-2008 08:08:08 GMT"
string(%d) "%s"
--DATE_RFC822 Constant--

4
ext/date/tests/test-parse-from-format.phpt
View File

@ -32,8 +32,8 @@ object(DateTime)#2 (3) {
string(6) "+02:00"
}
string(16) "l, d-M-Y H:i:s T"
string(38) "Tuesday, 08-Jul-2008 22:14:12 GMT+0200"
string(16) "D, d-M-Y H:i:s T"
string(34) "Tue, 08-Jul-2008 22:14:12 GMT+0200"
object(DateTime)#1 (3) {
["date"]=>
string(26) "2008-07-08 22:14:12.000000"