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()).

diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index 2a6050e5fd0a4064d53a24d602163e69b7f0f1a2..774e6947b3a95e0b81f708ae364bb549b670d0fc 100644 (file)
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -81,7 +81,7 @@ PHP_FUNCTION(time)
 
 /* {{{ 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_FUNCTION(gmdate)
 
 /* {{{ 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_FUNCTION(getdate)
 
 /* {{{ 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 @@ char *php_std_date(time_t t TSRMLS_DC)
                                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 @@ PHP_FUNCTION(checkdate)
 #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;

diff --git a/ext/standard/datetime.h b/ext/standard/datetime.h
index 755d40611d0fe2db89646a3d61e058fc05666bae..5a4b7c3d75a3291a03ac726032e48bad07b8c0fd 100644 (file)
--- a/ext/standard/datetime.h
+++ b/ext/standard/datetime.h
@@ -40,11 +40,11 @@ PHP_FUNCTION(gmstrftime);
 #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 */

diff --git a/ext/standard/parsedate.y b/ext/standard/parsedate.y
index b5eec08ea518efec2075dd1f19407ac727de1eb4..c5b4dbc42f5941394872198f4445695b7eb78c52 100644 (file)
--- a/ext/standard/parsedate.y
+++ b/ext/standard/parsedate.y
@@ -1040,7 +1040,7 @@ difftm (struct tm *a, struct tm *b)
          + (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;

diff --git a/ext/standard/php_parsedate.h b/ext/standard/php_parsedate.h
index 1cb9af11b121008d5445f4a2092a997601ba0959..6ba401700920bc85e453dc9cfb50a1e2f1b41b21 100644 (file)
--- a/ext/standard/php_parsedate.h
+++ b/ext/standard/php_parsedate.h
@@ -23,6 +23,6 @@
 
 #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