Title: [187106] branches/safari-601.1-branch/Source/WebKit/mac
- Revision
- 187106
- Author
- bshaf...@apple.com
- Date
- 2015-07-21 10:06:29 -0700 (Tue, 21 Jul 2015)
Log Message
Merged r187103. rdar://problem/9091261
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog (187105 => 187106)
--- branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog 2015-07-21 16:53:11 UTC (rev 187105)
+++ branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog 2015-07-21 17:06:29 UTC (rev 187106)
@@ -1,3 +1,17 @@
+2015-07-21 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r187103.
+
+ 2015-07-21 Brady Eidson <beid...@apple.com>
+
+ 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-20 Matthew Hanson <matthew_han...@apple.com>
Merge r186982. rdar://problem/21567820
Modified: branches/safari-601.1-branch/Source/WebKit/mac/WebView/WebPreferences.mm (187105 => 187106)
--- branches/safari-601.1-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2015-07-21 16:53:11 UTC (rev 187105)
+++ branches/safari-601.1-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2015-07-21 17:06:29 UTC (rev 187106)
@@ -2544,7 +2544,7 @@
- (BOOL)metaRefreshEnabled
{
- return [self metaRefreshEnabled];
+ return [self httpEquivEnabled];
}
- (void)setHTTPEquivEnabled:(BOOL)enabled
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
