diff options
| author | Remi Collet <remi@remirepo.net> | 2018-02-14 11:17:19 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-02-14 11:17:19 +0100 |
| commit | a9a9051a6e8f0282d64a39314593c4a07dcedfb2 (patch) | |
| tree | 8fe3803dd2d8a0037498b33b8a9cbf89d889c2e9 /php-upstream.patch | |
| parent | 7408893aed0857080f64a06fb84c2a8c5c8be757 (diff) | |
update to 7.2.3RC1
adapt systzdata, fixheader and ldap_r patches
apply upstream patch for date ext
Diffstat (limited to 'php-upstream.patch')
| -rw-r--r-- | php-upstream.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/php-upstream.patch b/php-upstream.patch new file mode 100644 index 0000000..5ffc5a9 --- /dev/null +++ b/php-upstream.patch @@ -0,0 +1,30 @@ +From 528bc00d84cce18d74528677c156d6aec1b7fcd9 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@php.net> +Date: Wed, 14 Feb 2018 08:59:24 +0100 +Subject: [PATCH] Fix timezone var_dump from + 51f2a5803fa4f09e212fed4b14ab8b4a003d4ef5 + +--- + ext/date/php_date.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ext/date/php_date.c b/ext/date/php_date.c +index 82ac9a6..2df19f7 100644 +--- a/ext/date/php_date.c ++++ b/ext/date/php_date.c +@@ -2422,9 +2422,9 @@ static HashTable *date_object_get_debug_info_timezone(zval *object, int *is_temp + zend_string *tmpstr = zend_string_alloc(sizeof("UTC+05:00")-1, 0); + + ZSTR_LEN(tmpstr) = snprintf(ZSTR_VAL(tmpstr), sizeof("+05:00"), "%c%02d:%02d", +- tzobj->tzi.utc_offset > 0 ? '-' : '+', +- abs(tzobj->tzi.utc_offset / 60), +- abs((tzobj->tzi.utc_offset % 60))); ++ tzobj->tzi.utc_offset < 0 ? '-' : '+', ++ abs((int)(tzobj->tzi.utc_offset / 3600)), ++ abs(((int)(tzobj->tzi.utc_offset % 3600) / 60))); + + ZVAL_NEW_STR(&zv, tmpstr); + } +-- +2.1.4 + |