summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasaki Miyahara <m-miyahara@ct.jp.nec.com>2013-06-19 17:01:42 +0900
committerMasaki Miyahara <m-miyahara@ct.jp.nec.com>2013-06-19 17:01:42 +0900
commitaac3ea764cda8a0b37bd3349510e9001f81e2b65 (patch)
tree3b2d484a639dc45974b70f683ee60cf52663946a
parent11d7657ebc4dfb1462db8cdc8b48ffa25478e442 (diff)
downloadwebkit-aac3ea764cda8a0b37bd3349510e9001f81e2b65.tar.gz
Fix the problem that m_url is not renewed in WebRequest::OnReceivedRedirect().
[Phenomenon] "Security warning" dialog is not displayed at SSL site using self-signed certification. [Cause] Although ssl authentication error in redirection destination url, m_url(managed in Webkit) is still redirection origin url.
-rw-r--r--Source/WebKit/android/WebCoreSupport/WebRequest.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/WebRequest.cpp b/Source/WebKit/android/WebCoreSupport/WebRequest.cpp
index dda0ee191..144a5ee3c 100644
--- a/Source/WebKit/android/WebCoreSupport/WebRequest.cpp
+++ b/Source/WebKit/android/WebCoreSupport/WebRequest.cpp
@@ -391,6 +391,7 @@ void WebRequest::OnReceivedRedirect(net::URLRequest* newRequest, const GURL& new
ASSERT(m_loadState < Response, "Redirect after receiving response");
ASSERT(newRequest && newRequest->status().is_success(), "Invalid redirect");
+ m_url = newUrl.spec();
OwnPtr<WebResponse> webResponse(new WebResponse(newRequest));
webResponse->setUrl(newUrl.spec());
m_urlLoader->maybeCallOnMainThread(NewRunnableMethod(