zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert 6107 "Adds a modified copy of talk/base to webrtc/base. I..."

Browse Source 
This breaks Chromium FYI builds and prevent roll of webrtc/libjingle to Chrome.

http://chromegw.corp.google.com/i/chromium.webrtc.fyi/builders/Win%20Builder/builds/457


> Adds a modified copy of talk/base to webrtc/base. It is the first step in migrating talk/base to webrtc/base.
> 
> BUG=N/A
> R=andrew@webrtc.org, wu@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/12199004

TBR=henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14479004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6116 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
perkj@webrtc.org
2014-05-13 08:15:48 +00:00
parent 3a5825909d
commit e9a604accd
386 changed files with 6 additions and 84973 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
webrtc/base/httprequest.h
View File

@ -1,115 +0,0 @@
/*
* Copyright 2006 The WebRTC Project Authors. All rights reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef _HTTPREQUEST_H_
#define _HTTPREQUEST_H_
#include "webrtc/base/httpclient.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/proxyinfo.h"
#include "webrtc/base/socketserver.h"
#include "webrtc/base/thread.h"
#include "webrtc/base/sslsocketfactory.h" // Deprecated include
namespace rtc {
///////////////////////////////////////////////////////////////////////////////
// HttpRequest
///////////////////////////////////////////////////////////////////////////////
class FirewallManager;
class MemoryStream;
class HttpRequest {
public:
HttpRequest(const std::string &user_agent);
void Send();
void set_proxy(const ProxyInfo& proxy) {
proxy_ = proxy;
}
void set_firewall(FirewallManager * firewall) {
firewall_ = firewall;
}
// The DNS name of the host to connect to.
const std::string& host() { return host_; }
void set_host(const std::string& host) { host_ = host; }
// The port to connect to on the target host.
int port() { return port_; }
void set_port(int port) { port_ = port; }
// Whether the request should use SSL.
bool secure() { return secure_; }
void set_secure(bool secure) { secure_ = secure; }
// Returns the redirect when redirection occurs
const std::string& response_redirect() { return response_redirect_; }
// Time to wait on the download, in ms. Default is 5000 (5s)
int timeout() { return timeout_; }
void set_timeout(int timeout) { timeout_ = timeout; }
// Fail redirects to allow analysis of redirect urls, etc.
bool fail_redirect() const { return fail_redirect_; }
void set_fail_redirect(bool fail_redirect) { fail_redirect_ = fail_redirect; }
HttpRequestData& request() { return client_.request(); }
HttpResponseData& response() { return client_.response(); }
HttpErrorType error() { return error_; }
protected:
void set_error(HttpErrorType error) { error_ = error; }
private:
ProxyInfo proxy_;
FirewallManager * firewall_;
std::string host_;
int port_;
bool secure_;
int timeout_;
bool fail_redirect_;
HttpClient client_;
HttpErrorType error_;
std::string response_redirect_;
};
///////////////////////////////////////////////////////////////////////////////
// HttpMonitor
///////////////////////////////////////////////////////////////////////////////
class HttpMonitor : public sigslot::has_slots<> {
public:
HttpMonitor(SocketServer *ss);
void reset() {
complete_ = false;
error_ = HE_DEFAULT;
}
bool done() const { return complete_; }
HttpErrorType error() const { return error_; }
void Connect(HttpClient* http);
void OnHttpClientComplete(HttpClient * http, HttpErrorType error);
private:
bool complete_;
HttpErrorType error_;
SocketServer *ss_;
};
///////////////////////////////////////////////////////////////////////////////
} // namespace rtc_
#endif // _HTTPREQUEST_H_