[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ap at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit d415dd19c34e5e326489c1f9cffe98b76db57b8e
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 16 22:30:55 2009 +0000

            Windows build fix.
    
            * platform/network/cf/SocketStreamHandleCFNet.cpp: (WebCore::SocketStreamHandle::createStreams):
            Disable CONNECT proxies on Windows until WebKitSupportLibrary includes support for those.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51053 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 48632c8..4624be3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-16  Alexey Proskuryakov  <ap at apple.com>
+
+        Windows build fix.
+
+        * platform/network/cf/SocketStreamHandleCFNet.cpp: (WebCore::SocketStreamHandle::createStreams):
+        Disable CONNECT proxies on Windows until WebKitSupportLibrary includes support for those.
+
 2009-11-14  Yael Aharon  <yael.aharon at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
index 2843cbf..f26ba8d 100644
--- a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
+++ b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
@@ -40,11 +40,11 @@
 #include <SystemConfiguration/SystemConfiguration.h>
 #endif
 
-extern "C" {
+#if PLATFORM(MAC) // WebKitSystemInterface doesn't include these symbols.
 extern const CFStringRef kCFStreamPropertyCONNECTProxy;
 extern const CFStringRef kCFStreamPropertyCONNECTProxyHost;
 extern const CFStringRef kCFStreamPropertyCONNECTProxyPort;
-}
+#endif
 
 namespace WebCore {
 
@@ -213,10 +213,13 @@ void SocketStreamHandle::createStreams()
         break;
         }
     case CONNECTProxy: {
+#if PLATFORM(MAC)
+        // FIXME: Make CONNECT proxies work on Windows.
         const void* proxyKeys[] = { kCFStreamPropertyCONNECTProxyHost, kCFStreamPropertyCONNECTProxyPort };
         const void* proxyValues[] = { m_proxyHost.get(), m_proxyPort.get() };
         RetainPtr<CFDictionaryRef> connectDictionary(AdoptCF, CFDictionaryCreate(0, proxyKeys, proxyValues, sizeof(proxyKeys) / sizeof(*proxyKeys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
         CFReadStreamSetProperty(m_readStream.get(), kCFStreamPropertyCONNECTProxy, connectDictionary.get());
+#endif
         break;
         }
     }

-- 
WebKit Debian packaging