mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 12:26:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.2'

Browse Source
This commit is contained in:
Derick Rethans 2018-01-31 11:56:11 +00:00
commit 3152d44b36
8 changed files with 105 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/date/lib/README.rst
View File

@ -5,4 +5,5 @@ Timelib is a timezone and date/time library that can calculate local time,
convert between timezones and parse textual descriptions of date/time
information.
It is the library supporting PHP's Date/Time extension.
It is the library supporting PHP's Date/Time extension and MongoDB's time zone
support.

14
ext/date/lib/parse_date.c
View File

@ -1,4 +1,4 @@
/* Generated by re2c 0.15.3 on Tue Oct 24 13:44:48 2017 */
/* Generated by re2c 0.15.3 on Wed Jan 31 11:51:51 2018 */
#line 1 "ext/date/lib/parse_date.re"
/*
* The MIT License (MIT)
@ -483,7 +483,7 @@ static void timelib_skip_day_suffix(char **ptr)
if (isspace(**ptr)) {
return;
}
if (!strncasecmp(*ptr, "nd", 2) || !strncasecmp(*ptr, "rd", 2) ||!strncasecmp(*ptr, "st", 2) || !strncasecmp(*ptr, "th", 2)) {
if (!timelib_strncasecmp(*ptr, "nd", 2) || !timelib_strncasecmp(*ptr, "rd", 2) ||!timelib_strncasecmp(*ptr, "st", 2) || !timelib_strncasecmp(*ptr, "th", 2)) {
*ptr += 2;
}
}
@ -549,7 +549,7 @@ static timelib_sll timelib_lookup_relative_text(char **ptr, int *behavior)
memcpy(word, begin, end - begin);
for (tp = timelib_reltext_lookup; tp->name; tp++) {
if (strcasecmp(word, tp->name) == 0) {
if (timelib_strcasecmp(word, tp->name) == 0) {
value = tp->value;
*behavior = tp->type;
}
@ -582,7 +582,7 @@ static timelib_long timelib_lookup_month(char **ptr)
memcpy(word, begin, end - begin);
for (tp = timelib_month_lookup; tp->name; tp++) {
if (strcasecmp(word, tp->name) == 0) {
if (timelib_strcasecmp(word, tp->name) == 0) {
value = tp->value;
}
}
@ -629,7 +629,7 @@ static const timelib_relunit* timelib_lookup_relunit(char **ptr)
memcpy(word, begin, end - begin);
for (tp = timelib_relunit_lookup; tp->name; tp++) {
if (strcasecmp(word, tp->name) == 0) {
if (timelib_strcasecmp(word, tp->name) == 0) {
value = tp;
break;
}
@ -678,12 +678,12 @@ static const timelib_tz_lookup_table* abbr_search(const char *word, timelib_long
const timelib_tz_lookup_table *tp, *first_found_elem = NULL;
const timelib_tz_lookup_table *fmp;
if (strcasecmp("utc", word) == 0 || strcasecmp("gmt", word) == 0) {
if (timelib_strcasecmp("utc", word) == 0 || timelib_strcasecmp("gmt", word) == 0) {
return timelib_timezone_utc;
}
for (tp = timelib_timezone_lookup; tp->name; tp++) {
if (strcasecmp(word, tp->name) == 0) {
if (timelib_strcasecmp(word, tp->name) == 0) {
if (!first_found) {
first_found = 1;
first_found_elem = tp;

12
ext/date/lib/parse_date.re
View File

@ -481,7 +481,7 @@ static void timelib_skip_day_suffix(char **ptr)
if (isspace(**ptr)) {
return;
}
if (!strncasecmp(*ptr, "nd", 2) || !strncasecmp(*ptr, "rd", 2) ||!strncasecmp(*ptr, "st", 2) || !strncasecmp(*ptr, "th", 2)) {
if (!timelib_strncasecmp(*ptr, "nd", 2) || !timelib_strncasecmp(*ptr, "rd", 2) ||!timelib_strncasecmp(*ptr, "st", 2) || !timelib_strncasecmp(*ptr, "th", 2)) {
*ptr += 2;
}
}
@ -547,7 +547,7 @@ static timelib_sll timelib_lookup_relative_text(char **ptr, int *behavior)
memcpy(word, begin, end - begin);
for (tp = timelib_reltext_lookup; tp->name; tp++) {
if (strcasecmp(word, tp->name) == 0) {
if (timelib_strcasecmp(word, tp->name) == 0) {
value = tp->value;
*behavior = tp->type;
}
@ -580,7 +580,7 @@ static timelib_long timelib_lookup_month(char **ptr)
memcpy(word, begin, end - begin);
for (tp = timelib_month_lookup; tp->name; tp++) {
if (strcasecmp(word, tp->name) == 0) {
if (timelib_strcasecmp(word, tp->name) == 0) {
value = tp->value;
}
}
@ -627,7 +627,7 @@ static const timelib_relunit* timelib_lookup_relunit(char **ptr)
memcpy(word, begin, end - begin);
for (tp = timelib_relunit_lookup; tp->name; tp++) {
if (strcasecmp(word, tp->name) == 0) {
if (timelib_strcasecmp(word, tp->name) == 0) {
value = tp;
break;
}
@ -676,12 +676,12 @@ static const timelib_tz_lookup_table* abbr_search(const char *word, timelib_long
const timelib_tz_lookup_table *tp, *first_found_elem = NULL;
const timelib_tz_lookup_table *fmp;
if (strcasecmp("utc", word) == 0 || strcasecmp("gmt", word) == 0) {
if (timelib_strcasecmp("utc", word) == 0 || timelib_strcasecmp("gmt", word) == 0) {
return timelib_timezone_utc;
}
for (tp = timelib_timezone_lookup; tp->name; tp++) {
if (strcasecmp(word, tp->name) == 0) {
if (timelib_strcasecmp(word, tp->name) == 0) {
if (!first_found) {
first_found = 1;
first_found_elem = tp;

2
ext/date/lib/parse_iso_intervals.c
View File

@ -1,4 +1,4 @@
/* Generated by re2c 0.15.3 on Mon Sep 4 22:44:07 2017 */
/* Generated by re2c 0.15.3 on Wed Jan 31 11:51:44 2018 */
#line 1 "ext/date/lib/parse_iso_intervals.re"
/*
* The MIT License (MIT)

23
ext/date/lib/parse_tz.c
View File

@ -377,25 +377,14 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz)
static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
{
int left = 0, right = tzdb->index_size - 1;
#ifdef HAVE_SETLOCALE
char *cur_locale = NULL, *tmp;
#endif
if (tzdb->index_size == 0) {
return 0;
}
#ifdef HAVE_SETLOCALE
tmp = setlocale(LC_CTYPE, NULL);
if (tmp) {
cur_locale = timelib_strdup(tmp);
}
setlocale(LC_CTYPE, "C");
#endif
do {
int mid = ((unsigned)left + right) >> 1;
int cmp = strcasecmp(timezone, tzdb->index[mid].id);
int cmp = timelib_strcasecmp(timezone, tzdb->index[mid].id);
if (cmp < 0) {
right = mid - 1;
@ -403,19 +392,11 @@ static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const
left = mid + 1;
} else { /* (cmp == 0) */
(*tzf) = &(tzdb->data[tzdb->index[mid].pos]);
#ifdef HAVE_SETLOCALE
setlocale(LC_CTYPE, cur_locale);
if (cur_locale) timelib_free(cur_locale);
#endif
return 1;
}
} while (left <= right);
#ifdef HAVE_SETLOCALE
setlocale(LC_CTYPE, cur_locale);
if (cur_locale) timelib_free(cur_locale);
#endif
return 0;
}
@ -424,7 +405,7 @@ const timelib_tzdb *timelib_builtin_db(void)
return &timezonedb_builtin;
}
const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(timelib_tzdb *tzdb, int *count)
const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
{
*count = tzdb->index_size;
return tzdb->index;

81
ext/date/lib/timelib.c
View File

@ -1,7 +1,7 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2015 Derick Rethans
* Copyright (c) 2015-2017 Derick Rethans
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@ -20,6 +20,12 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* Portions copyright (c) 1998-2017 Zend Technologies Ltd.
*
* The timelib_strcasecmp and timelib_strncasecmp are taken from PHP's
* Zend/zend_operators.[hc] source files.
*
*/
#include "timelib.h"
@ -198,6 +204,79 @@ void timelib_hms_to_decimal_hour(int hour, int min, int sec, double *h)
}
}
static const unsigned char timelib_tolower_map[256] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
};
#define timelib_tolower(c) (timelib_tolower_map[(unsigned char)(c)])
#undef MIN
#undef MAX
#define MAX(a, b) (((a)>(b))?(a):(b))
#define MIN(a, b) (((a)<(b))?(a):(b))
int timelib_strcasecmp(const char *s1, const char *s2)
{
size_t len;
size_t len1 = strlen(s1);
size_t len2 = strlen(s2);
int c1, c2;
if (s1 == s2) {
return 0;
}
len = MIN(len1, len2);
while (len--) {
c1 = timelib_tolower(*(unsigned char *)s1++);
c2 = timelib_tolower(*(unsigned char *)s2++);
if (c1 != c2) {
return c1 - c2;
}
}
return (int)(len1 - len2);
}
int timelib_strncasecmp(const char *s1, const char *s2, size_t length)
{
size_t len;
size_t len1 = strlen(s1);
size_t len2 = strlen(s2);
int c1, c2;
if (s1 == s2) {
return 0;
}
len = MIN(length, MIN(len1, len2));
while (len--) {
c1 = timelib_tolower(*(unsigned char *)s1++);
c2 = timelib_tolower(*(unsigned char *)s2++);
if (c1 != c2) {
return c1 - c2;
}
}
return (int)(MIN(length, len1) - MIN(length, len2));
}
#undef MIN
#undef MAX
void timelib_dump_date(timelib_time *d, int options)
{
if ((options & 2) == 2) {

8
ext/date/lib/timelib.h
View File

@ -310,9 +310,9 @@ typedef struct _timelib_tzdb {
# define timelib_free free
#endif
#define TIMELIB_VERSION 201705
#define TIMELIB_EXTENDED_VERSION 20170509
#define TIMELIB_ASCII_VERSION "2017.05beta9"
#define TIMELIB_VERSION 201706
#define TIMELIB_EXTENDED_VERSION 20170600
#define TIMELIB_ASCII_VERSION "2017.06"
#define TIMELIB_NONE 0x00
#define TIMELIB_OVERRIDE_TIME 0x01
@ -661,7 +661,7 @@ const timelib_tzdb *timelib_builtin_db(void);
* Each entry contains the time zone ID ('id' field), and the position within the time zone
* information ('pos' field). The pos field should not be used.
*/
const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(timelib_tzdb *tzdb, int *count);
const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count);
/* From parse_zoneinfo.c */

15
ext/date/lib/timelib_private.h
View File

@ -25,10 +25,6 @@
#ifndef __TIMELIB_PRIVATE_H__
#define __TIMELIB_PRIVATE_H__
#ifdef HAVE_SETLOCALE
# include "locale.h"
#endif
#ifdef HAVE_TIMELIB_CONFIG_H
# include "timelib_config.h"
#endif
@ -140,19 +136,14 @@ struct _tlinfo
#define LONG_MIN (- LONG_MAX - 1)
#endif
#if defined(_MSC_VER) && !defined(strcasecmp)
#define strcasecmp stricmp
#endif
#if defined(_MSC_VER) && !defined(strncasecmp)
#define strncasecmp strnicmp
#endif
/* From unixtime2tm.c */
int timelib_apply_localtime(timelib_time *t, unsigned int localtime);
/* From parse_tz.c */
void timelib_time_tz_abbr_update(timelib_time* tm, char* tz_abbr);
/* From timelib.c */
int timelib_strcasecmp(const char *s1, const char *s2);
int timelib_strncasecmp(const char *s1, const char *s2, size_t n);
#endif