iliaa Thu Apr 14 09:34:07 2005 EDT
Modified files:
/php-src/ext/standard datetime.h datetime.c parsedate.y
php_parsedate.h
Log:
MFB43: Fixed bug #31583 (php_std_date() uses short day names in
non-y2k_compliance mode).
Fixed bug #31689 (PHPAPI missing for php_std_date() and php_parse_date()).
http://cvs.php.net/diff.php/php-src/ext/standard/datetime.h?r1=1.17&r2=1.18&ty=u
Index: php-src/ext/standard/datetime.h
diff -u php-src/ext/standard/datetime.h:1.17
php-src/ext/standard/datetime.h:1.18
--- php-src/ext/standard/datetime.h:1.17 Wed Sep 29 00:57:19 2004
+++ php-src/ext/standard/datetime.h Thu Apr 14 09:34:05 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: datetime.h,v 1.17 2004/09/29 04:57:19 sterling Exp $ */
+/* $Id: datetime.h,v 1.18 2005/04/14 13:34:05 iliaa Exp $ */
#ifndef DATETIME_H
#define DATETIME_H
@@ -40,11 +40,11 @@
#endif
PHP_FUNCTION(strtotime);
-int php_idate(char format, int timestamp, int gm);
-extern char *php_std_date(time_t t TSRMLS_DC);
-void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gm);
+PHPAPI int php_idate(char format, int timestamp, int gm);
+PHPAPI char *php_std_date(time_t t TSRMLS_DC);
+PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gm);
#if HAVE_STRFTIME
-void _php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm);
+PHPAPI void _php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm);
#endif
#endif /* DATETIME_H */
http://cvs.php.net/diff.php/php-src/ext/standard/datetime.c?r1=1.126&r2=1.127&ty=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.126
php-src/ext/standard/datetime.c:1.127
--- php-src/ext/standard/datetime.c:1.126 Fri Feb 4 08:08:56 2005
+++ php-src/ext/standard/datetime.c Thu Apr 14 09:34:05 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: datetime.c,v 1.126 2005/02/04 13:08:56 sniper Exp $ */
+/* $Id: datetime.c,v 1.127 2005/04/14 13:34:05 iliaa Exp $ */
#if HAVE_STRPTIME
#define _XOPEN_SOURCE
@@ -81,7 +81,7 @@
/* {{{ php_mktime
*/
-void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gm)
+PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gm)
{
pval **arguments[7];
struct tm *ta, tmbuf;
@@ -695,7 +695,7 @@
/* {{{ php_idate
*/
-int php_idate(char format, int timestamp, int gm)
+PHPAPI int php_idate(char format, int timestamp, int gm)
{
time_t the_time;
struct tm *ta, tmbuf;
@@ -941,7 +941,7 @@
/* {{{ php_std_date
Return date string in standard format for http headers */
-char *php_std_date(time_t t TSRMLS_DC)
+PHPAPI char *php_std_date(time_t t TSRMLS_DC)
{
struct tm *tm1, tmbuf;
char *str;
@@ -957,7 +957,7 @@
tm1->tm_hour, tm1->tm_min, tm1->tm_sec);
} else {
snprintf(str, 80, "%s, %02d-%s-%02d %02d:%02d:%02d GMT",
- day_short_names[tm1->tm_wday],
+ day_full_names[tm1->tm_wday],
tm1->tm_mday,
mon_short_names[tm1->tm_mon],
((tm1->tm_year) % 100),
@@ -989,7 +989,7 @@
#if HAVE_STRFTIME
/* {{{ _php_strftime
*/
-void _php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm)
+PHPAPI void _php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm)
{
pval **format_arg, **timestamp_arg;
char *format, *buf;
http://cvs.php.net/diff.php/php-src/ext/standard/parsedate.y?r1=1.57&r2=1.58&ty=u
Index: php-src/ext/standard/parsedate.y
diff -u php-src/ext/standard/parsedate.y:1.57
php-src/ext/standard/parsedate.y:1.58
--- php-src/ext/standard/parsedate.y:1.57 Mon Nov 15 11:31:12 2004
+++ php-src/ext/standard/parsedate.y Thu Apr 14 09:34:05 2005
@@ -8,7 +8,7 @@
** This code is in the public domain and has no copyright.
*/
-/* $Id: parsedate.y,v 1.57 2004/11/15 16:31:12 derick Exp $ */
+/* $Id: parsedate.y,v 1.58 2005/04/14 13:34:05 iliaa Exp $ */
#include "php.h"
@@ -1040,7 +1040,7 @@
+ (a->tm_sec - b->tm_sec));
}
-time_t php_parse_date(char *p, time_t *now)
+PHPAPI time_t php_parse_date(char *p, time_t *now)
{
struct tm tm, tm0, *tmp;
time_t Start;
http://cvs.php.net/diff.php/php-src/ext/standard/php_parsedate.h?r1=1.10&r2=1.11&ty=u
Index: php-src/ext/standard/php_parsedate.h
diff -u php-src/ext/standard/php_parsedate.h:1.10
php-src/ext/standard/php_parsedate.h:1.11
--- php-src/ext/standard/php_parsedate.h:1.10 Mon Jan 10 10:20:53 2005
+++ php-src/ext/standard/php_parsedate.h Thu Apr 14 09:34:05 2005
@@ -16,13 +16,13 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_parsedate.h,v 1.10 2005/01/10 15:20:53 sniper Exp $ */
+/* $Id: php_parsedate.h,v 1.11 2005/04/14 13:34:05 iliaa Exp $ */
#ifndef PHP_PARSEDATE_H
#define PHP_PARSEDATE_H
#include <time.h>
-time_t php_parse_date(char *p, time_t *now);
+PHPAPI time_t php_parse_date(char *p, time_t *now);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
