[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 700d51c14d29a1d52162fc8d6552c9ab6381f046
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 16 22:58:21 2009 +0000

            Rubber-stamped by Jon Honeycutt.
    
            A better Windows build fix
    
            * platform/network/cf/SocketStreamHandleCFNet.cpp: (WebCore::SocketStreamHandle::createStreams):
            Use a macro that inserts __declspec(dllimport) when appropriate for CFNetwork imports.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51057 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 08284f6..8cf8c37 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-16  Alexey Proskuryakov  <ap at apple.com>
+
+        Rubber-stamped by Jon Honeycutt.
+
+        A better Windows build fix
+
+        * platform/network/cf/SocketStreamHandleCFNet.cpp: (WebCore::SocketStreamHandle::createStreams):
+        Use a macro that inserts __declspec(dllimport) when appropriate for CFNetwork imports.
+
 2009-11-16  Yael Aharon  <yael.aharon at nokia.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
index f26ba8d..6aa8adc 100644
--- a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
+++ b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
@@ -40,11 +40,11 @@
 #include <SystemConfiguration/SystemConfiguration.h>
 #endif
 
-#if PLATFORM(MAC) // WebKitSystemInterface doesn't include these symbols.
-extern const CFStringRef kCFStreamPropertyCONNECTProxy;
-extern const CFStringRef kCFStreamPropertyCONNECTProxyHost;
-extern const CFStringRef kCFStreamPropertyCONNECTProxyPort;
-#endif
+extern "C" {
+CFN_EXPORT const CFStringRef kCFStreamPropertyCONNECTProxy;
+CFN_EXPORT const CFStringRef kCFStreamPropertyCONNECTProxyHost;
+CFN_EXPORT const CFStringRef kCFStreamPropertyCONNECTProxyPort;
+}
 
 namespace WebCore {
 
@@ -213,13 +213,10 @@ 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