jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made protocol() const, added default proxy ports, and added handshake on https proxy (based on #83)

Browse source
This commit is contained in:
eidheim 2016-11-25 12:36:49 +01:00
commit 599775c83f
3 changed files with 47 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client_http.hpp
View file

@ -199,7 +199,7 @@ namespace SimpleWeb {
return parsed_host_port;
}
virtual std::string protocol()=0;
virtual std::string protocol() const =0;
virtual void connect()=0;
std::shared_ptr<boost::asio::deadline_timer> get_timeout_timer() {
@ -366,7 +366,7 @@ namespace SimpleWeb {
Client(const std::string& server_port_path) : ClientBase<HTTP>::ClientBase(server_port_path, 80) {}
protected:
std::string protocol() {
std::string protocol() const {
return "http";
}
@ -376,7 +376,7 @@ namespace SimpleWeb {
if(config.proxy_server.empty())
query=std::unique_ptr<boost::asio::ip::tcp::resolver::query>(new boost::asio::ip::tcp::resolver::query(host, std::to_string(port)));
else {
auto proxy_host_port=parse_host_port(config.proxy_server, 0);
auto proxy_host_port=parse_host_port(config.proxy_server, 8080);
query=std::unique_ptr<boost::asio::ip::tcp::resolver::query>(new boost::asio::ip::tcp::resolver::query(proxy_host_port.first, std::to_string(proxy_host_port.second)));
}
resolver.async_resolve(*query, [this](const boost::system::error_code &ec,