bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge revision 502 changes:

Browse Source 
- Setting the OnBeforeResourceLoad redirectUrl value should behave the same as using request->SetURL() (issue #529).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/963@503 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-02-16 20:13:44 +00:00
parent e2c233100d
commit fdcea1583c
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libcef/browser_resource_loader_bridge.cc
View File

@ -470,10 +470,10 @@ class RequestProxy : public net::URLRequest::Delegate,
if (!handled) {
// Observe URL from request.
const std::string requestUrl(request->GetURL());
if(requestUrl != originalUrl) {
if (requestUrl != originalUrl)
params->url = GURL(requestUrl);
redirectUrl.clear(); // Request URL trumps redirect URL
}
else if (!redirectUrl.empty())
params->url = GURL(std::string(redirectUrl));
// Observe method from request.
params->method = request->GetMethod();
@ -504,14 +504,6 @@ class RequestProxy : public net::URLRequest::Delegate,
OnCompletedRequest(
URLRequestStatus(URLRequestStatus::CANCELED, net::ERR_ABORTED),
std::string(), base::Time());
} else if (!redirectUrl.empty()) {
// redirect to the specified URL
handled = true;
params->url = GURL(std::string(redirectUrl));
ResourceResponseInfo info;
bool defer_redirect;
OnReceivedRedirect(params->url, info, &defer_redirect);
} else if (resourceStream.get()) {
// load from the provided resource stream
handled = true;