Title: [171902] trunk/Tools
- Revision
- 171902
- Author
- [email protected]
- Date
- 2014-07-31 18:01:00 -0700 (Thu, 31 Jul 2014)
Log Message
Reverted r171893, because it broke http/tests/appcache/different-https-origin-resource-main.html,
which loads HTTPS content without calling the delegate.
Rubber-stamped by Alexey Proskuryakov.
* WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm:
(WTR::InjectedBundle::platformInitialize):
* WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
(WTR::InjectedBundle::platformInitialize):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (171901 => 171902)
--- trunk/Tools/ChangeLog 2014-08-01 00:53:02 UTC (rev 171901)
+++ trunk/Tools/ChangeLog 2014-08-01 01:01:00 UTC (rev 171902)
@@ -1,3 +1,15 @@
+2014-07-31 Dan Bernstein <[email protected]>
+
+ Reverted r171893, because it broke http/tests/appcache/different-https-origin-resource-main.html,
+ which loads HTTPS content without calling the delegate.
+
+ Rubber-stamped by Alexey Proskuryakov.
+
+ * WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm:
+ (WTR::InjectedBundle::platformInitialize):
+ * WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
+ (WTR::InjectedBundle::platformInitialize):
+
2014-07-31 Brent Fulgham <[email protected]>
Unreviewed typo correction (and build fix).
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm (171901 => 171902)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm 2014-08-01 00:53:02 UTC (rev 171901)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm 2014-08-01 01:01:00 UTC (rev 171902)
@@ -27,6 +27,10 @@
#import <Foundation/Foundation.h>
+@interface NSURLRequest (PrivateThingsWeShouldntReallyUse)
++(void)setAllowsAnyHTTPSCertificate:(BOOL)allow forHost:(NSString *)host;
+@end
+
namespace WTR {
void InjectedBundle::platformInitialize(WKTypeRef)
@@ -35,6 +39,9 @@
nil];
[[NSUserDefaults standardUserDefaults] setVolatileDomain:dict forName:NSArgumentDomain];
+
+ [NSURLRequest setAllowsAnyHTTPSCertificate:YES forHost:@"localhost"];
+ [NSURLRequest setAllowsAnyHTTPSCertificate:YES forHost:@"127.0.0.1"];
}
} // namespace WTR
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm (171901 => 171902)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm 2014-08-01 00:53:02 UTC (rev 171901)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm 2014-08-01 01:01:00 UTC (rev 171902)
@@ -27,6 +27,10 @@
#import <Foundation/Foundation.h>
+@interface NSURLRequest (PrivateThingsWeShouldntReallyUse)
++(void)setAllowsAnyHTTPSCertificate:(BOOL)allow forHost:(NSString *)host;
+@end
+
@interface NSSound (Details)
+ (void)_setAlertType:(NSUInteger)alertType;
@end
@@ -66,6 +70,9 @@
// A distributed notification is delivered to all applications, but it should be harmless, and it's the only way to update all underlying frameworks anyway.
[[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"AppleAquaAntiAliasingChanged" object:nil userInfo:nil deliverImmediately:YES];
+ [NSURLRequest setAllowsAnyHTTPSCertificate:YES forHost:@"localhost"];
+ [NSURLRequest setAllowsAnyHTTPSCertificate:YES forHost:@"127.0.0.1"];
+
[NSSound _setAlertType:0];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
