Diff
Modified: branches/safari-534-branch/LayoutTests/ChangeLog (89294 => 89295)
--- branches/safari-534-branch/LayoutTests/ChangeLog 2011-06-20 22:13:17 UTC (rev 89294)
+++ branches/safari-534-branch/LayoutTests/ChangeLog 2011-06-20 22:16:59 UTC (rev 89295)
@@ -1,3 +1,20 @@
+2011-06-20 Lucas Forschler <lforsch...@apple.com>
+
+ Merged 89281.
+
+ 2011-06-20 Oliver Hunt <oli...@apple.com>
+
+ Reviewed by Darin Adler.
+
+ REGRESSION (r79060): Searching for a flight at united.com fails
+ https://bugs.webkit.org/show_bug.cgi?id=63003
+
+ Roll out tests that were added by the patch we're rolling out, and add
+ a test for the united.com Date.
+
+ * fast/js/date-parse-test-expected.txt:
+ * fast/js/script-tests/date-parse-test.js:
+
2011-06-16 Lucas Forschler <lforsch...@apple.com>
Merged 88830.
Modified: branches/safari-534-branch/LayoutTests/fast/js/date-parse-test-expected.txt (89294 => 89295)
--- branches/safari-534-branch/LayoutTests/fast/js/date-parse-test-expected.txt 2011-06-20 22:13:17 UTC (rev 89294)
+++ branches/safari-534-branch/LayoutTests/fast/js/date-parse-test-expected.txt 2011-06-20 22:16:59 UTC (rev 89295)
@@ -161,13 +161,6 @@
PASS Date.parse("Wed Dec 25 1995 1:30 GMT") == 819855000000 is true
PASS Date.parse("WED DEC 25 1995 1:30 GMT") == 819855000000 is true
PASS Date.parse("wed dec 25 1995 1:30 gmt") == 819855000000 is true
-PASS Date.parse("Wed Dec 25 1:30 1995 GMT") == 819855000000 is true
-PASS Date.parse("WED DEC 25 1:30 1995 GMT") == 819855000000 is true
-PASS Date.parse("wed dec 25 1:30 1995 gmt") == 819855000000 is true
-PASS Date.parse("Wed Dec 25 1:30 1995GMT") == 819855000000 is true
-PASS Date.parse("Wed Dec 25 1:30 1995 2010 GMT") is NaN
-PASS Date.parse("Wed Dec 25 1:30 1995r GMT") is NaN
-PASS Date.parse("Wed 1:30 Dec 25 GMT") is NaN
PASS Date.parse("Wed Dec 25 1995 01:30 +0000") == 819855000000 is true
PASS Date.parse("WED DEC 25 1995 01:30 +0000") == 819855000000 is true
PASS Date.parse("wed dec 25 1995 01:30 +0000") == 819855000000 is true
@@ -209,6 +202,9 @@
PASS Date.parse("Dec 25,1995,13:30") == 819898200000 + timeZoneOffset is true
PASS Date.parse("DEC 25,1995,13:30") == 819898200000 + timeZoneOffset is true
PASS Date.parse("dec 25,1995,13:30") == 819898200000 + timeZoneOffset is true
+PASS Date.parse("Mon Jun 20 11:00:00 CDT 2011") == 1308585600000 is true
+PASS Date.parse("MON JUN 20 11:00:00 CDT 2011") == 1308585600000 is true
+PASS Date.parse("mon jun 20 11:00:00 cdt 2011") == 1308585600000 is true
PASS successfullyParsed is true
TEST COMPLETE
Modified: branches/safari-534-branch/LayoutTests/fast/js/script-tests/date-parse-test.js (89294 => 89295)
--- branches/safari-534-branch/LayoutTests/fast/js/script-tests/date-parse-test.js 2011-06-20 22:13:17 UTC (rev 89294)
+++ branches/safari-534-branch/LayoutTests/fast/js/script-tests/date-parse-test.js 2011-06-20 22:16:59 UTC (rev 89295)
@@ -127,11 +127,6 @@
testDateParse("Anf 25 1995 GMT", "NaN");
testDateParse("Wed Dec 25 1995 1:30 GMT", "819855000000");
-testDateParse("Wed Dec 25 1:30 1995 GMT", "819855000000");
-testDateParseExact("Wed Dec 25 1:30 1995GMT", "819855000000");
-testDateParseExact("Wed Dec 25 1:30 1995 2010 GMT", "NaN");
-testDateParseExact("Wed Dec 25 1:30 1995r GMT", "NaN");
-testDateParseExact("Wed 1:30 Dec 25 GMT", "NaN");
// RFC 2822
testDateParse("Wed Dec 25 1995 01:30 +0000", "819855000000");
@@ -156,6 +151,6 @@
testDateParse("Dec 25, 1995, 13:30", "819898200000 + timeZoneOffset");
testDateParse("Dec 25,1995,13:30", "819898200000 + timeZoneOffset");
+testDateParse("Mon Jun 20 11:00:00 CDT 2011", "1308585600000");
-
var successfullyParsed = true;
Modified: branches/safari-534-branch/Source/_javascript_Core/ChangeLog (89294 => 89295)
--- branches/safari-534-branch/Source/_javascript_Core/ChangeLog 2011-06-20 22:13:17 UTC (rev 89294)
+++ branches/safari-534-branch/Source/_javascript_Core/ChangeLog 2011-06-20 22:16:59 UTC (rev 89295)
@@ -1,3 +1,21 @@
+2011-06-20 Lucas Forschler <lforsch...@apple.com>
+
+ Merged 89281.
+
+ 2011-06-20 Oliver Hunt <oli...@apple.com>
+
+ Reviewed by Darin Adler.
+
+ REGRESSION (r79060): Searching for a flight at united.com fails
+ https://bugs.webkit.org/show_bug.cgi?id=63003
+
+ This original change also broke Twitter, and we attempted to refine the fix to
+ address that problem (http://trac.webkit.org/changeset/80542), but since it still breaks United,
+ we need to revert the change until we understand the problem better.
+
+ * wtf/DateMath.cpp:
+ (WTF::parseDateFromNullTerminatedCharacters):
+
2011-06-14 Lucas Forschler <lforsch...@apple.com>
Merged 88477.
Modified: branches/safari-534-branch/Source/_javascript_Core/wtf/DateMath.cpp (89294 => 89295)
--- branches/safari-534-branch/Source/_javascript_Core/wtf/DateMath.cpp 2011-06-20 22:13:17 UTC (rev 89294)
+++ branches/safari-534-branch/Source/_javascript_Core/wtf/DateMath.cpp 2011-06-20 22:16:59 UTC (rev 89295)
@@ -926,16 +926,6 @@
}
}
}
-
- // The year may be after the time but before the time zone, but don't
- // confuse a time zone specificed as an offset from UTC (e.g. +0100) with a
- // four-digit year.
- if (year <= 0 && *dateString != '+' && *dateString != '-') {
- if (!parseLong(dateString, &newPosStr, 10, &year))
- year = 0;
- dateString = newPosStr;
- skipSpacesAndComments(dateString);
- }
// Don't fail if the time zone is missing.
// Some websites omit the time zone (4275206).
