svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/date/php_date.c trunk/ext/date/php_date.c

derick Wed, 12 Jan 2011 19:50:09 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=307416 Log: - Fixed bug #53729 (DatePeriod fails to initialize recurrences on 64bit big-endian systems). (Patch by rein@basefarm.no) Bug: http://bugs.php.net/53729 (Open) DatePeriod fails to initialize recurrences s on 64bit big-endian systems Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/date/php_date.c U php/php-src/trunk/ext/date/php_date.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-01-12 19:33:55 UTC (rev 307415) +++ php/php-src/branches/PHP_5_3/NEWS 2011-01-12 19:50:09 UTC (rev 307416) @@ -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). Modified: php/php-src/branches/PHP_5_3/ext/date/php_date.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/date/php_date.c 2011-01-12 19:33:55 UTC (rev 307415) +++ php/php-src/branches/PHP_5_3/ext/date/php_date.c 2011-01-12 19:50:09 UTC (rev 307416) @@ -3694,7 +3694,7 @@ } /* }}} */ -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 @@ 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); } Modified: php/php-src/trunk/ext/date/php_date.c =================================================================== --- php/php-src/trunk/ext/date/php_date.c 2011-01-12 19:33:55 UTC (rev 307415) +++ php/php-src/trunk/ext/date/php_date.c 2011-01-12 19:50:09 UTC (rev 307416) @@ -3689,7 +3689,7 @@ } /* }}} */ -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; @@ -3743,7 +3743,7 @@ 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); }