summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--ext/date/php_date.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index ef73c34c30..fcf35e13b2 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ PHP NEWS
- Fixed bug #35781 (stream_filter_append() can cause segfault). (Tony)
- Fixed bug #35759 (mysqli_stmt_bind_result() makes huge allocation when
column empty). (Andrey)
+- Fixed bug #35751 (using date with a timestamp makes httpd segfault). (Derick)
- Fixed bug #35517 (mysql_stmt_fetch returns NULL on data truncation). (Georg)
- Fixed bug #29955 (mb_strtoupper() / lower() broken with Turkish encoding).
(Rui)
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index a4cf8202ca..cbc5a5dec8 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -561,7 +561,7 @@ static void php_date(INTERNAL_FUNCTION_PARAMETERS, int localtime)
{
char *format;
int format_len;
- time_t ts;
+ long ts;
char *string;
if (ZEND_NUM_ARGS() == 1) {
@@ -721,7 +721,7 @@ PHP_FUNCTION(idate)
{
char *format;
int format_len;
- time_t ts;
+ long ts;
int ret;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &format, &format_len, &ts) == FAILURE) {