Changeset 27188 in webkit

Timestamp:

Oct 28, 2007 1:23:11 PM (17 years ago)

Author:

alp

Message:

​http://bugs.webkit.org/show_bug.cgi?id=15701
The curl http backend does not deal properly with redirects

Implement http redirect support.

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-10-28  Alp Toker  <alp@atoker.com>
+
+        Reviewed by Adam Roben.
+
+        http://bugs.webkit.org/show_bug.cgi?id=15701
+        The curl http backend does not deal properly with redirects
+
+        Implement http redirect support.
+
+        * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::headerCallback):
+
 2007-10-28  Kevin Ollivier  <kevino@theolliviers.com>
 

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

@@ -114 +114 @@
     unsigned int totalSize = size * nmemb;
     ResourceHandleClient* client = d->client();
-    if (!client) {
-        return totalSize;
-    }
-
-    
+
     String header(static_cast<const char*>(ptr), totalSize);
 
@@ -145 +141 @@
         d->m_response.setSuggestedFilename(filenameFromHTTPContentDisposition(d->m_response.httpHeaderField("Content-Disposition")));
 
-        client->didReceiveResponse(job, d->m_response);
+        // HTTP redirection
+        if (httpCode >= 300 && httpCode < 400) {
+            String location = d->m_response.httpHeaderField("location");
+            if (!location.isEmpty()) {
+                KURL newURL = KURL(job->request().url(), location.deprecatedString());
+
+                ResourceRequest redirectedRequest = job->request();
+                redirectedRequest.setURL(newURL);
+                if (client)
+                    client->willSendRequest(job, redirectedRequest, d->m_response);
+
+                d->m_request.setURL(newURL);
+
+                return totalSize;
+            }
+        }
+
+        if (client)
+            client->didReceiveResponse(job, d->m_response);
     } else {
         int splitPos = header.find(":");