Skip to content

Commit d6ac533

Browse files
committed
Merge branch 'PHP-8.2'
2 parents f9ef2db + 41fef8b commit d6ac533

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

ext/date/lib/parse_date.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Generated by re2c 0.15.3 on Wed Nov 30 15:55:25 2022 */
1+
/* Generated by re2c 0.15.3 on Wed Nov 30 15:57:27 2022 */
22
#line 1 "ext/date/lib/parse_date.re"
33
/*
44
* The MIT License (MIT)

ext/date/lib/timelib.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
# include "timelib_config.h"
3131
#endif
3232

33-
#define TIMELIB_VERSION 202202
34-
#define TIMELIB_EXTENDED_VERSION 20220102
35-
#define TIMELIB_ASCII_VERSION "2022.02"
33+
#define TIMELIB_VERSION 202203
34+
#define TIMELIB_EXTENDED_VERSION 20220301
35+
#define TIMELIB_ASCII_VERSION "2022.03"
3636

3737
#include <stdlib.h>
3838
#include <stdbool.h>

ext/date/lib/tm2unixtime.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@ static void do_adjust_timezone(timelib_time *tz, timelib_tzinfo *tzi)
423423
tz->is_localtime = 1;
424424

425425
in_transition = (
426+
actual_transition_time != INT64_MIN &&
426427
((tz->sse - actual_offset) >= (actual_transition_time + (current_offset - actual_offset))) &&
427428
((tz->sse - actual_offset) < actual_transition_time)
428429
);

0 commit comments

Comments
 (0)