[packages/php.git] / php-systzdata.patch

# License: MIT
# http://opensource.org/licenses/MIT

Add support for use of the system timezone database, rather
than embedding a copy.  Discussed upstream but was not desired.

History:
r19: adapt for timelib 2020.02 (in 8.0.0beta2)
r18: adapt for autotool change in 7.3.3RC1
r17: adapt for timelib 2018.01 (in 7.3.2RC1)
r16: adapt for timelib 2017.06 (in 7.2.3RC1)
r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1)
r14: improve check for valid tz file
r13: adapt for upstream changes to use PHP allocator
r12: adapt for upstream changes for new zic
r11: use canonical names to avoid more case sensitivity issues
     round lat/long from zone.tab towards zero per builtin db
r10: make timezone case insensitive
r9: fix another compile error without --with-system-tzdata configured (Michael Heimpold)
r8: fix compile error without --with-system-tzdata configured
r7: improve check for valid timezone id to exclude directories
r6: fix fd leak in r5, fix country code/BC flag use in
    timezone_identifiers_list() using system db,
    fix use of PECL timezonedb to override system db,
r5: reverts addition of "System/Localtime" fake tzname.
    updated for 5.3.0, parses zone.tab to pick up mapping between
    timezone name, country code and long/lat coords
r4: added "System/Localtime" tzname which uses /etc/localtime
r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
r2: add filesystem trawl to set up name alias index
r1: initial revision

diff -up php-8.0.0beta3/ext/date/config0.m4.systzdata php-8.0.0beta3/ext/date/config0.m4
--- php-8.0.0beta3/ext/date/config0.m4.systzdata	2020-09-01 19:13:26.000000000 +0200
+++ php-8.0.0beta3/ext/date/config0.m4	2020-09-02 08:07:51.039979873 +0200
@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h])
 dnl Check for strtoll, atoll
 AC_CHECK_FUNCS(strtoll atoll)
 
+PHP_ARG_WITH(system-tzdata, for use of system timezone data,
+[  --with-system-tzdata[=DIR]      to specify use of system timezone data],
+no, no)
+
+if test "$PHP_SYSTEM_TZDATA" != "no"; then
+   AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
+
+   if test "$PHP_SYSTEM_TZDATA" != "yes"; then
+      AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
+                         [Define for location of system timezone data])
+   fi
+fi
+
 PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
 timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
                  lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
diff -up php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata php-8.0.0beta3/ext/date/lib/parse_tz.c
--- php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata	2020-09-01 19:13:26.000000000 +0200
+++ php-8.0.0beta3/ext/date/lib/parse_tz.c	2020-09-02 08:07:51.039979873 +0200
@@ -26,8 +26,21 @@
 #include "timelib.h"
 #include "timelib_private.h"
 
+#ifdef HAVE_SYSTEM_TZDATA
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <limits.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include "php_scandir.h"
+
+#else
 #define TIMELIB_SUPPORTS_V2DATA
 #include "timezonedb.h"
+#endif
+
+#include <ctype.h>
 
 #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
 # if defined(__LITTLE_ENDIAN__)
@@ -94,6 +107,11 @@ static int read_php_preamble(const unsig
 {
 	uint32_t version;
 
+	if (memcmp(*tzf, "TZif", 4) == 0) {
+		*tzf += 20;
+		return 0;
+	}
+
 	/* read ID */
 	version = (*tzf)[3] - '0';
 	*tzf += 4;
@@ -418,7 +436,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
 	}
 }
 
-static int seek_to_tz_position(const unsigned char **tzf, const char *timezone, const timelib_tzdb *tzdb)
+#ifdef HAVE_SYSTEM_TZDATA
+
+#ifdef HAVE_SYSTEM_TZDATA_PREFIX
+#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX
+#else
+#define ZONEINFO_PREFIX "/usr/share/zoneinfo"
+#endif
+
+/* System timezone database pointer. */
+static const timelib_tzdb *timezonedb_system;
+
+/* Hash table entry for the cache of the zone.tab mapping table. */
+struct location_info {
+        char code[2];
+        double latitude, longitude;
+        char name[64];
+        char *comment;
+        struct location_info *next;
+};
+
+/* Cache of zone.tab. */
+static struct location_info **system_location_table;
+
+/* Size of the zone.tab hash table; a random-ish prime big enough to
+ * prevent too many collisions. */
+#define LOCINFO_HASH_SIZE (1021)
+
+/* Compute a case insensitive hash of str */
+static uint32_t tz_hash(const char *str)
+{
+    const unsigned char *p = (const unsigned char *)str;
+    uint32_t hash = 5381;
+    int c;
+
+    while ((c = tolower(*p++)) != '\0') {
+        hash = (hash << 5) ^ hash ^ c;
+    }
+
+    return hash % LOCINFO_HASH_SIZE;
+}
+
+/* Parse an ISO-6709 date as used in zone.tab. Returns end of the
+ * parsed string on success, or NULL on parse error.  On success,
+ * writes the parsed number to *result. */
+static char *parse_iso6709(char *p, double *result)
+{
+    double v, sign;
+    char *pend;
+    size_t len;
+
+    if (*p == '+')
+        sign = 1.0;
+    else if (*p == '-')
+        sign = -1.0;
+    else
+        return NULL;
+
+    p++;
+    for (pend = p; *pend >= '0' && *pend <= '9'; pend++)
+        ;;
+
+    /* Annoying encoding used by zone.tab has no decimal point, so use
+     * the length to determine the format:
+     * 
+     * 4 = DDMM
+     * 5 = DDDMM
+     * 6 = DDMMSS
+     * 7 = DDDMMSS
+     */
+    len = pend - p;
+    if (len < 4 || len > 7) {
+        return NULL;
+    }
+
+    /* p => [D]DD */
+    v = (p[0] - '0') * 10.0 + (p[1] - '0');
+    p += 2;
+    if (len == 5 || len == 7)
+        v = v * 10.0 + (*p++ - '0');
+    /* p => MM[SS] */
+    v += (10.0 * (p[0] - '0')
+          + p[1] - '0') / 60.0;
+    p += 2;
+    /* p => [SS] */
+    if (len > 5) {
+        v += (10.0 * (p[0] - '0')
+              + p[1] - '0') / 3600.0;
+        p += 2;
+    }
+
+    /* Round to five decimal place, not because it's a good idea,
+     * but, because the builtin data uses rounded data, so, match
+     * that. */
+    *result = trunc(v * sign * 100000.0) / 100000.0;
+
+    return p;
+}
+
+/* This function parses the zone.tab file to build up the mapping of
+ * timezone to country code and geographic location, and returns a
+ * hash table.  The hash table is indexed by the function:
+ *
+ *   tz_hash(timezone-name)
+ */
+static struct location_info **create_location_table(void)
+{
+    struct location_info **li, *i;
+    char zone_tab[PATH_MAX];
+    char line[512];
+    FILE *fp;
+
+    strncpy(zone_tab, ZONEINFO_PREFIX "/zone.tab", sizeof zone_tab);
+
+    fp = fopen(zone_tab, "r");
+    if (!fp) {
+        return NULL;
+    }
+
+    li = calloc(LOCINFO_HASH_SIZE, sizeof *li);
+
+    while (fgets(line, sizeof line, fp)) {
+        char *p = line, *code, *name, *comment;
+        uint32_t hash;
+        double latitude, longitude;
+
+        while (isspace(*p))
+            p++;
+
+        if (*p == '#' || *p == '\0' || *p == '\n')
+            continue;
+        
+        if (!isalpha(p[0]) || !isalpha(p[1]) || p[2] != '\t')
+            continue;
+        
+        /* code => AA */
+        code = p;
+        p[2] = 0;
+        p += 3;
+
+        /* coords => [+-][D]DDMM[SS][+-][D]DDMM[SS] */
+        p = parse_iso6709(p, &latitude);
+        if (!p) {
+            continue;
+        }
+        p = parse_iso6709(p, &longitude);
+        if (!p) {
+            continue;
+        }
+
+        if (!p || *p != '\t') {
+            continue;
+        }
+
+        /* name = string */
+        name = ++p;
+        while (*p != '\t' && *p && *p != '\n')
+            p++;
+
+        *p++ = '\0';
+
+        /* comment = string */
+        comment = p;
+        while (*p != '\t' && *p && *p != '\n')
+            p++;
+
+        if (*p == '\n' || *p == '\t')
+            *p = '\0';
+        
+        hash = tz_hash(name);
+        i = malloc(sizeof *i);
+        memcpy(i->code, code, 2);
+        strncpy(i->name, name, sizeof i->name);
+        i->comment = strdup(comment);
+        i->longitude = longitude;
+        i->latitude = latitude;
+        i->next = li[hash];
+        li[hash] = i;
+        /* printf("%s [%u, %f, %f]\n", name, hash, latitude, longitude); */
+    }
+
+    fclose(fp);
+
+    return li;
+}
+
+/* Return location info from hash table, using given timezone name.
+ * Returns NULL if the name could not be found. */
+const struct location_info *find_zone_info(struct location_info **li, 
+                                           const char *name)
+{
+    uint32_t hash = tz_hash(name);
+    const struct location_info *l;
+
+    if (!li) {
+        return NULL;
+    }
+
+    for (l = li[hash]; l; l = l->next) {
+        if (timelib_strcasecmp(l->name, name) == 0)
+            return l;
+    }
+
+    return NULL;
+}    
+
+/* Filter out some non-tzdata files and the posix/right databases, if
+ * present. */
+static int index_filter(const struct dirent *ent)
+{
+	return strcmp(ent->d_name, ".") != 0
+		&& strcmp(ent->d_name, "..") != 0
+		&& strcmp(ent->d_name, "posix") != 0
+		&& strcmp(ent->d_name, "posixrules") != 0
+		&& strcmp(ent->d_name, "right") != 0
+		&& strstr(ent->d_name, ".list") == NULL
+		&& strstr(ent->d_name, ".tab") == NULL;
+}
+
+static int sysdbcmp(const void *first, const void *second)
+{
+        const timelib_tzdb_index_entry *alpha = first, *beta = second;
+
+        return timelib_strcasecmp(alpha->id, beta->id);
+}
+
+
+/* Create the zone identifier index by trawling the filesystem. */
+static void create_zone_index(timelib_tzdb *db)
+{
+	size_t dirstack_size,  dirstack_top;
+	size_t index_size, index_next;
+	timelib_tzdb_index_entry *db_index;
+	char **dirstack;
+
+	/* LIFO stack to hold directory entries to scan; each slot is a
+	 * directory name relative to the zoneinfo prefix. */
+	dirstack_size = 32;
+	dirstack = malloc(dirstack_size * sizeof *dirstack);
+	dirstack_top = 1;
+	dirstack[0] = strdup("");
+	
+	/* Index array. */
+	index_size = 64;
+	db_index = malloc(index_size * sizeof *db_index);
+	index_next = 0;
+
+	do {
+		struct dirent **ents;
+		char name[PATH_MAX], *top;
+		int count;
+
+		/* Pop the top stack entry, and iterate through its contents. */
+		top = dirstack[--dirstack_top];
+		snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top);
+
+		count = php_scandir(name, &ents, index_filter, php_alphasort);
+
+		while (count > 0) {
+			struct stat st;
+			const char *leaf = ents[count - 1]->d_name;
+
+			snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", 
+				 top, leaf);
+			
+			if (strlen(name) && stat(name, &st) == 0) {
+				/* Name, relative to the zoneinfo prefix. */
+				const char *root = top;
+
+				if (root[0] == '/') root++;
+
+				snprintf(name, sizeof name, "%s%s%s", root, 
+					 *root ? "/": "", leaf);
+
+				if (S_ISDIR(st.st_mode)) {
+					if (dirstack_top == dirstack_size) {
+						dirstack_size *= 2;
+						dirstack = realloc(dirstack, 
+								   dirstack_size * sizeof *dirstack);
+					}
+					dirstack[dirstack_top++] = strdup(name);
+				}
+				else {
+					if (index_next == index_size) {
+						index_size *= 2;
+						db_index = realloc(db_index,
+								   index_size * sizeof *db_index);
+					}
+
+					db_index[index_next++].id = strdup(name);
+				}
+			}
+
+			free(ents[--count]);
+		}
+		
+		if (count != -1) free(ents);
+		free(top);
+	} while (dirstack_top);
+
+        qsort(db_index, index_next, sizeof *db_index, sysdbcmp);
+
+	db->index = db_index;
+	db->index_size = index_next;
+
+	free(dirstack);
+}
+
+#define FAKE_HEADER "1234\0??\1??"
+#define FAKE_UTC_POS (7 - 4)
+
+/* Create a fake data segment for database 'sysdb'. */
+static void fake_data_segment(timelib_tzdb *sysdb,
+                              struct location_info **info)
+{
+        size_t n;
+        char *data, *p;
+        
+        data = malloc(3 * sysdb->index_size + 7);
+
+        p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1);
+
+        for (n = 0; n < sysdb->index_size; n++) {
+                const struct location_info *li;
+                timelib_tzdb_index_entry *ent;
+
+                ent = (timelib_tzdb_index_entry *)&sysdb->index[n];
+
+                /* Lookup the timezone name in the hash table. */
+                if (strcmp(ent->id, "UTC") == 0) {
+                        ent->pos = FAKE_UTC_POS;
+                        continue;
+                }
+
+                li = find_zone_info(info, ent->id);
+                if (li) {
+                        /* If found, append the BC byte and the
+                         * country code; set the position for this
+                         * section of timezone data.  */
+                        ent->pos = (p - data) - 4;
+                        *p++ = '\1';
+                        *p++ = li->code[0];
+                        *p++ = li->code[1];
+                }
+                else {
+                        /* If not found, the timezone data can
+                         * point at the header. */
+                        ent->pos = 0;
+                }
+        }
+        
+        sysdb->data = (unsigned char *)data;
+}
+
+/* Returns true if the passed-in stat structure describes a
+ * probably-valid timezone file. */
+static int is_valid_tzfile(const struct stat *st, int fd)
+{
+	if (fd) {
+		char buf[20];
+		if (read(fd, buf, 20)!=20) {
+			return 0;
+		}
+		lseek(fd, SEEK_SET, 0);
+		if (memcmp(buf, "TZif", 4)) {
+			return 0;
+		}
+	}
+	return S_ISREG(st->st_mode) && st->st_size > 20;
+}
+
+/* To allow timezone names to be used case-insensitively, find the
+ * canonical name for this timezone, if possible. */
+static const char *canonical_tzname(const char *timezone)
+{
+    if (timezonedb_system) {
+        timelib_tzdb_index_entry *ent, lookup;
+
+        lookup.id = (char *)timezone;
+
+        ent = bsearch(&lookup, timezonedb_system->index,
+                      timezonedb_system->index_size, sizeof lookup,
+                      sysdbcmp);
+        if (ent) {
+            return ent->id;
+        }
+    }
+
+    return timezone;
+}
+
+/* Return the mmap()ed tzfile if found, else NULL.  On success, the
+ * length of the mapped data is placed in *length. */
+static char *map_tzfile(const char *timezone, size_t *length)
+{
+	char fname[PATH_MAX];
+	struct stat st;
+	char *p;
+	int fd;
+	
+	if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) {
+		return NULL;
+	}
+
+	snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone));
+
+	fd = open(fname, O_RDONLY);
+	if (fd == -1) {
+		return NULL;
+	} else if (fstat(fd, &st) != 0 || !is_valid_tzfile(&st, fd)) {
+		close(fd);
+		return NULL;
+	}
+
+	*length = st.st_size;
+	p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
+	close(fd);
+	
+	return p != MAP_FAILED ? p : NULL;
+}
+
+#endif
+
+static int inmem_seek_to_tz_position(const unsigned char **tzf, const char *timezone, const timelib_tzdb *tzdb)
 {
 	int left = 0, right = tzdb->index_size - 1;
 
@@ -444,9 +884,48 @@ static int seek_to_tz_position(const uns
 	return 0;
 }
 
+static int seek_to_tz_position(const unsigned char **tzf, const char *timezone,
+			       char **map, size_t *maplen,
+			       const timelib_tzdb *tzdb)
+{
+#ifdef HAVE_SYSTEM_TZDATA
+	if (tzdb == timezonedb_system) {
+		char *orig;
+
+		orig = map_tzfile(timezone, maplen);
+		if (orig == NULL) {
+			return 0;
+		}
+
+		(*tzf) = (unsigned char *)orig;
+		*map = orig;
+        return 1;
+	}
+	else
+#endif
+	{
+		return inmem_seek_to_tz_position(tzf, timezone, tzdb);
+	}
+}
+
 const timelib_tzdb *timelib_builtin_db(void)
 {
+#ifdef HAVE_SYSTEM_TZDATA
+	if (timezonedb_system == NULL) {
+		timelib_tzdb *tmp = malloc(sizeof *tmp);
+
+		tmp->version = "0.system";
+		tmp->data = NULL;
+		create_zone_index(tmp);
+		system_location_table = create_location_table();
+		fake_data_segment(tmp, system_location_table);
+		timezonedb_system = tmp;
+	}
+
+	return timezonedb_system;
+#else
 	return &timezonedb_builtin;
+#endif
 }
 
 const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
@@ -458,7 +937,30 @@ const timelib_tzdb_index_entry *timelib_
 int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb)
 {
 	const unsigned char *tzf;
-	return (seek_to_tz_position(&tzf, timezone, tzdb));
+
+#ifdef HAVE_SYSTEM_TZDATA
+	if (tzdb == timezonedb_system) {
+		char fname[PATH_MAX];
+		struct stat st;
+
+		if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) {
+			return 0;
+		}
+
+		if (system_location_table) {
+			if (find_zone_info(system_location_table, timezone) != NULL) {
+				/* found in cache */
+				return 1;
+			}
+		}
+
+		snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone));
+
+		return stat(fname, &st) == 0 && is_valid_tzfile(&st, 0);
+	}
+#endif
+
+	return (inmem_seek_to_tz_position(&tzf, timezone, tzdb));
 }
 
 static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
@@ -500,12 +1002,14 @@ static timelib_tzinfo* timelib_tzinfo_ct
 timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code)
 {
 	const unsigned char *tzf;
+	char *memmap = NULL;
+	size_t maplen;
 	timelib_tzinfo *tmp;
 	int version;
 	int transitions_result, types_result;
 	unsigned int type; /* TIMELIB_TZINFO_PHP or TIMELIB_TZINFO_ZONEINFO */
 
-	if (seek_to_tz_position(&tzf, timezone, tzdb)) {
+	if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) {
 		tmp = timelib_tzinfo_ctor(timezone);
 
 		version = read_preamble(&tzf, tmp, &type);
@@ -540,11 +1044,36 @@ timelib_tzinfo *timelib_parse_tzfile(con
 		}
 		skip_posix_string(&tzf, tmp);
 
+#ifdef HAVE_SYSTEM_TZDATA
+		if (memmap) {
+			const struct location_info *li;
+
+			/* TZif-style - grok the location info from the system database,
+			 * if possible. */
+
+			if ((li = find_zone_info(system_location_table, timezone)) != NULL) {
+				tmp->location.comments = timelib_strdup(li->comment);
+				strncpy(tmp->location.country_code, li->code, 2);
+				tmp->location.longitude = li->longitude;
+				tmp->location.latitude = li->latitude;
+				tmp->bc = 1;
+			}
+			else {
+				set_default_location_and_comments(&tzf, tmp);
+			}
+
+			/* Now done with the mmap segment - discard it. */
+			munmap(memmap, maplen);
+		} else {
+#endif
 		if (type == TIMELIB_TZINFO_PHP) {
 			read_location(&tzf, tmp);
 		} else {
 			set_default_location_and_comments(&tzf, tmp);
 		}
+#ifdef HAVE_SYSTEM_TZDATA
+		}
+#endif
 	} else {
 		*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
 		tmp = NULL;
Commit	Line	Data
cacce04b ER	1	# License: MIT
	2	# http://opensource.org/licenses/MIT
	3
c0240cb1	4	Add support for use of the system timezone database, rather
	5	than embedding a copy. Discussed upstream but was not desired.
	6
	7	History:
060f741a	8	r19: adapt for timelib 2020.02 (in 8.0.0beta2)
5cd8d883	9	r18: adapt for autotool change in 7.3.3RC1
539ed3cb AG	10	r17: adapt for timelib 2018.01 (in 7.3.2RC1)
539ed3cb AG	11	r16: adapt for timelib 2017.06 (in 7.2.3RC1)
cacce04b ER	12	r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1)
cacce04b ER	13	r14: improve check for valid tz file
909e9211	14	r13: adapt for upstream changes to use PHP allocator
a659fa18 ER	15	r12: adapt for upstream changes for new zic
	16	r11: use canonical names to avoid more case sensitivity issues
	17	round lat/long from zone.tab towards zero per builtin db
	18	r10: make timezone case insensitive
361fb152 ER	19	r9: fix another compile error without --with-system-tzdata configured (Michael Heimpold)
361fb152 ER	20	r8: fix compile error without --with-system-tzdata configured
c0240cb1	21	r7: improve check for valid timezone id to exclude directories
a659fa18	22	r6: fix fd leak in r5, fix country code/BC flag use in
c0240cb1	23	timezone_identifiers_list() using system db,
	24	fix use of PECL timezonedb to override system db,
	25	r5: reverts addition of "System/Localtime" fake tzname.
	26	updated for 5.3.0, parses zone.tab to pick up mapping between
	27	timezone name, country code and long/lat coords
	28	r4: added "System/Localtime" tzname which uses /etc/localtime
	29	r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
	30	r2: add filesystem trawl to set up name alias index
	31	r1: initial revision
	32
060f741a ER	33	diff -up php-8.0.0beta3/ext/date/config0.m4.systzdata php-8.0.0beta3/ext/date/config0.m4
	34	--- php-8.0.0beta3/ext/date/config0.m4.systzdata 2020-09-01 19:13:26.000000000 +0200
	35	+++ php-8.0.0beta3/ext/date/config0.m4 2020-09-02 08:07:51.039979873 +0200
	36	@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h])
5cd8d883 AG	37	dnl Check for strtoll, atoll
	38	AC_CHECK_FUNCS(strtoll atoll)
	39
	40	+PHP_ARG_WITH(system-tzdata, for use of system timezone data,
	41	+[ --with-system-tzdata[=DIR] to specify use of system timezone data],
	42	+no, no)
	43	+
	44	+if test "$PHP_SYSTEM_TZDATA" != "no"; then
	45	+ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
	46	+
	47	+ if test "$PHP_SYSTEM_TZDATA" != "yes"; then
	48	+ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
	49	+ [Define for location of system timezone data])
	50	+ fi
	51	+fi
	52	+
	53	PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
	54	timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
	55	lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
060f741a ER	56	diff -up php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata php-8.0.0beta3/ext/date/lib/parse_tz.c
	57	--- php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata 2020-09-01 19:13:26.000000000 +0200
	58	+++ php-8.0.0beta3/ext/date/lib/parse_tz.c 2020-09-02 08:07:51.039979873 +0200
	59	@@ -26,8 +26,21 @@
c0240cb1	60	#include "timelib.h"
cacce04b	61	#include "timelib_private.h"
c0240cb1	62
	63	+#ifdef HAVE_SYSTEM_TZDATA
	64	+#include <sys/mman.h>
	65	+#include <sys/stat.h>
	66	+#include <limits.h>
	67	+#include <fcntl.h>
	68	+#include <unistd.h>
	69	+
	70	+#include "php_scandir.h"
c0240cb1	71	+
cacce04b	72	+#else
909e9211	73	#define TIMELIB_SUPPORTS_V2DATA
c0240cb1	74	#include "timezonedb.h"
	75	+#endif
	76	+
	77	+#include <ctype.h>
	78
	79	#if (defined(__APPLE__) \|\| defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) \|\| defined(__LITTLE_ENDIAN__))
	80	# if defined(__LITTLE_ENDIAN__)
060f741a	81	@@ -94,6 +107,11 @@ static int read_php_preamble(const unsig
c0240cb1	82	{
a659fa18 ER	83	uint32_t version;
	84
	85	+ if (memcmp(*tzf, "TZif", 4) == 0) {
	86	+ *tzf += 20;
	87	+ return 0;
	88	+ }
909e9211	89	+
a659fa18 ER	90	/* read ID */
	91	version = (*tzf)[3] - '0';
	92	*tzf += 4;
060f741a	93	@@ -418,7 +436,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
c0240cb1	94	}
	95	}
	96
060f741a	97	-static int seek_to_tz_position(const unsigned char *tzf, const char timezone, const timelib_tzdb *tzdb)
c0240cb1	98	+#ifdef HAVE_SYSTEM_TZDATA
	99	+
	100	+#ifdef HAVE_SYSTEM_TZDATA_PREFIX
	101	+#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX
	102	+#else
	103	+#define ZONEINFO_PREFIX "/usr/share/zoneinfo"
	104	+#endif
	105	+
	106	+/* System timezone database pointer. */
7588b36c	107	+static const timelib_tzdb *timezonedb_system;
c0240cb1	108	+
	109	+/* Hash table entry for the cache of the zone.tab mapping table. */
	110	+struct location_info {
	111	+ char code[2];
	112	+ double latitude, longitude;
	113	+ char name[64];
	114	+ char *comment;
	115	+ struct location_info *next;
	116	+};
	117	+
	118	+/* Cache of zone.tab. */
	119	+static struct location_info **system_location_table;
	120	+
	121	+/* Size of the zone.tab hash table; a random-ish prime big enough to
	122	+ * prevent too many collisions. */
	123	+#define LOCINFO_HASH_SIZE (1021)
	124	+
7588b36c	125	+/* Compute a case insensitive hash of str */
c0240cb1	126	+static uint32_t tz_hash(const char *str)
	127	+{
	128	+ const unsigned char p = (const unsigned char )str;
	129	+ uint32_t hash = 5381;
	130	+ int c;
909e9211	131	+
7588b36c	132	+ while ((c = tolower(*p++)) != '\0') {
c0240cb1	133	+ hash = (hash << 5) ^ hash ^ c;
c0240cb1	134	+ }
909e9211	135	+
c0240cb1	136	+ return hash % LOCINFO_HASH_SIZE;
	137	+}
	138	+
	139	+/* Parse an ISO-6709 date as used in zone.tab. Returns end of the
	140	+ * parsed string on success, or NULL on parse error. On success,
	141	+ * writes the parsed number to result. /
	142	+static char parse_iso6709(char p, double *result)
	143	+{
	144	+ double v, sign;
	145	+ char *pend;
	146	+ size_t len;
	147	+
	148	+ if (*p == '+')
	149	+ sign = 1.0;
	150	+ else if (*p == '-')
	151	+ sign = -1.0;
	152	+ else
	153	+ return NULL;
	154	+
	155	+ p++;
	156	+ for (pend = p; pend >= '0' && pend <= '9'; pend++)
	157	+ ;;
	158	+
	159	+ /* Annoying encoding used by zone.tab has no decimal point, so use
	160	+ * the length to determine the format:
	161	+ *
	162	+ * 4 = DDMM
	163	+ * 5 = DDDMM
	164	+ * 6 = DDMMSS
	165	+ * 7 = DDDMMSS
	166	+ */
	167	+ len = pend - p;
	168	+ if (len < 4 \|\| len > 7) {
	169	+ return NULL;
	170	+ }
	171	+
	172	+ /* p => [D]DD */
	173	+ v = (p[0] - '0') * 10.0 + (p[1] - '0');
	174	+ p += 2;
	175	+ if (len == 5 \|\| len == 7)
	176	+ v = v * 10.0 + (*p++ - '0');
	177	+ /* p => MM[SS] */
	178	+ v += (10.0 * (p[0] - '0')
	179	+ + p[1] - '0') / 60.0;
	180	+ p += 2;
	181	+ /* p => [SS] */
	182	+ if (len > 5) {
	183	+ v += (10.0 * (p[0] - '0')
	184	+ + p[1] - '0') / 3600.0;
	185	+ p += 2;
	186	+ }
	187	+
	188	+ /* Round to five decimal place, not because it's a good idea,
	189	+ * but, because the builtin data uses rounded data, so, match
	190	+ * that. */
a659fa18	191	+ result = trunc(v sign * 100000.0) / 100000.0;
c0240cb1	192	+
	193	+ return p;
	194	+}
	195	+
	196	+/* This function parses the zone.tab file to build up the mapping of
	197	+ * timezone to country code and geographic location, and returns a
	198	+ * hash table. The hash table is indexed by the function:
	199	+ *
	200	+ * tz_hash(timezone-name)
	201	+ */
	202	+static struct location_info **create_location_table(void)
	203	+{
	204	+ struct location_info *li, i;
	205	+ char zone_tab[PATH_MAX];
	206	+ char line[512];
	207	+ FILE *fp;
	208	+
	209	+ strncpy(zone_tab, ZONEINFO_PREFIX "/zone.tab", sizeof zone_tab);
	210	+
	211	+ fp = fopen(zone_tab, "r");
	212	+ if (!fp) {
	213	+ return NULL;
	214	+ }
	215	+
	216	+ li = calloc(LOCINFO_HASH_SIZE, sizeof *li);
	217	+
	218	+ while (fgets(line, sizeof line, fp)) {
	219	+ char p = line, code, name, comment;
	220	+ uint32_t hash;
	221	+ double latitude, longitude;
	222	+
	223	+ while (isspace(*p))
	224	+ p++;
	225	+
	226	+ if (p == '#' \|\| p == '\0' \|\| *p == '\n')
	227	+ continue;
	228	+
	229	+ if (!isalpha(p[0]) \|\| !isalpha(p[1]) \|\| p[2] != '\t')
	230	+ continue;
	231	+
	232	+ /* code => AA */
	233	+ code = p;
	234	+ p[2] = 0;
	235	+ p += 3;
	236	+
	237	+ /* coords => [+-][D]DDMM[SS][+-][D]DDMM[SS] */
	238	+ p = parse_iso6709(p, &latitude);
	239	+ if (!p) {
	240	+ continue;
	241	+ }
	242	+ p = parse_iso6709(p, &longitude);
	243	+ if (!p) {
	244	+ continue;
	245	+ }
	246	+
	247	+ if (!p \|\| *p != '\t') {
	248	+ continue;
	249	+ }
	250	+
	251	+ /* name = string */
	252	+ name = ++p;
	253	+ while (p != '\t' && p && *p != '\n')
	254	+ p++;
	255	+
256	+ *p++ = '\0';
257	+
258	+ /* comment = string */
259	+ comment = p;
260	+ while (p != '\t' && p && *p != '\n')
261	+ p++;
262	+
263	+ if (p == '\n' \|\| p == '\t')
264	+ *p = '\0';
265	+
266	+ hash = tz_hash(name);
267	+ i = malloc(sizeof *i);
268	+ memcpy(i->code, code, 2);
269	+ strncpy(i->name, name, sizeof i->name);
270	+ i->comment = strdup(comment);
271	+ i->longitude = longitude;
272	+ i->latitude = latitude;
273	+ i->next = li[hash];
274	+ li[hash] = i;
275	+ /* printf("%s [%u, %f, %f]\n", name, hash, latitude, longitude); */
276	+ }
277	+
278	+ fclose(fp);
279	+
280	+ return li;
281	+}
282	+
283	+/* Return location info from hash table, using given timezone name.
284	+ * Returns NULL if the name could not be found. */
285	+const struct location_info find_zone_info(struct location_info *li,
286	+ const char *name)
287	+{
288	+ uint32_t hash = tz_hash(name);
289	+ const struct location_info *l;
290	+
291	+ if (!li) {
292	+ return NULL;
293	+ }
294	+
295	+ for (l = li[hash]; l; l = l->next) {
539ed3cb	296	+ if (timelib_strcasecmp(l->name, name) == 0)
c0240cb1	297	+ return l;
	298	+ }
	299	+
	300	+ return NULL;
	301	+}
	302	+
	303	+/* Filter out some non-tzdata files and the posix/right databases, if
	304	+ * present. */
	305	+static int index_filter(const struct dirent *ent)
	306	+{
	307	+ return strcmp(ent->d_name, ".") != 0
	308	+ && strcmp(ent->d_name, "..") != 0
	309	+ && strcmp(ent->d_name, "posix") != 0
	310	+ && strcmp(ent->d_name, "posixrules") != 0
	311	+ && strcmp(ent->d_name, "right") != 0
cacce04b	312	+ && strstr(ent->d_name, ".list") == NULL
c0240cb1	313	+ && strstr(ent->d_name, ".tab") == NULL;
	314	+}
	315	+
	316	+static int sysdbcmp(const void first, const void second)
	317	+{
	318	+ const timelib_tzdb_index_entry alpha = first, beta = second;
	319	+
539ed3cb	320	+ return timelib_strcasecmp(alpha->id, beta->id);
c0240cb1	321	+}
	322	+
	323	+
	324	+/* Create the zone identifier index by trawling the filesystem. */
	325	+static void create_zone_index(timelib_tzdb *db)
	326	+{
	327	+ size_t dirstack_size, dirstack_top;
	328	+ size_t index_size, index_next;
	329	+ timelib_tzdb_index_entry *db_index;
	330	+ char **dirstack;
	331	+
	332	+ /* LIFO stack to hold directory entries to scan; each slot is a
	333	+ * directory name relative to the zoneinfo prefix. */
	334	+ dirstack_size = 32;
	335	+ dirstack = malloc(dirstack_size * sizeof *dirstack);
	336	+ dirstack_top = 1;
	337	+ dirstack[0] = strdup("");
	338	+
	339	+ /* Index array. */
	340	+ index_size = 64;
	341	+ db_index = malloc(index_size * sizeof *db_index);
	342	+ index_next = 0;
	343	+
	344	+ do {
	345	+ struct dirent **ents;
	346	+ char name[PATH_MAX], *top;
	347	+ int count;
	348	+
	349	+ /* Pop the top stack entry, and iterate through its contents. */
	350	+ top = dirstack[--dirstack_top];
	351	+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top);
	352	+
	353	+ count = php_scandir(name, &ents, index_filter, php_alphasort);
	354	+
	355	+ while (count > 0) {
	356	+ struct stat st;
	357	+ const char *leaf = ents[count - 1]->d_name;
	358	+
	359	+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s",
	360	+ top, leaf);
	361	+
	362	+ if (strlen(name) && stat(name, &st) == 0) {
	363	+ /* Name, relative to the zoneinfo prefix. */
	364	+ const char *root = top;
	365	+
	366	+ if (root[0] == '/') root++;
	367	+
	368	+ snprintf(name, sizeof name, "%s%s%s", root,
	369	+ *root ? "/": "", leaf);
	370	+
	371	+ if (S_ISDIR(st.st_mode)) {
	372	+ if (dirstack_top == dirstack_size) {
	373	+ dirstack_size *= 2;
	374	+ dirstack = realloc(dirstack,
	375	+ dirstack_size * sizeof *dirstack);
	376	+ }
	377	+ dirstack[dirstack_top++] = strdup(name);
	378	+ }
	379	+ else {
	380	+ if (index_next == index_size) {
	381	+ index_size *= 2;
	382	+ db_index = realloc(db_index,
	383	+ index_size * sizeof *db_index);
	384	+ }
385	+
386	+ db_index[index_next++].id = strdup(name);
387	+ }
388	+ }
389	+
390	+ free(ents[--count]);
391	+ }
392	+
393	+ if (count != -1) free(ents);
394	+ free(top);
395	+ } while (dirstack_top);
396	+
397	+ qsort(db_index, index_next, sizeof *db_index, sysdbcmp);
398	+
399	+ db->index = db_index;
400	+ db->index_size = index_next;
401	+
402	+ free(dirstack);
403	+}
404	+
405	+#define FAKE_HEADER "1234\0??\1??"
406	+#define FAKE_UTC_POS (7 - 4)
407	+
408	+/* Create a fake data segment for database 'sysdb'. */
409	+static void fake_data_segment(timelib_tzdb *sysdb,
410	+ struct location_info **info)
411	+{
412	+ size_t n;
413	+ char data, p;
414	+
415	+ data = malloc(3 * sysdb->index_size + 7);
416	+
417	+ p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1);
418	+
419	+ for (n = 0; n < sysdb->index_size; n++) {
420	+ const struct location_info *li;
421	+ timelib_tzdb_index_entry *ent;
422	+
423	+ ent = (timelib_tzdb_index_entry *)&sysdb->index[n];
424	+
425	+ /* Lookup the timezone name in the hash table. */
426	+ if (strcmp(ent->id, "UTC") == 0) {
427	+ ent->pos = FAKE_UTC_POS;
428	+ continue;
429	+ }
430	+
431	+ li = find_zone_info(info, ent->id);
432	+ if (li) {
433	+ /* If found, append the BC byte and the
434	+ * country code; set the position for this
435	+ * section of timezone data. */
436	+ ent->pos = (p - data) - 4;
437	+ *p++ = '\1';
438	+ *p++ = li->code[0];
439	+ *p++ = li->code[1];
440	+ }
441	+ else {
442	+ /* If not found, the timezone data can
443	+ * point at the header. */
444	+ ent->pos = 0;
445	+ }
446	+ }
447	+
448	+ sysdb->data = (unsigned char *)data;
449	+}
450	+
451	+/* Returns true if the passed-in stat structure describes a
452	+ * probably-valid timezone file. */
cacce04b	453	+static int is_valid_tzfile(const struct stat *st, int fd)
c0240cb1	454	+{
cacce04b ER	455	+ if (fd) {
	456	+ char buf[20];
	457	+ if (read(fd, buf, 20)!=20) {
	458	+ return 0;
	459	+ }
	460	+ lseek(fd, SEEK_SET, 0);
	461	+ if (memcmp(buf, "TZif", 4)) {
	462	+ return 0;
	463	+ }
	464	+ }
c0240cb1	465	+ return S_ISREG(st->st_mode) && st->st_size > 20;
	466	+}
	467	+
a659fa18 ER	468	+/* To allow timezone names to be used case-insensitively, find the
	469	+ * canonical name for this timezone, if possible. */
	470	+static const char canonical_tzname(const char timezone)
	471	+{
	472	+ if (timezonedb_system) {
	473	+ timelib_tzdb_index_entry *ent, lookup;
909e9211	474	+
a659fa18	475	+ lookup.id = (char *)timezone;
909e9211	476	+
a659fa18 ER	477	+ ent = bsearch(&lookup, timezonedb_system->index,
	478	+ timezonedb_system->index_size, sizeof lookup,
	479	+ sysdbcmp);
	480	+ if (ent) {
	481	+ return ent->id;
	482	+ }
	483	+ }
	484	+
	485	+ return timezone;
	486	+}
	487	+
c0240cb1	488	+/* Return the mmap()ed tzfile if found, else NULL. On success, the
	489	+ * length of the mapped data is placed in length. /
	490	+static char map_tzfile(const char timezone, size_t *length)
	491	+{
	492	+ char fname[PATH_MAX];
	493	+ struct stat st;
	494	+ char *p;
	495	+ int fd;
	496	+
	497	+ if (timezone[0] == '\0' \|\| strstr(timezone, "..") != NULL) {
	498	+ return NULL;
	499	+ }
	500	+
a659fa18	501	+ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone));
cacce04b	502	+
c0240cb1	503	+ fd = open(fname, O_RDONLY);
	504	+ if (fd == -1) {
	505	+ return NULL;
cacce04b	506	+ } else if (fstat(fd, &st) != 0 \|\| !is_valid_tzfile(&st, fd)) {
c0240cb1	507	+ close(fd);
	508	+ return NULL;
	509	+ }
	510	+
	511	+ *length = st.st_size;
	512	+ p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
	513	+ close(fd);
	514	+
	515	+ return p != MAP_FAILED ? p : NULL;
	516	+}
	517	+
	518	+#endif
	519	+
060f741a	520	+static int inmem_seek_to_tz_position(const unsigned char *tzf, const char timezone, const timelib_tzdb *tzdb)
c0240cb1	521	{
c0240cb1	522	int left = 0, right = tzdb->index_size - 1;
539ed3cb	523
060f741a	524	@@ -444,9 +884,48 @@ static int seek_to_tz_position(const uns
c0240cb1	525	return 0;
	526	}
	527
060f741a	528	+static int seek_to_tz_position(const unsigned char *tzf, const char timezone,
c0240cb1	529	+ char *map, size_t maplen,
	530	+ const timelib_tzdb *tzdb)
	531	+{
361fb152	532	+#ifdef HAVE_SYSTEM_TZDATA
c0240cb1	533	+ if (tzdb == timezonedb_system) {
	534	+ char *orig;
	535	+
	536	+ orig = map_tzfile(timezone, maplen);
	537	+ if (orig == NULL) {
	538	+ return 0;
	539	+ }
a659fa18	540	+
909e9211	541	+ (tzf) = (unsigned char )orig;
c0240cb1	542	+ *map = orig;
909e9211	543	+ return 1;
c0240cb1	544	+ }
a659fa18	545	+ else
361fb152	546	+#endif
a659fa18	547	+ {
c0240cb1	548	+ return inmem_seek_to_tz_position(tzf, timezone, tzdb);
	549	+ }
	550	+}
	551	+
	552	const timelib_tzdb *timelib_builtin_db(void)
	553	{
	554	+#ifdef HAVE_SYSTEM_TZDATA
	555	+ if (timezonedb_system == NULL) {
	556	+ timelib_tzdb tmp = malloc(sizeof tmp);
	557	+
	558	+ tmp->version = "0.system";
	559	+ tmp->data = NULL;
	560	+ create_zone_index(tmp);
	561	+ system_location_table = create_location_table();
a659fa18	562	+ fake_data_segment(tmp, system_location_table);
c0240cb1	563	+ timezonedb_system = tmp;
	564	+ }
	565	+
c0240cb1	566	+ return timezonedb_system;
	567	+#else
	568	return &timezonedb_builtin;
	569	+#endif
	570	}
	571
539ed3cb	572	const timelib_tzdb_index_entry timelib_timezone_identifiers_list(const timelib_tzdb tzdb, int *count)
060f741a ER	573	@@ -458,7 +937,30 @@ const timelib_tzdb_index_entry *timelib_
060f741a ER	574	int timelib_timezone_id_is_valid(const char timezone, const timelib_tzdb tzdb)
c0240cb1	575	{
	576	const unsigned char *tzf;
	577	- return (seek_to_tz_position(&tzf, timezone, tzdb));
	578	+
	579	+#ifdef HAVE_SYSTEM_TZDATA
a659fa18 ER	580	+ if (tzdb == timezonedb_system) {
	581	+ char fname[PATH_MAX];
	582	+ struct stat st;
	583	+
	584	+ if (timezone[0] == '\0' \|\| strstr(timezone, "..") != NULL) {
	585	+ return 0;
	586	+ }
c0240cb1	587	+
a659fa18 ER	588	+ if (system_location_table) {
	589	+ if (find_zone_info(system_location_table, timezone) != NULL) {
	590	+ /* found in cache */
	591	+ return 1;
	592	+ }
	593	+ }
	594	+
	595	+ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone));
	596	+
cacce04b	597	+ return stat(fname, &st) == 0 && is_valid_tzfile(&st, 0);
a659fa18 ER	598	+ }
a659fa18 ER	599	+#endif
909e9211	600	+
c0240cb1	601	+ return (inmem_seek_to_tz_position(&tzf, timezone, tzdb));
	602	}
	603
cacce04b	604	static int skip_64bit_preamble(const unsigned char *tzf, timelib_tzinfo tz)
060f741a ER	605	@@ -500,12 +1002,14 @@ static timelib_tzinfo* timelib_tzinfo_ct
060f741a ER	606	timelib_tzinfo timelib_parse_tzfile(const char timezone, const timelib_tzdb tzdb, int error_code)
c0240cb1	607	{
	608	const unsigned char *tzf;
	609	+ char *memmap = NULL;
	610	+ size_t maplen;
	611	timelib_tzinfo *tmp;
a659fa18	612	int version;
cacce04b ER	613	int transitions_result, types_result;
cacce04b ER	614	unsigned int type; /* TIMELIB_TZINFO_PHP or TIMELIB_TZINFO_ZONEINFO */
c0240cb1	615
	616	- if (seek_to_tz_position(&tzf, timezone, tzdb)) {
	617	+ if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) {
	618	tmp = timelib_tzinfo_ctor(timezone);
	619
cacce04b	620	version = read_preamble(&tzf, tmp, &type);
060f741a	621	@@ -540,11 +1044,36 @@ timelib_tzinfo *timelib_parse_tzfile(con
cacce04b	622	}
539ed3cb AG	623	skip_posix_string(&tzf, tmp);
539ed3cb AG	624
c0240cb1	625	+#ifdef HAVE_SYSTEM_TZDATA
	626	+ if (memmap) {
	627	+ const struct location_info *li;
	628	+
	629	+ /* TZif-style - grok the location info from the system database,
	630	+ * if possible. */
	631	+
	632	+ if ((li = find_zone_info(system_location_table, timezone)) != NULL) {
909e9211 ER	633	+ tmp->location.comments = timelib_strdup(li->comment);
909e9211 ER	634	+ strncpy(tmp->location.country_code, li->code, 2);
c0240cb1	635	+ tmp->location.longitude = li->longitude;
	636	+ tmp->location.latitude = li->latitude;
	637	+ tmp->bc = 1;
	638	+ }
	639	+ else {
cacce04b	640	+ set_default_location_and_comments(&tzf, tmp);
c0240cb1	641	+ }
	642	+
	643	+ /* Now done with the mmap segment - discard it. */
	644	+ munmap(memmap, maplen);
cacce04b ER	645	+ } else {
cacce04b ER	646	+#endif
539ed3cb AG	647	if (type == TIMELIB_TZINFO_PHP) {
539ed3cb AG	648	read_location(&tzf, tmp);
cacce04b ER	649	} else {
	650	set_default_location_and_comments(&tzf, tmp);
	651	}
	652	+#ifdef HAVE_SYSTEM_TZDATA
	653	+ }
c0240cb1	654	+#endif
c0240cb1	655	} else {
cacce04b	656	*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
c0240cb1	657	tmp = NULL;