Skip to content

Commit 618d979

Browse files
duncan3dckrakjoe
authored andcommitted
Fixed bug #74080 Add datetime constant for RFC7231
1 parent 7dc6b04 commit 618d979

File tree

4 files changed

+22
-1
lines changed

4 files changed

+22
-1
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ PHP NEWS
1010
- Date:
1111
. Fixed bug #74404 (Wrong reflection on DateTimeZone::getTransitions).
1212
(krakjoe)
13+
. Fixed bug #74080 (add constant for RFC7231 format datetime). (duncan3dc)
1314

1415
- DOM:
1516
. Fixed bug #74416 (Wrong reflection on DOMNode::cloneNode).

ext/date/php_date.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,11 @@ PHP_RSHUTDOWN_FUNCTION(date)
764764
*/
765765
#define DATE_FORMAT_RFC1123 "D, d M Y H:i:s O"
766766

767+
/*
768+
* RFC7231, Section 7.1.1: http://tools.ietf.org/html/rfc7231
769+
*/
770+
#define DATE_FORMAT_RFC7231 "D, d M Y H:i:s \\G\\M\\T"
771+
767772
/*
768773
* RFC2822, Section 3.3: http://www.ietf.org/rfc/rfc2822.txt
769774
* FWS = ([*WSP CRLF] 1*WSP) / ; Folding white space
@@ -857,6 +862,7 @@ PHP_MINIT_FUNCTION(date)
857862
REGISTER_STRING_CONSTANT("DATE_RFC850", DATE_FORMAT_RFC850, CONST_CS | CONST_PERSISTENT);
858863
REGISTER_STRING_CONSTANT("DATE_RFC1036", DATE_FORMAT_RFC1036, CONST_CS | CONST_PERSISTENT);
859864
REGISTER_STRING_CONSTANT("DATE_RFC1123", DATE_FORMAT_RFC1123, CONST_CS | CONST_PERSISTENT);
865+
REGISTER_STRING_CONSTANT("DATE_RFC7231", DATE_FORMAT_RFC7231, CONST_CS | CONST_PERSISTENT);
860866
REGISTER_STRING_CONSTANT("DATE_RFC2822", DATE_FORMAT_RFC2822, CONST_CS | CONST_PERSISTENT);
861867
REGISTER_STRING_CONSTANT("DATE_RFC3339", DATE_FORMAT_RFC3339, CONST_CS | CONST_PERSISTENT);
862868
REGISTER_STRING_CONSTANT("DATE_RFC3339_EXTENDED", DATE_FORMAT_RFC3339_EXTENDED, CONST_CS | CONST_PERSISTENT);
@@ -2050,6 +2056,7 @@ static void date_register_classes(void) /* {{{ */
20502056
REGISTER_DATE_CLASS_CONST_STRING("RFC850", DATE_FORMAT_RFC850);
20512057
REGISTER_DATE_CLASS_CONST_STRING("RFC1036", DATE_FORMAT_RFC1036);
20522058
REGISTER_DATE_CLASS_CONST_STRING("RFC1123", DATE_FORMAT_RFC1123);
2059+
REGISTER_DATE_CLASS_CONST_STRING("RFC7231", DATE_FORMAT_RFC7231);
20532060
REGISTER_DATE_CLASS_CONST_STRING("RFC2822", DATE_FORMAT_RFC2822);
20542061
REGISTER_DATE_CLASS_CONST_STRING("RFC3339", DATE_FORMAT_RFC3339);
20552062
REGISTER_DATE_CLASS_CONST_STRING("RFC3339_EXTENDED", DATE_FORMAT_RFC3339_EXTENDED);

ext/date/tests/DateTime_verify.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ array(18) {
156156
}
157157
}
158158
..and get names of all its class constants
159-
array(12) {
159+
array(13) {
160160
["ATOM"]=>
161161
string(13) "Y-m-d\TH:i:sP"
162162
["COOKIE"]=>
@@ -171,6 +171,8 @@ array(12) {
171171
string(16) "D, d M y H:i:s O"
172172
["RFC1123"]=>
173173
string(16) "D, d M Y H:i:s O"
174+
["RFC7231"]=>
175+
string(21) "D, d M Y H:i:s \G\M\T"
174176
["RFC2822"]=>
175177
string(16) "D, d M Y H:i:s O"
176178
["RFC3339"]=>

ext/date/tests/bug74080.phpt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--TEST--
2+
Bug #74080 Provide an RFC7231 date time format
3+
--FILE--
4+
<?php
5+
6+
$date = mktime(17, 52, 13, 4, 30, 2016);
7+
var_dump(date(\DateTime::RFC7231, $date));
8+
9+
?>
10+
--EXPECTF--
11+
string(29) "Sat, 30 Apr 2016 17:52:13 GMT"

0 commit comments

Comments
 (0)