php/php-upstream.patch

31 lines
1.0 KiB
Diff
Raw Normal View History

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