From 8995b83bcbfbb68245f779b64e5517627c6cc6ea Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 17 Oct 2012 16:21:14 +0200 Subject: Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592) New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well as the previously cherry-picked changes --- Source/WebCore/xml/XMLHttpRequest.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'Source/WebCore/xml/XMLHttpRequest.cpp') diff --git a/Source/WebCore/xml/XMLHttpRequest.cpp b/Source/WebCore/xml/XMLHttpRequest.cpp index 097bc4427..f61690854 100644 --- a/Source/WebCore/xml/XMLHttpRequest.cpp +++ b/Source/WebCore/xml/XMLHttpRequest.cpp @@ -929,7 +929,7 @@ void XMLHttpRequest::setRequestHeaderInternal(const AtomicString& name, const St { HTTPHeaderMap::AddResult result = m_requestHeaders.add(name, value); if (!result.isNewEntry) - result.iterator->second.append(", " + value); + result.iterator->value.append(", " + value); } String XMLHttpRequest::getRequestHeader(const AtomicString& name) const @@ -956,16 +956,16 @@ String XMLHttpRequest::getAllResponseHeaders(ExceptionCode& ec) const // 2) There's no known harm in hiding Set-Cookie header fields entirely; we don't // know any widely used technique that requires access to them. // 3) Firefox has implemented this policy. - if (isSetCookieHeader(it->first) && !securityOrigin()->canLoadLocalResources()) + if (isSetCookieHeader(it->key) && !securityOrigin()->canLoadLocalResources()) continue; - if (!m_sameOriginRequest && !isOnAccessControlResponseHeaderWhitelist(it->first) && !accessControlExposeHeaderSet.contains(it->first)) + if (!m_sameOriginRequest && !isOnAccessControlResponseHeaderWhitelist(it->key) && !accessControlExposeHeaderSet.contains(it->key)) continue; - stringBuilder.append(it->first); + stringBuilder.append(it->key); stringBuilder.append(':'); stringBuilder.append(' '); - stringBuilder.append(it->second); + stringBuilder.append(it->value); stringBuilder.append('\r'); stringBuilder.append('\n'); } @@ -1116,7 +1116,11 @@ void XMLHttpRequest::didReceiveResponse(unsigned long identifier, const Resource InspectorInstrumentation::didReceiveXHRResponse(scriptExecutionContext(), identifier); m_response = response; - m_responseEncoding = extractCharsetFromMediaType(m_mimeTypeOverride); + if (!m_mimeTypeOverride.isEmpty()) { + m_response.setHTTPHeaderField("Content-Type", m_mimeTypeOverride); + m_responseEncoding = extractCharsetFromMediaType(m_mimeTypeOverride); + } + if (m_responseEncoding.isEmpty()) m_responseEncoding = response.textEncodingName(); } -- cgit v1.2.1