From b99773f1194d3c5c7dd77f266495e68460dde52a Mon Sep 17 00:00:00 2001
From: Craig Duncan <git@duncanc.co.uk>
Date: Sat, 1 Apr 2017 17:56:31 +0100
Subject: [PATCH 1/2] Add a test for bug 74080

---
 ext/date/tests/bug74080.phpt | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 ext/date/tests/bug74080.phpt

diff --git a/ext/date/tests/bug74080.phpt b/ext/date/tests/bug74080.phpt
new file mode 100644
index 0000000000000..3c881edeec8da
--- /dev/null
+++ b/ext/date/tests/bug74080.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Bug #74080 Provide an RFC7231 date time format
+--FILE--
+<?php
+
+$date = mktime(17, 52, 13, 4, 30, 2016);
+var_dump(date(\DateTime::RFC7231, $date));
+
+?>
+--EXPECTF--
+string(29) "Sat, 30 Apr 2016 17:52:13 GMT"

From b8f7913d87070c60c9bdaf1f313cb12e15944ae0 Mon Sep 17 00:00:00 2001
From: Craig Duncan <git@duncanc.co.uk>
Date: Sat, 1 Apr 2017 17:56:11 +0100
Subject: [PATCH 2/2] Add a new datetime constant for RFC7231

---
 ext/date/php_date.c                 | 7 +++++++
 ext/date/tests/DateTime_verify.phpt | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 8f81117d111e3..914478947b39e 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -764,6 +764,11 @@ PHP_RSHUTDOWN_FUNCTION(date)
  */
 #define DATE_FORMAT_RFC1123  "D, d M Y H:i:s O"
 
+/*
+ * RFC7231, Section 7.1.1: http://tools.ietf.org/html/rfc7231
+ */
+#define DATE_FORMAT_RFC7231  "D, d M Y H:i:s \\G\\M\\T"
+
 /*
  * RFC2822, Section 3.3: http://www.ietf.org/rfc/rfc2822.txt
  *  FWS             =       ([*WSP CRLF] 1*WSP) /   ; Folding white space
@@ -857,6 +862,7 @@ PHP_MINIT_FUNCTION(date)
 	REGISTER_STRING_CONSTANT("DATE_RFC850",  DATE_FORMAT_RFC850,  CONST_CS | CONST_PERSISTENT);
 	REGISTER_STRING_CONSTANT("DATE_RFC1036", DATE_FORMAT_RFC1036, CONST_CS | CONST_PERSISTENT);
 	REGISTER_STRING_CONSTANT("DATE_RFC1123", DATE_FORMAT_RFC1123, CONST_CS | CONST_PERSISTENT);
+	REGISTER_STRING_CONSTANT("DATE_RFC7231", DATE_FORMAT_RFC7231, CONST_CS | CONST_PERSISTENT);
 	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_RFC3339_EXTENDED", DATE_FORMAT_RFC3339_EXTENDED, CONST_CS | CONST_PERSISTENT);
@@ -2048,6 +2054,7 @@ static void date_register_classes(void) /* {{{ */
 	REGISTER_DATE_CLASS_CONST_STRING("RFC850",           DATE_FORMAT_RFC850);
 	REGISTER_DATE_CLASS_CONST_STRING("RFC1036",          DATE_FORMAT_RFC1036);
 	REGISTER_DATE_CLASS_CONST_STRING("RFC1123",          DATE_FORMAT_RFC1123);
+	REGISTER_DATE_CLASS_CONST_STRING("RFC7231",          DATE_FORMAT_RFC7231);
 	REGISTER_DATE_CLASS_CONST_STRING("RFC2822",          DATE_FORMAT_RFC2822);
 	REGISTER_DATE_CLASS_CONST_STRING("RFC3339",          DATE_FORMAT_RFC3339);
 	REGISTER_DATE_CLASS_CONST_STRING("RFC3339_EXTENDED", DATE_FORMAT_RFC3339_EXTENDED);
diff --git a/ext/date/tests/DateTime_verify.phpt b/ext/date/tests/DateTime_verify.phpt
index 33768969dc1bd..bb3ed9909a3ac 100644
--- a/ext/date/tests/DateTime_verify.phpt
+++ b/ext/date/tests/DateTime_verify.phpt
@@ -156,7 +156,7 @@ array(18) {
   }
 }
 ..and get names of all its class constants
-array(12) {
+array(13) {
   ["ATOM"]=>
   string(13) "Y-m-d\TH:i:sP"
   ["COOKIE"]=>
@@ -171,6 +171,8 @@ array(12) {
   string(16) "D, d M y H:i:s O"
   ["RFC1123"]=>
   string(16) "D, d M Y H:i:s O"
+  ["RFC7231"]=>
+  string(21) "D, d M Y H:i:s \G\M\T"
   ["RFC2822"]=>
   string(16) "D, d M Y H:i:s O"
   ["RFC3339"]=>