Title: [194420] trunk/Source/WebCore
- Revision
- 194420
- Author
- [email protected]
- Date
- 2015-12-25 12:46:47 -0800 (Fri, 25 Dec 2015)
Log Message
ASSERT(m_nsResponse) in ResourceResponse::platformCertificateInfo() when running tests in iOS simulator
https://bugs.webkit.org/show_bug.cgi?id=152559
Reviewed by Andy Estes.
Fix a regression from r194378.
* platform/network/cocoa/ResourceResponseCocoa.mm:
(WebCore::ResourceResponse::platformCertificateInfo):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (194419 => 194420)
--- trunk/Source/WebCore/ChangeLog 2015-12-25 12:22:16 UTC (rev 194419)
+++ trunk/Source/WebCore/ChangeLog 2015-12-25 20:46:47 UTC (rev 194420)
@@ -1,3 +1,15 @@
+2015-12-25 Alexey Proskuryakov <[email protected]>
+
+ ASSERT(m_nsResponse) in ResourceResponse::platformCertificateInfo() when running tests in iOS simulator
+ https://bugs.webkit.org/show_bug.cgi?id=152559
+
+ Reviewed by Andy Estes.
+
+ Fix a regression from r194378.
+
+ * platform/network/cocoa/ResourceResponseCocoa.mm:
+ (WebCore::ResourceResponse::platformCertificateInfo):
+
2015-12-25 David Kilzer <[email protected]>
ResourceError should store failingURL as URL instead of String to avoid reparsing and to address FIXME comments in ResourceErrorCF.cpp and ResourceErrorMac.mm
Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm (194419 => 194420)
--- trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm 2015-12-25 12:22:16 UTC (rev 194419)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm 2015-12-25 20:46:47 UTC (rev 194420)
@@ -67,8 +67,14 @@
CertificateInfo ResourceResponse::platformCertificateInfo() const
{
+#if USE(CFNETWORK)
+ ASSERT(m_cfResponse);
+ CFURLResponseRef cfResponse = m_cfResponse.get();
+#else
ASSERT(m_nsResponse);
- auto cfResponse = [m_nsResponse _CFURLResponse];
+ CFURLResponseRef cfResponse = [m_nsResponse _CFURLResponse];
+#endif
+
if (!cfResponse)
return { };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
