Upgrade timelib to 2021.08, which address some defects and performance

- Fixed bug #80998 (Missing second with inverted interval). - Speed up finding timezone offset information.
php · Aug 31, 2021 · 2bf451b · 2bf451b
1 parent 14f599e
commit 2bf451b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/NEWS b/NEWS
@@ -9,6 +9,10 @@ PHP                                                                        NEWS
   . Dispatch using LANG_NEUTRAL instead of LOCALE_SYSTEM_DEFAULT. (Dmitry
     Maksimov)
 
+- Date:
+  . Fixed bug #80998 (Missing second with inverted interval). (Derick)
+  . Speed up finding timezone offset information. (Derick)
+
 19 Aug 2021, PHP 8.1.0beta3
 
 - Core:

diff --git a/ext/date/lib/interval.c b/ext/date/lib/interval.c
@@ -232,6 +232,8 @@ timelib_time *timelib_add_wall(timelib_time *old_time, timelib_rel_time *interva
 		memcpy(&t->relative, interval, sizeof(timelib_rel_time));
 
 		timelib_update_ts(t, NULL);
+
+		timelib_update_from_sse(t);
 	} else {
 		if (interval->invert) {
 			bias = -1;
@@ -247,11 +249,14 @@ timelib_time *timelib_add_wall(timelib_time *old_time, timelib_rel_time *interva
 
 		do_range_limit(0, 1000000, 1000000, &interval->us, &interval->s);
 		t->sse += bias * timelib_hms_to_seconds(interval->h, interval->i, interval->s);
+		timelib_update_from_sse(t);
 		t->us += interval->us * bias;
+		if (bias == -1 && interval->us > 0) {
+			t->sse--;
+		}
 		timelib_do_normalize(t);
 	}
 
-	timelib_update_from_sse(t);
 	if (t->zone_type == TIMELIB_ZONETYPE_ID) {
 		timelib_set_timezone(t, t->tz_info);
 	}
@@ -287,7 +292,11 @@ timelib_time *timelib_sub_wall(timelib_time *old_time, timelib_rel_time *interva
 
 		do_range_limit(0, 1000000, 1000000, &interval->us, &interval->s);
 		t->sse -= bias * timelib_hms_to_seconds(interval->h, interval->i, interval->s);
+		timelib_update_from_sse(t);
 		t->us -= interval->us * bias;
+		if (bias == -1 && interval->us > 0) {
+			t->sse++;
+		}
 		timelib_do_normalize(t);
 	}
 

diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
@@ -29,6 +29,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <assert.h>
+#include <limits.h>
 
 #if defined(_MSC_VER)
 # define strtoll(s, f, b) _atoi64(s)
@@ -166,7 +167,13 @@ static const timelib_tz_lookup_table timelib_timezone_utc[] = {
 	{ "utc", 0, 0, "UTC" },
 };
 
-#define MAX_ABBR_LEN 5 /* the longest name in "timezonemap.h" and "fallbackmap.h" */
+#if defined(_POSIX_TZNAME_MAX)
+# define MAX_ABBR_LEN _POSIX_TZNAME_MAX
+#elif defined(TZNAME_MAX)
+# define MAX_ABBR_LEN TZNAME_MAX
+#else
+# define MAX_ABBR_LEN 6
+#endif
 
 static timelib_relunit const timelib_relunit_lookup[] = {
 	{ "ms",           TIMELIB_MICROSEC, 1000 },

diff --git a/ext/date/lib/timelib.h b/ext/date/lib/timelib.h
@@ -30,9 +30,9 @@
 # include "timelib_config.h"
 #endif
 
-#define TIMELIB_VERSION 202107
-#define TIMELIB_EXTENDED_VERSION 20210701
-#define TIMELIB_ASCII_VERSION "2021.07"
+#define TIMELIB_VERSION 202108
+#define TIMELIB_EXTENDED_VERSION 20210801
+#define TIMELIB_ASCII_VERSION "2021.08"
 
 #include <stdlib.h>
 #include <stdbool.h>