Skip to content

Commit 3d53e59

Browse files
committed
Merge remote-tracking branch 'derickr/merge-timelib-2021.12-and-add-tests' into PHP-8.1
2 parents ffd27bd + 008016b commit 3d53e59

20 files changed

+11786
-10299
lines changed

NEWS

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@ PHP NEWS
55
- CLI:
66
. Fixed bug GH-8575 (CLI closes standard streams too early). (Levi Morrison)
77

8+
- Date:
9+
. Fixed bug #51934 (strtotime plurals / incorrect time). (Derick)
10+
. Fixed bug #51987 (Datetime fails to parse an ISO 8601 ordinal date
11+
(extended format)). (Derick)
12+
. Fixed bug #66019 (DateTime object does not support short ISO 8601 time
13+
format - YYYY-MM-DDTHH) (cmb, Derick)
14+
. Fixed bug #68549 (Timezones and offsets are not properly used when working
15+
with dates) (Derick, Roel Harbers)
16+
. Fixed bug #81565 (date parsing fails when provided with timezones including
17+
seconds). (Derick)
18+
. Fixed bug GH-7758 (Problems with negative timestamps and fractions).
19+
(Derick, Ilija)
20+
821
- FPM:
922
. Fixed ACL build check on MacOS. (David Carlier)
1023
. Fixed bug #72185: php-fpm writes empty fcgi record causing nginx 502.

ext/date/lib/interval.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ timelib_time *timelib_sub_wall(timelib_time *old_time, timelib_rel_time *interva
308308
memcpy(&t->relative, interval, sizeof(timelib_rel_time));
309309

310310
timelib_update_ts(t, NULL);
311+
timelib_update_from_sse(t);
311312
} else {
312313
if (interval->invert) {
313314
bias = -1;
@@ -331,7 +332,6 @@ timelib_time *timelib_sub_wall(timelib_time *old_time, timelib_rel_time *interva
331332
timelib_do_normalize(t);
332333
}
333334

334-
timelib_update_from_sse(t);
335335
if (t->zone_type == TIMELIB_ZONETYPE_ID) {
336336
timelib_set_timezone(t, t->tz_info);
337337
}

0 commit comments

Comments
 (0)