summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/network/cf
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/platform/network/cf')
-rw-r--r--Source/WebCore/platform/network/cf/ResourceError.h1
-rw-r--r--Source/WebCore/platform/network/cf/ResourceErrorCF.cpp5
-rw-r--r--Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp2
-rw-r--r--Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp4
4 files changed, 9 insertions, 3 deletions
diff --git a/Source/WebCore/platform/network/cf/ResourceError.h b/Source/WebCore/platform/network/cf/ResourceError.h
index 30e0a5ea0..6a8c7daf0 100644
--- a/Source/WebCore/platform/network/cf/ResourceError.h
+++ b/Source/WebCore/platform/network/cf/ResourceError.h
@@ -65,6 +65,7 @@ public:
#if PLATFORM(WIN)
ResourceError(const String& domain, int errorCode, const String& failingURL, const String& localizedDescription, CFDataRef certificate);
PCCERT_CONTEXT certificate() const;
+ void setCertificate(CFDataRef);
#endif
ResourceError(CFStreamError error);
CFStreamError cfStreamError() const;
diff --git a/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp b/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp
index aa318e665..354fd2758 100644
--- a/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp
+++ b/Source/WebCore/platform/network/cf/ResourceErrorCF.cpp
@@ -62,6 +62,11 @@ PCCERT_CONTEXT ResourceError::certificate() const
return reinterpret_cast<PCCERT_CONTEXT>(CFDataGetBytePtr(m_certificate.get()));
}
+
+void ResourceError::setCertificate(CFDataRef certificate)
+{
+ m_certificate = certificate;
+}
#endif // PLATFORM(WIN)
const CFStringRef failingURLStringKey = CFSTR("NSErrorFailingURLStringKey");
diff --git a/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp b/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
index f6d1f3821..01e8b8ae5 100644
--- a/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
+++ b/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
@@ -428,7 +428,7 @@ static CFURLRequestRef makeFinalRequest(const ResourceRequest& request, bool sho
if (!sslProps)
sslProps.adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
#if PLATFORM(WIN)
- wkSetClientCertificateInSSLProperties(sslProps.get(), (clientCert->second).get());
+ wkSetClientCertificateInSSLProperties(sslProps.get(), (clientCert->value).get());
#endif
}
diff --git a/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp b/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
index 57a6fb2c8..8cff87ca0 100644
--- a/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
+++ b/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
@@ -120,8 +120,8 @@ static inline void setHeaderFields(CFMutableURLRequestRef request, const HTTPHea
HTTPHeaderMap::const_iterator end = requestHeaders.end();
for (HTTPHeaderMap::const_iterator it = requestHeaders.begin(); it != end; ++it) {
- CFStringRef key = it->first.createCFString();
- CFStringRef value = it->second.createCFString();
+ CFStringRef key = it->key.createCFString();
+ CFStringRef value = it->value.createCFString();
CFURLRequestSetHTTPHeaderFieldValue(request, key, value);
CFRelease(key);
CFRelease(value);