2 # http://opensource.org/licenses/MIT
4 Add support for use of the system timezone database, rather
5 than embedding a copy. Discussed upstream but was not desired.
8 r17: adapt for timelib 2018.01 (in 7.3.2RC1)
9 r16: adapt for timelib 2017.06 (in 7.2.3RC1)
10 r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1)
11 r14: improve check for valid tz file
12 r13: adapt for upstream changes to use PHP allocator
13 r12: adapt for upstream changes for new zic
14 r11: use canonical names to avoid more case sensitivity issues
15 round lat/long from zone.tab towards zero per builtin db
16 r10: make timezone case insensitive
17 r9: fix another compile error without --with-system-tzdata configured (Michael Heimpold)
18 r8: fix compile error without --with-system-tzdata configured
19 r7: improve check for valid timezone id to exclude directories
20 r6: fix fd leak in r5, fix country code/BC flag use in
21 timezone_identifiers_list() using system db,
22 fix use of PECL timezonedb to override system db,
23 r5: reverts addition of "System/Localtime" fake tzname.
24 updated for 5.3.0, parses zone.tab to pick up mapping between
25 timezone name, country code and long/lat coords
26 r4: added "System/Localtime" tzname which uses /etc/localtime
27 r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
28 r2: add filesystem trawl to set up name alias index
31 diff -up php-7.3.2RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.2RC1/ext/date/lib/parse_tz.c
32 --- php-7.3.2RC1/ext/date/lib/parse_tz.c.systzdata 2019-01-22 13:20:08.000000000 +0100
33 +++ php-7.3.2RC1/ext/date/lib/parse_tz.c 2019-01-22 14:30:46.655691222 +0100
36 #include "timelib_private.h"
38 +#ifdef HAVE_SYSTEM_TZDATA
39 +#include <sys/mman.h>
40 +#include <sys/stat.h>
45 +#include "php_scandir.h"
48 #define TIMELIB_SUPPORTS_V2DATA
49 #include "timezonedb.h"
54 #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
55 # if defined(__LITTLE_ENDIAN__)
56 @@ -87,6 +100,11 @@ static int read_php_preamble(const unsig
60 + if (memcmp(*tzf, "TZif", 4) == 0) {
66 version = (*tzf)[3] - '0';
68 @@ -411,7 +429,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
72 -static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
73 +#ifdef HAVE_SYSTEM_TZDATA
75 +#ifdef HAVE_SYSTEM_TZDATA_PREFIX
76 +#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX
78 +#define ZONEINFO_PREFIX "/usr/share/zoneinfo"
81 +/* System timezone database pointer. */
82 +static const timelib_tzdb *timezonedb_system;
84 +/* Hash table entry for the cache of the zone.tab mapping table. */
85 +struct location_info {
87 + double latitude, longitude;
90 + struct location_info *next;
93 +/* Cache of zone.tab. */
94 +static struct location_info **system_location_table;
96 +/* Size of the zone.tab hash table; a random-ish prime big enough to
97 + * prevent too many collisions. */
98 +#define LOCINFO_HASH_SIZE (1021)
100 +/* Compute a case insensitive hash of str */
101 +static uint32_t tz_hash(const char *str)
103 + const unsigned char *p = (const unsigned char *)str;
104 + uint32_t hash = 5381;
107 + while ((c = tolower(*p++)) != '\0') {
108 + hash = (hash << 5) ^ hash ^ c;
111 + return hash % LOCINFO_HASH_SIZE;
114 +/* Parse an ISO-6709 date as used in zone.tab. Returns end of the
115 + * parsed string on success, or NULL on parse error. On success,
116 + * writes the parsed number to *result. */
117 +static char *parse_iso6709(char *p, double *result)
125 + else if (*p == '-')
131 + for (pend = p; *pend >= '0' && *pend <= '9'; pend++)
134 + /* Annoying encoding used by zone.tab has no decimal point, so use
135 + * the length to determine the format:
143 + if (len < 4 || len > 7) {
148 + v = (p[0] - '0') * 10.0 + (p[1] - '0');
150 + if (len == 5 || len == 7)
151 + v = v * 10.0 + (*p++ - '0');
153 + v += (10.0 * (p[0] - '0')
154 + + p[1] - '0') / 60.0;
158 + v += (10.0 * (p[0] - '0')
159 + + p[1] - '0') / 3600.0;
163 + /* Round to five decimal place, not because it's a good idea,
164 + * but, because the builtin data uses rounded data, so, match
166 + *result = trunc(v * sign * 100000.0) / 100000.0;
171 +/* This function parses the zone.tab file to build up the mapping of
172 + * timezone to country code and geographic location, and returns a
173 + * hash table. The hash table is indexed by the function:
175 + * tz_hash(timezone-name)
177 +static struct location_info **create_location_table(void)
179 + struct location_info **li, *i;
180 + char zone_tab[PATH_MAX];
184 + strncpy(zone_tab, ZONEINFO_PREFIX "/zone.tab", sizeof zone_tab);
186 + fp = fopen(zone_tab, "r");
191 + li = calloc(LOCINFO_HASH_SIZE, sizeof *li);
193 + while (fgets(line, sizeof line, fp)) {
194 + char *p = line, *code, *name, *comment;
196 + double latitude, longitude;
198 + while (isspace(*p))
201 + if (*p == '#' || *p == '\0' || *p == '\n')
204 + if (!isalpha(p[0]) || !isalpha(p[1]) || p[2] != '\t')
212 + /* coords => [+-][D]DDMM[SS][+-][D]DDMM[SS] */
213 + p = parse_iso6709(p, &latitude);
217 + p = parse_iso6709(p, &longitude);
222 + if (!p || *p != '\t') {
226 + /* name = string */
228 + while (*p != '\t' && *p && *p != '\n')
233 + /* comment = string */
235 + while (*p != '\t' && *p && *p != '\n')
238 + if (*p == '\n' || *p == '\t')
241 + hash = tz_hash(name);
242 + i = malloc(sizeof *i);
243 + memcpy(i->code, code, 2);
244 + strncpy(i->name, name, sizeof i->name);
245 + i->comment = strdup(comment);
246 + i->longitude = longitude;
247 + i->latitude = latitude;
248 + i->next = li[hash];
250 + /* printf("%s [%u, %f, %f]\n", name, hash, latitude, longitude); */
258 +/* Return location info from hash table, using given timezone name.
259 + * Returns NULL if the name could not be found. */
260 +const struct location_info *find_zone_info(struct location_info **li,
263 + uint32_t hash = tz_hash(name);
264 + const struct location_info *l;
270 + for (l = li[hash]; l; l = l->next) {
271 + if (timelib_strcasecmp(l->name, name) == 0)
278 +/* Filter out some non-tzdata files and the posix/right databases, if
280 +static int index_filter(const struct dirent *ent)
282 + return strcmp(ent->d_name, ".") != 0
283 + && strcmp(ent->d_name, "..") != 0
284 + && strcmp(ent->d_name, "posix") != 0
285 + && strcmp(ent->d_name, "posixrules") != 0
286 + && strcmp(ent->d_name, "right") != 0
287 + && strstr(ent->d_name, ".list") == NULL
288 + && strstr(ent->d_name, ".tab") == NULL;
291 +static int sysdbcmp(const void *first, const void *second)
293 + const timelib_tzdb_index_entry *alpha = first, *beta = second;
295 + return timelib_strcasecmp(alpha->id, beta->id);
299 +/* Create the zone identifier index by trawling the filesystem. */
300 +static void create_zone_index(timelib_tzdb *db)
302 + size_t dirstack_size, dirstack_top;
303 + size_t index_size, index_next;
304 + timelib_tzdb_index_entry *db_index;
307 + /* LIFO stack to hold directory entries to scan; each slot is a
308 + * directory name relative to the zoneinfo prefix. */
309 + dirstack_size = 32;
310 + dirstack = malloc(dirstack_size * sizeof *dirstack);
312 + dirstack[0] = strdup("");
316 + db_index = malloc(index_size * sizeof *db_index);
320 + struct dirent **ents;
321 + char name[PATH_MAX], *top;
324 + /* Pop the top stack entry, and iterate through its contents. */
325 + top = dirstack[--dirstack_top];
326 + snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top);
328 + count = php_scandir(name, &ents, index_filter, php_alphasort);
330 + while (count > 0) {
332 + const char *leaf = ents[count - 1]->d_name;
334 + snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s",
337 + if (strlen(name) && stat(name, &st) == 0) {
338 + /* Name, relative to the zoneinfo prefix. */
339 + const char *root = top;
341 + if (root[0] == '/') root++;
343 + snprintf(name, sizeof name, "%s%s%s", root,
344 + *root ? "/": "", leaf);
346 + if (S_ISDIR(st.st_mode)) {
347 + if (dirstack_top == dirstack_size) {
348 + dirstack_size *= 2;
349 + dirstack = realloc(dirstack,
350 + dirstack_size * sizeof *dirstack);
352 + dirstack[dirstack_top++] = strdup(name);
355 + if (index_next == index_size) {
357 + db_index = realloc(db_index,
358 + index_size * sizeof *db_index);
361 + db_index[index_next++].id = strdup(name);
365 + free(ents[--count]);
368 + if (count != -1) free(ents);
370 + } while (dirstack_top);
372 + qsort(db_index, index_next, sizeof *db_index, sysdbcmp);
374 + db->index = db_index;
375 + db->index_size = index_next;
380 +#define FAKE_HEADER "1234\0??\1??"
381 +#define FAKE_UTC_POS (7 - 4)
383 +/* Create a fake data segment for database 'sysdb'. */
384 +static void fake_data_segment(timelib_tzdb *sysdb,
385 + struct location_info **info)
390 + data = malloc(3 * sysdb->index_size + 7);
392 + p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1);
394 + for (n = 0; n < sysdb->index_size; n++) {
395 + const struct location_info *li;
396 + timelib_tzdb_index_entry *ent;
398 + ent = (timelib_tzdb_index_entry *)&sysdb->index[n];
400 + /* Lookup the timezone name in the hash table. */
401 + if (strcmp(ent->id, "UTC") == 0) {
402 + ent->pos = FAKE_UTC_POS;
406 + li = find_zone_info(info, ent->id);
408 + /* If found, append the BC byte and the
409 + * country code; set the position for this
410 + * section of timezone data. */
411 + ent->pos = (p - data) - 4;
413 + *p++ = li->code[0];
414 + *p++ = li->code[1];
417 + /* If not found, the timezone data can
418 + * point at the header. */
423 + sysdb->data = (unsigned char *)data;
426 +/* Returns true if the passed-in stat structure describes a
427 + * probably-valid timezone file. */
428 +static int is_valid_tzfile(const struct stat *st, int fd)
432 + if (read(fd, buf, 20)!=20) {
435 + lseek(fd, SEEK_SET, 0);
436 + if (memcmp(buf, "TZif", 4)) {
440 + return S_ISREG(st->st_mode) && st->st_size > 20;
443 +/* To allow timezone names to be used case-insensitively, find the
444 + * canonical name for this timezone, if possible. */
445 +static const char *canonical_tzname(const char *timezone)
447 + if (timezonedb_system) {
448 + timelib_tzdb_index_entry *ent, lookup;
450 + lookup.id = (char *)timezone;
452 + ent = bsearch(&lookup, timezonedb_system->index,
453 + timezonedb_system->index_size, sizeof lookup,
463 +/* Return the mmap()ed tzfile if found, else NULL. On success, the
464 + * length of the mapped data is placed in *length. */
465 +static char *map_tzfile(const char *timezone, size_t *length)
467 + char fname[PATH_MAX];
472 + if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) {
476 + snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone));
478 + fd = open(fname, O_RDONLY);
481 + } else if (fstat(fd, &st) != 0 || !is_valid_tzfile(&st, fd)) {
486 + *length = st.st_size;
487 + p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
490 + return p != MAP_FAILED ? p : NULL;
495 +static int inmem_seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
497 int left = 0, right = tzdb->index_size - 1;
499 @@ -437,9 +877,48 @@ static int seek_to_tz_position(const uns
503 +static int seek_to_tz_position(const unsigned char **tzf, char *timezone,
504 + char **map, size_t *maplen,
505 + const timelib_tzdb *tzdb)
507 +#ifdef HAVE_SYSTEM_TZDATA
508 + if (tzdb == timezonedb_system) {
511 + orig = map_tzfile(timezone, maplen);
512 + if (orig == NULL) {
516 + (*tzf) = (unsigned char *)orig;
523 + return inmem_seek_to_tz_position(tzf, timezone, tzdb);
527 const timelib_tzdb *timelib_builtin_db(void)
529 +#ifdef HAVE_SYSTEM_TZDATA
530 + if (timezonedb_system == NULL) {
531 + timelib_tzdb *tmp = malloc(sizeof *tmp);
533 + tmp->version = "0.system";
535 + create_zone_index(tmp);
536 + system_location_table = create_location_table();
537 + fake_data_segment(tmp, system_location_table);
538 + timezonedb_system = tmp;
541 + return timezonedb_system;
543 return &timezonedb_builtin;
547 const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
548 @@ -451,7 +930,30 @@ const timelib_tzdb_index_entry *timelib_
549 int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb)
551 const unsigned char *tzf;
552 - return (seek_to_tz_position(&tzf, timezone, tzdb));
554 +#ifdef HAVE_SYSTEM_TZDATA
555 + if (tzdb == timezonedb_system) {
556 + char fname[PATH_MAX];
559 + if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) {
563 + if (system_location_table) {
564 + if (find_zone_info(system_location_table, timezone) != NULL) {
565 + /* found in cache */
570 + snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone));
572 + return stat(fname, &st) == 0 && is_valid_tzfile(&st, 0);
576 + return (inmem_seek_to_tz_position(&tzf, timezone, tzdb));
579 static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
580 @@ -493,12 +995,14 @@ static timelib_tzinfo* timelib_tzinfo_ct
581 timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, int *error_code)
583 const unsigned char *tzf;
584 + char *memmap = NULL;
588 int transitions_result, types_result;
589 unsigned int type; /* TIMELIB_TZINFO_PHP or TIMELIB_TZINFO_ZONEINFO */
591 - if (seek_to_tz_position(&tzf, timezone, tzdb)) {
592 + if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) {
593 tmp = timelib_tzinfo_ctor(timezone);
595 version = read_preamble(&tzf, tmp, &type);
596 @@ -537,11 +1041,36 @@ timelib_tzinfo *timelib_parse_tzfile(cha
598 skip_posix_string(&tzf, tmp);
600 +#ifdef HAVE_SYSTEM_TZDATA
602 + const struct location_info *li;
604 + /* TZif-style - grok the location info from the system database,
607 + if ((li = find_zone_info(system_location_table, timezone)) != NULL) {
608 + tmp->location.comments = timelib_strdup(li->comment);
609 + strncpy(tmp->location.country_code, li->code, 2);
610 + tmp->location.longitude = li->longitude;
611 + tmp->location.latitude = li->latitude;
615 + set_default_location_and_comments(&tzf, tmp);
618 + /* Now done with the mmap segment - discard it. */
619 + munmap(memmap, maplen);
622 if (type == TIMELIB_TZINFO_PHP) {
623 read_location(&tzf, tmp);
625 set_default_location_and_comments(&tzf, tmp);
627 +#ifdef HAVE_SYSTEM_TZDATA
631 *error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
633 diff -up php-7.3.2RC1/ext/date/lib/timelib.m4.systzdata php-7.3.2RC1/ext/date/lib/timelib.m4
634 --- php-7.3.2RC1/ext/date/lib/timelib.m4.systzdata 2019-01-22 13:20:08.000000000 +0100
635 +++ php-7.3.2RC1/ext/date/lib/timelib.m4 2019-01-22 13:47:07.807374084 +0100
636 @@ -78,3 +78,16 @@ io.h
638 dnl Check for strtoll, atoll
639 AC_CHECK_FUNCS(strtoll atoll strftime gettimeofday)
641 +PHP_ARG_WITH(system-tzdata, for use of system timezone data,
642 +[ --with-system-tzdata[=DIR] to specify use of system timezone data],
645 +if test "$PHP_SYSTEM_TZDATA" != "no"; then
646 + AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
648 + if test "$PHP_SYSTEM_TZDATA" != "yes"; then
649 + AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
650 + [Define for location of system timezone data])