Build fix, not reviewed.
authormjs@apple.com <mjs@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 1 Oct 2009 03:14:09 +0000 (03:14 +0000)
committermjs@apple.com <mjs@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 1 Oct 2009 03:14:09 +0000 (03:14 +0000)
Fix windows build for fix for https://bugs.webkit.org/show_bug.cgi?id=29943

* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::willSendRequest):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48956 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/network/cf/ResourceHandleCFNet.cpp

index 17a0aa14b9bbe0f03d388dd2ad1688918616d103..88600510aebd6e3c83076fc63b2c12542fd01328 100644 (file)
@@ -1,3 +1,12 @@
+2009-09-30  Maciej Stachowiak  <mjs@apple.com>
+
+        Build fix, not reviewed.
+
+        Fix windows build for fix for https://bugs.webkit.org/show_bug.cgi?id=29943
+
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::willSendRequest):
+
 2009-09-30  Dimitri Glazkov  <dglazkov@chromium.org>
 
         Reviewed by Darin Fisher.
index 8261e44f6ae7acc980ed02944866dc1d1626cea7..e157686ab955f93124e2cb3830fb4018105e95e5 100644 (file)
@@ -36,6 +36,7 @@
 #include "CookieStorageWin.h"
 #include "CredentialStorage.h"
 #include "DocLoader.h"
+#include "FormDataStreamCFNet.h"
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "Logging.h"
@@ -144,9 +145,9 @@ CFURLRequestRef willSendRequest(CFURLConnectionRef conn, CFURLRequestRef cfReque
                 if (!equalIgnoringCase(handle->request().httpMethod(), "GET") && body && !body->isEmpty())
                     WebCore::setHTTPBody(mutableRequest, body);
 
-                String originalContentType = m_handle->request.httpContentType();
-                if (!originalContentType->isEmpty())
-                    CFURLRequestSetHTTPHeaderFieldValue(mutableRequest.get(), CFSTR("Content-Type"), originalContentType);
+                RetainPtr<CFStringRef> originalContentType(AdoptCF, handle->request.httpContentType().createCFString());
+                if (!originalContentType.isEmpty())
+                    CFURLRequestSetHTTPHeaderFieldValue(mutableRequest.get(), CFSTR("Content-Type"), originalContentType.get());
 
                 request = mutableRequest.get();
             }