summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-05-30 17:07:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-30 17:07:13 -0700
commit5ace239149deab659c929c2b77c44d1dd0588801 (patch)
tree9d5802326f7be6ef02b6544ed34c2065bc413bd1
parent5ce4bd8decc0c23f3727397652e4b9d9193f6d3e (diff)
parent6f60c96bbd87b5c54d89aeb23ace06ae3647e2f3 (diff)
downloadexternal_webkit-5ace239149deab659c929c2b77c44d1dd0588801.zip
external_webkit-5ace239149deab659c929c2b77c44d1dd0588801.tar.gz
external_webkit-5ace239149deab659c929c2b77c44d1dd0588801.tar.bz2
am 6f60c96b: Merge "Don\'t override X-Requested-With if it is already set" into jb-dev
* commit '6f60c96bbd87b5c54d89aeb23ace06ae3647e2f3': Don't override X-Requested-With if it is already set
-rw-r--r--Source/WebKit/android/WebCoreSupport/WebRequest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/WebRequest.cpp b/Source/WebKit/android/WebCoreSupport/WebRequest.cpp
index 4c479e3..9d16378 100644
--- a/Source/WebKit/android/WebCoreSupport/WebRequest.cpp
+++ b/Source/WebKit/android/WebCoreSupport/WebRequest.cpp
@@ -96,7 +96,7 @@ WebRequest::WebRequest(WebUrlLoaderClient* loader, const WebResourceRequest& web
m_request = new net::URLRequest(gurl, this);
m_request->SetExtraRequestHeaders(webResourceRequest.requestHeaders());
- m_request->SetExtraRequestHeaderByName(kXRequestedWithHeader, s_packageName.Get().value, true);
+ m_request->SetExtraRequestHeaderByName(kXRequestedWithHeader, s_packageName.Get().value, false);
m_request->set_referrer(webResourceRequest.referrer());
m_request->set_method(webResourceRequest.method());
m_request->set_load_flags(webResourceRequest.loadFlags());