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

Now adds port to host request header field value only if the port is non-default

Browse source
This commit is contained in:
eidheim 2018-02-14 12:47:58 +01:00
commit 1056bd2e70
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client_http.hpp
View file

@ -361,6 +361,7 @@ namespace SimpleWeb {
std::string host; std::string host;
unsigned short port; unsigned short port;
unsigned short default_port;
std::unique_ptr<asio::ip::tcp::resolver::query> query; std::unique_ptr<asio::ip::tcp::resolver::query> query;
@ -372,7 +373,7 @@ namespace SimpleWeb {
std::size_t concurrent_synchronous_requests = 0; std::size_t concurrent_synchronous_requests = 0;
std::mutex concurrent_synchronous_requests_mutex; std::mutex concurrent_synchronous_requests_mutex;
ClientBase(const std::string &host_port, unsigned short default_port) noexcept : handler_runner(new ScopeRunner()) { ClientBase(const std::string &host_port, unsigned short default_port) noexcept : default_port(default_port), handler_runner(new ScopeRunner()) {
auto parsed_host_port = parse_host_port(host_port, default_port); auto parsed_host_port = parse_host_port(host_port, default_port);
host = parsed_host_port.first; host = parsed_host_port.first;
port = parsed_host_port.second; port = parsed_host_port.second;
@ -425,7 +426,10 @@ namespace SimpleWeb {
std::unique_ptr<asio::streambuf> streambuf(new asio::streambuf()); std::unique_ptr<asio::streambuf> streambuf(new asio::streambuf());
std::ostream write_stream(streambuf.get()); std::ostream write_stream(streambuf.get());
write_stream << method << " " << corrected_path << " HTTP/1.1\r\n"; write_stream << method << " " << corrected_path << " HTTP/1.1\r\n";
write_stream << "Host: " << host << ":" << std::to_string(port) << "\r\n"; write_stream << "Host: " << host;
if(port != default_port)
write_stream << ':' << std::to_string(port);
write_stream << "\r\n";
for(auto &h : header) for(auto &h : header)
write_stream << h.first << ": " << h.second << "\r\n"; write_stream << h.first << ": " << h.second << "\r\n";
return streambuf; return streambuf;