Changeset 173314 in webkit

Timestamp:

Sep 5, 2014 11:15:59 AM (10 years ago)

Author:

Antti Koivisto

Message:

REGRESSION(r173272): Two blob tests failing on WK1
​https://bugs.webkit.org/show_bug.cgi?id=136573

Reviewed by Alexey Proskuryakov.

http/tests/fileapi/blob-url-in-subframe.html
http/tests/security/mixedContent/blob-url-in-iframe.html

• platform/network/BlobResourceHandle.cpp:

(WebCore::BlobResourceHandle::notifyResponseOnSuccess):

No need to set this twice.

• platform/network/mac/ResourceResponseMac.mm:

(WebCore::ResourceResponse::initNSURLResponse):

Also test that it is an HTTP URL before using NSHTTPURLResponse. Blobs create non-HTTP URLs with status codes.
Pass the accidentally lost expected content length.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/BlobResourceHandle.cpp (modified) (1 diff)
• platform/network/mac/ResourceResponseMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-05  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION(r173272): Two blob tests failing on WK1
+        https://bugs.webkit.org/show_bug.cgi?id=136573
+
+        Reviewed by Alexey Proskuryakov.
+
+        http/tests/fileapi/blob-url-in-subframe.html
+        http/tests/security/mixedContent/blob-url-in-iframe.html
+
+        * platform/network/BlobResourceHandle.cpp:
+        (WebCore::BlobResourceHandle::notifyResponseOnSuccess):
+
+            No need to set this twice.
+
+        * platform/network/mac/ResourceResponseMac.mm:
+        (WebCore::ResourceResponse::initNSURLResponse):
+
+            Also test that it is an HTTP URL before using NSHTTPURLResponse. Blobs create non-HTTP URLs with status codes.
+            Pass the accidentally lost expected content length.
+
 2014-09-05  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp

@@ -598 +598 @@
     bool isRangeRequest = m_rangeOffset != positionNotSpecified;
     ResourceResponse response(firstRequest().url(), m_blobData->contentType(), m_totalRemainingSize, String());
-    response.setExpectedContentLength(m_totalRemainingSize);
     response.setHTTPStatusCode(isRangeRequest ? httpPartialContent : httpOK);
     response.setHTTPStatusText(isRangeRequest ? httpPartialContentText : httpOKText);

trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm

@@ -46 +46 @@
 void ResourceResponse::initNSURLResponse() const
 {
-    if (!m_httpStatusCode) {
+    if (!m_httpStatusCode || !m_url.protocolIsInHTTPFamily()) {
         // Work around a mistake in the NSURLResponse class - <rdar://problem/6875219>.
         // The init function takes an NSInteger, even though the accessor returns a long long.
@@ -56 +56 @@
             expectedContentLength = static_cast<NSInteger>(m_expectedContentLength);
 
-        m_nsResponse = adoptNS([[NSURLResponse alloc] initWithURL:m_url MIMEType:m_mimeType expectedContentLength:-1 textEncodingName:m_textEncodingName]);
+        m_nsResponse = adoptNS([[NSURLResponse alloc] initWithURL:m_url MIMEType:m_mimeType expectedContentLength:expectedContentLength textEncodingName:m_textEncodingName]);
         return;
     }