fix bug #63666 - Poor date() performance

diff --git a/NEWS b/NEWS
index 1296b022b08b6b3fa2fad313b83a3e72c1c19f6b..b49bae29c42a930506652703e958e41377356c83 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP                                                                        NEWS
 ?? ??? 2012, PHP 5.4.10
 
 - Core:
+  . Fixed bug #63666 (Poor date() performance). (Paul Talborg).
   . Fixed bug #63635 (Segfault in gc_collect_cycles). (Dmitry)
   . Fixed bug #63468 (wrong called method as callback with inheritance).
     (Laruence)

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 893a9d6395f28e6fe79ba2542340300b999fe632..b87dfcbbace0cfdd5c13e848708fb44976186e50 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -948,6 +948,7 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca
        timelib_time_offset *offset = NULL;
        timelib_sll          isoweek, isoyear;
        int                  rfc_colon;
+       int                  weekYearSet = 0;
 
        if (!format_len) {
                return estrdup("");
@@ -974,7 +975,6 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca
                        offset = timelib_get_time_zone_info(t->sse, t->tz_info);
                }
        }
-       timelib_isoweek_from_date(t->y, t->m, t->d, &isoweek, &isoyear);
 
        for (i = 0; i < format_len; i++) {
                rfc_colon = 0;
@@ -990,8 +990,12 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca
                        case 'z': length = slprintf(buffer, 32, "%d", (int) timelib_day_of_year(t->y, t->m, t->d)); break;
 
                        /* week */
-                       case 'W': length = slprintf(buffer, 32, "%02d", (int) isoweek); break; /* iso weeknr */
-                       case 'o': length = slprintf(buffer, 32, "%d", (int) isoyear); break; /* iso year */
+                       case 'W':
+                               if(!weekYearSet) { timelib_isoweek_from_date(t->y, t->m, t->d, &isoweek, &isoyear); weekYearSet = 1; }
+                               length = slprintf(buffer, 32, "%02d", (int) isoweek); break; /* iso weeknr */
+                       case 'o':
+                               if(!weekYearSet) { timelib_isoweek_from_date(t->y, t->m, t->d, &isoweek, &isoyear); weekYearSet = 1; }
+                               length = slprintf(buffer, 32, "%d", (int) isoyear); break; /* iso year */
 
                        /* month */
                        case 'F': length = slprintf(buffer, 32, "%s", mon_full_names[t->m - 1]); break;