Title: [187141] branches/safari-600.8-branch/Source/WebKit/mac
- Revision
- 187141
- Author
- [email protected]
- Date
- 2015-07-21 17:24:22 -0700 (Tue, 21 Jul 2015)
Log Message
Merge r187103. rdar://problem/21707873
Modified Paths
Diff
Modified: branches/safari-600.8-branch/Source/WebKit/mac/ChangeLog (187140 => 187141)
--- branches/safari-600.8-branch/Source/WebKit/mac/ChangeLog 2015-07-22 00:06:05 UTC (rev 187140)
+++ branches/safari-600.8-branch/Source/WebKit/mac/ChangeLog 2015-07-22 00:24:22 UTC (rev 187141)
@@ -1,3 +1,17 @@
+2015-07-21 Matthew Hanson <[email protected]>
+
+ Merge r187103. rdar://problem/21707873
+
+ 2015-07-21 Brady Eidson <[email protected]>
+
+ Fix WebPreferences infinite recursion introduced in r186232.
+ <rdar://problem/9091261> and https://bugs.webkit.org/show_bug.cgi?id=147149
+
+ Reviewed by Tim Horton.
+
+ * WebView/WebPreferences.mm:
+ (-[WebPreferences metaRefreshEnabled]):
+
2015-07-15 Matthew Hanson <[email protected]>
Merge r186763. rdar://problem/21707917
Modified: branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebPreferences.mm (187140 => 187141)
--- branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2015-07-22 00:06:05 UTC (rev 187140)
+++ branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2015-07-22 00:24:22 UTC (rev 187141)
@@ -2565,7 +2565,7 @@
- (BOOL)metaRefreshEnabled
{
- return [self metaRefreshEnabled];
+ return [self httpEquivEnabled];
}
- (void)setHTTPEquivEnabled:(BOOL)enabled
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
