tony2001 Wed Jan 23 15:14:18 2008 UTC
Modified files:
/php-src/ext/date php_date.c
Log:
add missing TSRMLS_CC and fix segfaults in ZTS mode
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.156&r2=1.157&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.156 php-src/ext/date/php_date.c:1.157
--- php-src/ext/date/php_date.c:1.156 Thu Jan 17 20:34:17 2008
+++ php-src/ext/date/php_date.c Wed Jan 23 15:14:18 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.156 2008/01/17 20:34:17 derick Exp $ */
+/* $Id: php_date.c,v 1.157 2008/01/23 15:14:18 tony2001 Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -940,17 +940,17 @@
break;
case 'T': length = date_spprintf(&buffer, 32 TSRMLS_CC,
"%s", localtime ? offset->abbr : "GMT"); break;
case 'e': if (!localtime) {
- length = date_spprintf(&buffer,
32, "%s", "UTC");
+ length = date_spprintf(&buffer,
32 TSRMLS_CC, "%s", "UTC");
} else {
switch (t->zone_type) {
case
TIMELIB_ZONETYPE_ID:
- length =
date_spprintf(&buffer, 32, "%s", t->tz_info->name);
+ length =
date_spprintf(&buffer, 32 TSRMLS_CC, "%s", t->tz_info->name);
break;
case
TIMELIB_ZONETYPE_ABBR:
- length =
date_spprintf(&buffer, 32, "%s", offset->abbr);
+ length =
date_spprintf(&buffer, 32 TSRMLS_CC, "%s", offset->abbr);
break;
case
TIMELIB_ZONETYPE_OFFSET:
- length =
date_spprintf(&buffer, 32, "%c%02d:%02d",
+ length =
date_spprintf(&buffer, 32 TSRMLS_CC, "%c%02d:%02d",
((offset->offset < 0) ? '-' : '+'),
abs(offset->offset / 3600),
abs((offset->offset % 3600) / 60)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
