summaryrefslogtreecommitdiff
path: root/ext/date/php_date.c
diff options
context:
space:
mode:
authorJakub Zelenka <bukka@php.net>2016-04-03 19:56:15 +0100
committerJakub Zelenka <bukka@php.net>2016-04-03 19:56:15 +0100
commit6ac8bc4ecb1fdf112eefdd16d2c4f971e7ac232a (patch)
tree3612c90af5d656357045e107ccac556863e929a3 /ext/date/php_date.c
parentdf85331220ac60391d5f8d82c42a6c699f47fca1 (diff)
parent80015ba741fc857074050086db6c7b2a4716d6d5 (diff)
downloadphp-git-6ac8bc4ecb1fdf112eefdd16d2c4f971e7ac232a.tar.gz
Merge branch 'openssl_error_store' of github.com:bukka/php-src into openssl_error_store
Diffstat (limited to 'ext/date/php_date.c')
-rw-r--r--ext/date/php_date.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 2c548ae6f4..2fe78a0e69 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -3054,6 +3054,7 @@ static int php_date_modify(zval *object, char *modify, size_t modify_len) /* {{{
timelib_update_ts(dateobj->time, NULL);
timelib_update_from_sse(dateobj->time);
dateobj->time->have_relative = 0;
+ memset(&dateobj->time->relative, 0, sizeof(dateobj->time->relative));
return 1;
} /* }}} */