jani Mon Nov 5 13:09:44 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard datetime.c
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/datetime.c?r1=1.134.2.2.2.4&r2=1.134.2.2.2.4.2.1&diff_format=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.134.2.2.2.4
php-src/ext/standard/datetime.c:1.134.2.2.2.4.2.1
--- php-src/ext/standard/datetime.c:1.134.2.2.2.4 Thu Jun 7 08:59:00 2007
+++ php-src/ext/standard/datetime.c Mon Nov 5 13:09:44 2007
@@ -1,4 +1,4 @@
-/*
+/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: datetime.c,v 1.134.2.2.2.4 2007/06/07 08:59:00 tony2001 Exp $ */
+/* $Id: datetime.c,v 1.134.2.2.2.4.2.1 2007/11/05 13:09:44 jani Exp $ */
#include "php.h"
#include "zend_operators.h"
@@ -49,7 +49,7 @@
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
};
-/* {{{ php_std_date
+/* {{{ PHPAPI char *php_std_date(time_t t TSRMLS_DC)
Return date string in standard format for http headers */
PHPAPI char *php_std_date(time_t t TSRMLS_DC)
{
@@ -79,13 +79,12 @@
((tm1->tm_year) % 100),
tm1->tm_hour, tm1->tm_min, tm1->tm_sec);
}
-
+
str[79] = 0;
return (str);
}
/* }}} */
-
#if HAVE_STRPTIME
#ifndef HAVE_STRPTIME_DECL_FAILS
char *strptime(const char *s, const char *format, struct tm *tm);
@@ -102,8 +101,7 @@
struct tm parsed_time;
char *unparsed_part;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss",
- &ts, &ts_length, &format, &format_length) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &ts,
&ts_length, &format, &format_length) == FAILURE) {
return;
}
@@ -126,6 +124,7 @@
add_assoc_string(return_value, "unparsed", unparsed_part, 1);
}
/* }}} */
+
#endif
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php