[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[mjs at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit e9f60fe34f283e4972c97a873373323358af0b99
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 1 03:37:01 2009 +0000

    Build fix, not reviewed.
    
    More Windows build fixes 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@48957 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8860051..97718c1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,15 @@
 
         Build fix, not reviewed.
 
+        More Windows build fixes for https://bugs.webkit.org/show_bug.cgi?id=29943
+
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::willSendRequest):
+
+2009-09-30  Maciej Stachowiak  <mjs at 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:
diff --git a/WebCore/platform/network/cf/ResourceHandleCFNet.cpp b/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
index e157686..ea5fcc6 100644
--- a/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
+++ b/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
@@ -143,11 +143,12 @@ CFURLRequestRef willSendRequest(CFURLConnectionRef conn, CFURLRequestRef cfReque
 
                 FormData* body = handle->request().httpBody();
                 if (!equalIgnoringCase(handle->request().httpMethod(), "GET") && body && !body->isEmpty())
-                    WebCore::setHTTPBody(mutableRequest, body);
+                    WebCore::setHTTPBody(mutableRequest.get(), body);
 
-                RetainPtr<CFStringRef> originalContentType(AdoptCF, handle->request.httpContentType().createCFString());
+                String originalContentType = handle->request().httpContentType();
+                RetainPtr<CFStringRef> originalContentTypeCF(AdoptCF, originalContentType.createCFString());
                 if (!originalContentType.isEmpty())
-                    CFURLRequestSetHTTPHeaderFieldValue(mutableRequest.get(), CFSTR("Content-Type"), originalContentType.get());
+                    CFURLRequestSetHTTPHeaderFieldValue(mutableRequest.get(), CFSTR("Content-Type"), originalContentTypeCF.get());
 
                 request = mutableRequest.get();
             }

-- 
WebKit Debian packaging