From 35bdbf317c65b9337c517b32ac0ea1f5301d0067 Mon Sep 17 00:00:00 2001 From: Rich McNeary Date: Tue, 1 Jul 2014 10:04:16 -0400 Subject: [PATCH 1/3] Set Headers now iterates over key The NameValueCollection iterator returns the string key, not a KeyValuePair. --- CefSharp.Core/Internals/CefRequestWrapper.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CefSharp.Core/Internals/CefRequestWrapper.cpp b/CefSharp.Core/Internals/CefRequestWrapper.cpp index ef3efcbf39..29aea26abb 100644 --- a/CefSharp.Core/Internals/CefRequestWrapper.cpp +++ b/CefSharp.Core/Internals/CefRequestWrapper.cpp @@ -84,10 +84,10 @@ namespace CefSharp { CefRequest::HeaderMap hm; - for each(KeyValuePair^ pair in headers) + for each(String^ key in headers) { - CefString name = StringUtils::ToNative(pair->Key); - CefString value = StringUtils::ToNative(pair->Value); + CefString name = StringUtils::ToNative(key); + CefString value = StringUtils::ToNative(headers->Get(key)); hm.insert(std::make_pair(name, value)); } From 916ad3bbde4693c55cba09a6bec27c565feef754 Mon Sep 17 00:00:00 2001 From: Rich McNeary Date: Tue, 1 Jul 2014 10:10:33 -0400 Subject: [PATCH 2/3] Tabs -> spaces per cefsharp guidelines. Tabs -> spaces per cefsharp guidelines. --- CefSharp.Core/Internals/CefRequestWrapper.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CefSharp.Core/Internals/CefRequestWrapper.cpp b/CefSharp.Core/Internals/CefRequestWrapper.cpp index 29aea26abb..55d95261af 100644 --- a/CefSharp.Core/Internals/CefRequestWrapper.cpp +++ b/CefSharp.Core/Internals/CefRequestWrapper.cpp @@ -84,10 +84,10 @@ namespace CefSharp { CefRequest::HeaderMap hm; - for each(String^ key in headers) + for each(String^ key in headers) { - CefString name = StringUtils::ToNative(key); - CefString value = StringUtils::ToNative(headers->Get(key)); + CefString name = StringUtils::ToNative(key); + CefString value = StringUtils::ToNative(headers->Get(key)); hm.insert(std::make_pair(name, value)); } From b5b976007f95a051473f79dfa685b4ccb81de94b Mon Sep 17 00:00:00 2001 From: Rich McNeary Date: Wed, 2 Jul 2014 09:52:44 -0400 Subject: [PATCH 3/3] NameValueCollection allows for duplicate keys. For each key get each of the values that matches the key. --- CefSharp.Core/Internals/CefRequestWrapper.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CefSharp.Core/Internals/CefRequestWrapper.cpp b/CefSharp.Core/Internals/CefRequestWrapper.cpp index 55d95261af..12adc4dfea 100644 --- a/CefSharp.Core/Internals/CefRequestWrapper.cpp +++ b/CefSharp.Core/Internals/CefRequestWrapper.cpp @@ -87,8 +87,11 @@ namespace CefSharp for each(String^ key in headers) { CefString name = StringUtils::ToNative(key); - CefString value = StringUtils::ToNative(headers->Get(key)); - hm.insert(std::make_pair(name, value)); + for each(String^ element in headers->GetValues(key)) + { + CefString value = StringUtils::ToNative(element); + hm.insert(std::make_pair(name, value)); + } } _wrappedRequest->SetHeaderMap(hm);