From: Derick Rethans Date: Wed, 12 Jan 2011 19:50:09 +0000 (+0000) Subject: - Fixed bug #53729 (DatePeriod fails to initialize recurrences on 64bit X-Git-Tag: php-5.3.6RC1~128 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=58810bd055007d77948cb2614b98071cf38233e7;p=php - Fixed bug #53729 (DatePeriod fails to initialize recurrences on 64bit big-endian systems). (Patch by rein@basefarm.no) --- diff --git a/NEWS b/NEWS index dc80f7e5d8..ecf4d52766 100644 --- a/NEWS +++ b/NEWS @@ -23,6 +23,8 @@ - DateTime extension: . Fixed a bug in DateTime->modify() where absolute date/time statements had no effect. (Derick) + . Fixed bug #53729 (DatePeriod fails to initialize recurrences on 64bit + big-endian systems). (Derick, rein@basefarm.no) - Filter extension: . Fixed bug #53150 (FILTER_FLAG_NO_RES_RANGE is missing some IP ranges). diff --git a/ext/date/php_date.c b/ext/date/php_date.c index ba6cf258ec..2e5986f8d2 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -3694,7 +3694,7 @@ PHP_FUNCTION(date_interval_format) } /* }}} */ -static int date_period_initialize(timelib_time **st, timelib_time **et, timelib_rel_time **d, int *recurrences, /*const*/ char *format, int format_length TSRMLS_DC) +static int date_period_initialize(timelib_time **st, timelib_time **et, timelib_rel_time **d, long *recurrences, /*const*/ char *format, int format_length TSRMLS_DC) { timelib_time *b = NULL, *e = NULL; timelib_rel_time *p = NULL; @@ -3748,7 +3748,7 @@ PHP_METHOD(DatePeriod, __construct) dpobj->current = NULL; if (isostr_len) { - date_period_initialize(&(dpobj->start), &(dpobj->end), &(dpobj->interval), (int*) &recurrences, isostr, isostr_len TSRMLS_CC); + date_period_initialize(&(dpobj->start), &(dpobj->end), &(dpobj->interval), &recurrences, isostr, isostr_len TSRMLS_CC); if (dpobj->start == NULL) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "The ISO interval '%s' did not contain a start date.", isostr); }