admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of deprecated HttpClient fail_redirect accessors.

Browse Source 
This patch removes set_fail_redirect()/fail_redirect() method accessors
from HttpClient class and converts their usage to
set_redirection_action/redirection_action where appropriate.

BUG=None
R=pthatcher@webrtc.org

Review URL: https://codereview.webrtc.org/1396683005

Cr-Commit-Position: refs/heads/master@{#10304}
This commit is contained in:
tfarina 2015-10-16 11:01:32 -07:00 committed by Commit bot
parent 861c55e583
commit 6ca1ac4283
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/base/httpclient.h
View File

@ -83,11 +83,6 @@ public:
enum RedirectAction { REDIRECT_DEFAULT, REDIRECT_ALWAYS, REDIRECT_NEVER };
void set_redirect_action(RedirectAction action) { redirect_action_ = action; }
RedirectAction redirect_action() const { return redirect_action_; }
// Deprecated
void set_fail_redirect(bool fail_redirect) {
redirect_action_ = REDIRECT_NEVER;
}
bool fail_redirect() const { return (REDIRECT_NEVER == redirect_action_); }
enum UriForm { URI_DEFAULT, URI_ABSOLUTE, URI_RELATIVE };
void set_uri_form(UriForm form) { uri_form_ = form; }

14
webrtc/base/httprequest.cc
View File

@ -48,11 +48,13 @@ void HttpMonitor::OnHttpClientComplete(HttpClient * http, HttpErrorType error) {
const int kDefaultHTTPTimeout = 30 * 1000; // 30 sec
HttpRequest::HttpRequest(const std::string &user_agent)
: firewall_(0), port_(80), secure_(false),
timeout_(kDefaultHTTPTimeout), fail_redirect_(false),
client_(user_agent.c_str(), NULL), error_(HE_NONE) {
}
HttpRequest::HttpRequest(const std::string& user_agent)
: firewall_(0),
port_(80),
secure_(false),
timeout_(kDefaultHTTPTimeout),
client_(user_agent.c_str(), NULL),
error_(HE_NONE) {}
HttpRequest::~HttpRequest() = default;
@ -82,7 +84,7 @@ void HttpRequest::Send() {
if (transparent_proxy) {
client_.set_proxy(proxy_);
}
client_.set_fail_redirect(fail_redirect_);
client_.set_redirect_action(HttpClient::REDIRECT_ALWAYS);
SocketAddress server(host_, port_);
client_.set_server(server);