From d9f81cb7a7693161fbad6b02e22b55b5254f74e8 Mon Sep 17 00:00:00 2001
From: Mahmood Dhia <mahmood.dhia@gmail.com>
Date: Wed, 17 Mar 2021 12:23:33 +0100
Subject: [PATCH 1/2] Fix DATE_FORMAT_COOKIE definition

---
 ext/date/php_date.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index a12f00957b6e..f53d1bbeef67 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -368,7 +368,7 @@ PHP_RSHUTDOWN_FUNCTION(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

From 6f1c478c4ee060079b16a18bbdd1d2250c1afc5e Mon Sep 17 00:00:00 2001
From: Mahmood Dhia <mahmood.dhia@check24.de>
Date: Wed, 17 Mar 2021 13:33:55 +0100
Subject: [PATCH 2/2] Fix DateTime::COOKIE related tests

---
 ext/date/tests/DateTime_format_basic2.phpt | 2 +-
 ext/date/tests/bug52063.phpt               | 4 ++--
 ext/date/tests/date_constants.phpt         | 4 ++--
 ext/date/tests/gmdate_variation13.phpt     | 2 +-
 ext/date/tests/test-parse-from-format.phpt | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/date/tests/DateTime_format_basic2.phpt b/ext/date/tests/DateTime_format_basic2.phpt
index df38cf44c44c..7c843485da18 100644
--- a/ext/date/tests/DateTime_format_basic2.phpt
+++ b/ext/date/tests/DateTime_format_basic2.phpt
@@ -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"
diff --git a/ext/date/tests/bug52063.phpt b/ext/date/tests/bug52063.phpt
index 9818c88ce7b8..86900cd5dbe1 100644
--- a/ext/date/tests/bug52063.phpt
+++ b/ext/date/tests/bug52063.phpt
@@ -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
diff --git a/ext/date/tests/date_constants.phpt b/ext/date/tests/date_constants.phpt
index 043b6b45cd8c..f8c50d4f5e90 100644
--- a/ext/date/tests/date_constants.phpt
+++ b/ext/date/tests/date_constants.phpt
@@ -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"
diff --git a/ext/date/tests/gmdate_variation13.phpt b/ext/date/tests/gmdate_variation13.phpt
index c8ded47ee449..90b52d360687 100644
--- a/ext/date/tests/gmdate_variation13.phpt
+++ b/ext/date/tests/gmdate_variation13.phpt
@@ -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--
diff --git a/ext/date/tests/test-parse-from-format.phpt b/ext/date/tests/test-parse-from-format.phpt
index 670a31685937..5c1376ec62c7 100644
--- a/ext/date/tests/test-parse-from-format.phpt
+++ b/ext/date/tests/test-parse-from-format.phpt
@@ -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"