Changeset 65859 in webkit

Timestamp:

Aug 23, 2010 8:25:48 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-23 Patrick Gansterer <​paroga@paroga.com>

Reviewed by Adam Roben.

Set the ResourceResponse HTTP headers in RessourceHandleWin
​https://bugs.webkit.org/show_bug.cgi?id=44444

• platform/network/win/ResourceHandleWin.cpp: (WebCore::queryHTTPHeader): (WebCore::ResourceHandle::onRequestComplete):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/win/ResourceHandleWin.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-23  Patrick Gansterer  <paroga@paroga.com>
+
+        Reviewed by Adam Roben.
+
+        Set the ResourceResponse HTTP headers in RessourceHandleWin
+        https://bugs.webkit.org/show_bug.cgi?id=44444
+
+        * platform/network/win/ResourceHandleWin.cpp:
+        (WebCore::queryHTTPHeader):
+        (WebCore::ResourceHandle::onRequestComplete):
+
 2010-08-23  Patrick Gansterer  <paroga@paroga.com>
 

trunk/WebCore/platform/network/win/ResourceHandleWin.cpp

@@ -65 +65 @@
 };
 
+static String queryHTTPHeader(HINTERNET requestHandle, DWORD infoLevel)
+{
+    DWORD bufferSize = 0;
+    HttpQueryInfoW(requestHandle, infoLevel, 0, &bufferSize, 0);
+
+    Vector<UChar> characters(bufferSize / sizeof(UChar));
+
+    if (!HttpQueryInfoW(requestHandle, infoLevel, characters.data(), &bufferSize, 0))
+        return String();
+
+    characters.removeLast(); // Remove NullTermination.
+    return String::adopt(characters);
+}
+
 static int addToOutstandingJobs(ResourceHandle* job)
 {
@@ -227 +241 @@
 
     HINTERNET handle = (request().httpMethod() == "POST") ? d->m_secondaryHandle : d->m_resourceHandle;
-    BOOL ok = FALSE;
 
     static const int bufferSize = 32768;
@@ -236 +249 @@
     buffers.dwBufferLength = bufferSize;
 
-    bool receivedAnyData = false;
+    BOOL ok = FALSE;
     while ((ok = InternetReadFileExA(handle, &buffers, IRF_NO_WAIT, (DWORD_PTR)this)) && buffers.dwBufferLength) {
         if (!hasReceivedResponse()) {
             setHasReceivedResponse();
             ResourceResponse response;
+            response.setURL(firstRequest().url());
+
+            String httpStatusText = queryHTTPHeader(d->m_requestHandle, HTTP_QUERY_STATUS_TEXT);
+            if (!httpStatusText.isNull())
+                response.setHTTPStatusText(httpStatusText);
+
+            String httpStatusCode = queryHTTPHeader(d->m_requestHandle, HTTP_QUERY_STATUS_CODE);
+            if (!httpStatusCode.isNull())
+                response.setHTTPStatusCode(httpStatusCode.toInt());
+
+            String httpContentLength = queryHTTPHeader(d->m_requestHandle, HTTP_QUERY_CONTENT_LENGTH);
+            if (!httpContentLength.isNull())
+                response.setExpectedContentLength(httpContentLength.toInt());
+
+            String httpContentType = queryHTTPHeader(d->m_requestHandle, HTTP_QUERY_CONTENT_TYPE);
+            if (!httpContentType.isNull()) {
+                response.setMimeType(extractMIMETypeFromMediaType(httpContentType));
+                response.setTextEncodingName(extractCharsetFromMediaType(httpContentType));
+            }
+
             client()->didReceiveResponse(this, response);
         }