Changeset 28569 in webkit

Timestamp:

Dec 8, 2007 4:32:55 PM (16 years ago)

Author:

alp@webkit.org

Message:

2007-12-08 Kevin Ollivier <​kevino@theolliviers.com>

Reviewed by Alp Toker.

​http://bugs.webkit.org/show_bug.cgi?id=14651
[CURL] didReceiveResponse() only called for HTTP loads

​http://bugs.webkit.org/show_bug.cgi?id=14583
[GDK] ​file:// relative CSS include URLs handled incorrectly

Make sure CURL sets the ResourceResponse URL and calls
didReceiveResponse for local files too.

• platform/network/curl/ResourceHandleManager.cpp: (WebCore::writeCallback):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/ResourceHandleManager.cpp (modified) (2 diffs)
• platform/network/curl/ResourceResponse.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-12-08  Kevin Ollivier  <kevino@theolliviers.com>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=14651
+        [CURL] didReceiveResponse() only called for HTTP loads
+
+        http://bugs.webkit.org/show_bug.cgi?id=14583
+        [GDK] file:// relative CSS include URLs handled incorrectly
+
+        Make sure CURL sets the ResourceResponse URL and calls
+        didReceiveResponse for local files too. 
+
+        * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::writeCallback):
+
 2007-12-08  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/platform/network/curl/ResourceHandleManager.cpp

@@ -95 +95 @@
         return totalSize;
 
+    // since the code in headerCallback will not have run for local files
+    // the code to set the URL and fire didReceiveResponse is never run,
+    // which means the ResourceLoader's response does not contain the URL.
+    // Run the code here for local files to resolve the issue.
+    // TODO: See if there is a better approach for handling this.
+    if (!d->m_response.responseFired()) {
+        const char* hdr;
+        err = curl_easy_getinfo(h, CURLINFO_EFFECTIVE_URL, &hdr);
+        d->m_response.setUrl(KURL(hdr));
+        if (d->client())
+            d->client()->didReceiveResponse(job, d->m_response);
+        d->m_response.setResponseFired(true);
+    }
+
     if (d->client())
         d->client()->didReceiveData(job, static_cast<char*>(ptr), totalSize, 0);
@@ -162 +176 @@
         if (client)
             client->didReceiveResponse(job, d->m_response);
+        d->m_response.setResponseFired(true);
+
     } else {
         int splitPos = header.find(":");

trunk/WebCore/platform/network/curl/ResourceResponse.h

@@ -35 +35 @@
 public:
     ResourceResponse()
-        : ResourceResponseBase(false)
+        : ResourceResponseBase(false),
+          m_responseFired(false)
     {
     }
 
     ResourceResponse(const KURL& url, const String& mimeType, long long expectedLength, const String& textEncodingName, const String& filename)
-        : ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename)
+        : ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename),
+          m_responseFired(false)
     {
     }
+    
+    void setResponseFired(bool fired) { m_responseFired = fired; }
+    bool responseFired() { return m_responseFired; }
 
 private:
@@ -50 +55 @@
     {
     }
+    
+    bool m_responseFired;
 
 };