Oxide

Merge lp:~osomon/oxide/set-ua-override-on-redirection into lp:~oxide-developers/oxide/oxide.trunk

  1. set-ua-override-on-redirection
  2. Merge into oxide.trunk
Proposed by Olivier Tilloy
Status: Merged
Merged at revision: 1255
Proposed branch: lp:~osomon/oxide/set-ua-override-on-redirection
Merge into: lp:~oxide-developers/oxide/oxide.trunk
Diff against target: 64 lines (+27/-1)
3 files modified
qt/tests/qmltests/api/tst_WebContext_userAgentOverrides.qml (+1/-0)
qt/tests/qmltests/api/tst_WebContext_userAgentOverrides_redirect.py (+15/-0)
shared/browser/oxide_network_delegate.cc (+11/-1)
To merge this branch: bzr merge lp:~osomon/oxide/set-ua-override-on-redirection
Reviewer Review Type Date Requested Status
Chris Coulson Approve
Review via email: mp+275878@code.launchpad.net

Commit message

Use the per-URL user agent overrides on redirections, too.

To post a comment you must log in.
Revision history for this message
Chris Coulson (chrisccoulson) wrote :

Thanks - I've added one small comment inline, but other than that it looks ok

review: Approve
lp:~osomon/oxide/set-ua-override-on-redirection updated
1255. By Olivier Tilloy

Override the UA conditionally.

1256. By Olivier Tilloy

Move code to NetworkDelegate::OnBeforeRedirect().

Revision history for this message
Chris Coulson (chrisccoulson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'qt/tests/qmltests/api/tst_WebContext_userAgentOverrides.qml'
--- qt/tests/qmltests/api/tst_WebContext_userAgentOverrides.qml 2015-06-29 17:24:07 +0000
+++ qt/tests/qmltests/api/tst_WebContext_userAgentOverrides.qml 2015-10-27 18:23:05 +0000
@@ -83,6 +83,7 @@
83 { url : "http://15.testsuite/get-headers.py", expected: "Override 15" },83 { url : "http://15.testsuite/get-headers.py", expected: "Override 15" },
84 { url : "http://foo.15.testsuite/get-headers.py", expected: "Default user agent" },84 { url : "http://foo.15.testsuite/get-headers.py", expected: "Default user agent" },
85 { url : "http://16.testsuite/get-headers.py", expected: "Default user agent" },85 { url : "http://16.testsuite/get-headers.py", expected: "Default user agent" },
86 { url : "http://1.testsuite/tst_WebContext_userAgentOverrides_redirect.py", expected: "Override 2" },
86 ];87 ];
87 }88 }
8889
8990
=== added file 'qt/tests/qmltests/api/tst_WebContext_userAgentOverrides_redirect.py'
--- qt/tests/qmltests/api/tst_WebContext_userAgentOverrides_redirect.py 1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebContext_userAgentOverrides_redirect.py 2015-10-27 18:23:05 +0000
@@ -0,0 +1,15 @@
1from cStringIO import StringIO
2
3def handler(request):
4 html = StringIO()
5 html.write("<html></html>");
6
7 request.send_response(302)
8 request.send_header("Content-type", "text/html")
9 request.send_header("Content-Length", html.tell())
10 request.send_header("Location", "http://2.testsuite/get-headers.py")
11 request.send_header("Cache-Control", "no-cache")
12 request.end_headers()
13
14 request.wfile.write(html.getvalue())
15
016
=== modified file 'shared/browser/oxide_network_delegate.cc'
--- shared/browser/oxide_network_delegate.cc 2015-10-14 09:46:03 +0000
+++ shared/browser/oxide_network_delegate.cc 2015-10-27 18:23:05 +0000
@@ -19,10 +19,12 @@
1919
20#include "base/memory/ref_counted.h"20#include "base/memory/ref_counted.h"
21#include "net/base/net_errors.h"21#include "net/base/net_errors.h"
22#include "net/http/http_request_headers.h"
22#include "net/url_request/url_request.h"23#include "net/url_request/url_request.h"
2324
24#include "oxide_browser_context.h"25#include "oxide_browser_context.h"
25#include "oxide_browser_context_delegate.h"26#include "oxide_browser_context_delegate.h"
27#include "oxide_user_agent_settings.h"
2628
27namespace oxide {29namespace oxide {
2830
@@ -92,7 +94,15 @@
92}94}
9395
94void NetworkDelegate::OnBeforeRedirect(net::URLRequest* request,96void NetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
95 const GURL& new_location) {}97 const GURL& new_location) {
98 std::string user_agent =
99 context_->GetUserAgentSettings()
100 ->GetUserAgentOverrideForURL(new_location);
101 if (!user_agent.empty()) {
102 request->SetExtraRequestHeaderByName(net::HttpRequestHeaders::kUserAgent,
103 user_agent, true);
104 }
105}
96106
97void NetworkDelegate::OnResponseStarted(net::URLRequest* request) {}107void NetworkDelegate::OnResponseStarted(net::URLRequest* request) {}
98108

Subscribers

People subscribed via source and target branches