[Webkit-unassigned] [Bug 17837] Separate Windows Networking into CFNetwork and Curl Files
bugzilla-daemon at webkit.org
bugzilla-daemon at webkit.org
Mon Mar 17 11:48:07 PDT 2008
http://bugs.webkit.org/show_bug.cgi?id=17837
aroben at apple.com changed:
What |Removed |Added
----------------------------------------------------------------------------
Attachment #19823|review? |review-
Flag| |
------- Comment #4 from aroben at apple.com 2008-03-17 11:48 PDT -------
(From update of attachment 19823)
+#if PLATFORM(WIN) && USE(CURL)
static void setHostAllowsAnyHTTPSCertificate(const String&);
static void setClientCertificate(const String& host, CFDataRef);
#endif
You should probably include #if PLATFORM(CF) here as well, since you're using
CFDataRef.
+#if PLATFORM(WIN)
+// FIXME: The CFDataRef will need to be something else when
+// building without CoreFoundation
+static HashMap<String, RetainPtr<CFDataRef> >& clientCerts()
+{
+ static HashMap<String, RetainPtr<CFDataRef> > certs;
+ return certs;
+}
+
+void ResourceHandle::setClientCertificate(const String& host, CFDataRef cert)
+{
+ clientCerts().set(host.lower(), cert);
+}
+#endif
Ditto here.
+++ WebKit/win/WebDataSource.cpp (working copy)
@@ -46,6 +46,7 @@
#include <WebCore/FrameLoader.h>
#include <WebCore/KURL.h>
#pragma warning(pop)
+#include <wtf/RetainPtr.h>
Why is this needed?
+++ WebKit/win/WebError.cpp (working copy)
@@ -28,7 +28,9 @@
#include "WebError.h"
#include "WebKit.h"
+#if USE(CFNETWORK)
#include <WebKitSystemInterface/WebKitSystemInterface.h>
+#endif
#pragma warning(push, 0)
#include <WebCore/BString.h>
#pragma warning(pop)
We normally put headers that are conditionally included in their own paragraph
after all the unconditional headers.
+++ WebKit/win/WebURLAuthenticationChallenge.cpp (working copy)
@@ -40,6 +40,7 @@
#include <WebCore/BString.h>
#include <WebCore/ResourceHandle.h>
#pragma warning(pop)
+#include <wtf/RetainPtr.h>
Why is this needed?
@@ -168,7 +169,11 @@ HRESULT STDMETHODCALLTYPE WebURLAuthenti
if (!webSender)
return E_NOINTERFACE;
+#if USE(CFNETWORK)
m_authenticationChallenge =
AuthenticationChallenge(webChallenge->authenticationChallenge().cfURLAuthChallengeRef(),
webSender->resourceHandle());
+#else
+ m_authenticationChallenge =
AuthenticationChallenge(webSender->resourceHandle());
+#endif
I think it would be better to return E_FAIL here and not modify
m_authenticationChallenge. Then you can remove the changes to
AuthenticationChallenge
r- for now.
--
Configure bugmail: http://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
More information about the webkit-unassigned
mailing list