derick Thu Dec 29 10:54:07 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/date php_date.c
Log:
- Fixed bug #35751 (using date with a timestamp makes httpd segfault).
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.331&r2=1.2027.2.332&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.331 php-src/NEWS:1.2027.2.332
--- php-src/NEWS:1.2027.2.331 Thu Dec 29 09:49:19 2005
+++ php-src/NEWS Thu Dec 29 10:54:07 2005
@@ -14,6 +14,7 @@
- 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)
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.c?r1=1.43.2.34&r2=1.43.2.35&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.34
php-src/ext/date/php_date.c:1.43.2.35
--- php-src/ext/date/php_date.c:1.43.2.34 Tue Dec 20 19:58:44 2005
+++ php-src/ext/date/php_date.c Thu Dec 29 10:54:07 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.43.2.34 2005/12/20 19:58:44 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.35 2005/12/29 10:54:07 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -561,7 +561,7 @@
{
char *format;
int format_len;
- time_t ts;
+ long ts;
char *string;
if (ZEND_NUM_ARGS() == 1) {
@@ -721,7 +721,7 @@
{
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) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
