Fixed Double host entry & websocket initiator requests

Author: TwentyPast4

websocketpp/http/impl/parser.hpp

@@ -141,6 +141,8 @@ inline bool parser::parse_parameter_list(std::string const & in,
 }
 
 inline bool parser::prepare_body(lib::error_code & ec) {
+	ec.clear();
+
     if (!get_header("Content-Length").empty()) {
         std::string const & cl_header = get_header("Content-Length");
         char * end;
@@ -160,14 +162,12 @@ inline bool parser::prepare_body(lib::error_code & ec) {
         }
 
         m_body_encoding = body_encoding::plain;
-        ec = lib::error_code();
-        return true;
+        return m_body_bytes_needed;
     } else if (get_header("Transfer-Encoding") == "chunked") {
         m_body_encoding = body_encoding::chunked;
         return true;
     } else {
-        ec = lib::error_code();
-        return true; // valid! means there is no body to read
+        return false;
     }
 }
 
@@ -218,8 +218,6 @@ inline size_t parser::process_body(char const * buf, size_t len,
 				return processed + process_body(buf + processed, len - processed, ec);
 			}
 		}
-        return 0;
-        // TODO: support for chunked transfers?
     } else {
         ec = error::make_error_code(error::unknown_transfer_encoding);
         return 0;

websocketpp/http/impl/response.hpp

@@ -122,10 +122,12 @@ inline size_t response::consume(char const * buf, size_t len, lib::error_code &
                 return 0;
             }
 
-			if (!prepare_body(ec))
+			const bool need_more = prepare_body(ec);
+			if (ec) {
 				return 0;
+			}
 
-			if (m_body_encoding == body_encoding::unknown) {
+			if (m_body_encoding == body_encoding::unknown || !need_more) {
 				m_state = state::DONE;
 				m_buf.reset();
             	ec.clear();

websocketpp/impl/connection_impl.hpp

@@ -904,7 +904,7 @@ void connection<config>::handle_transport_init(lib::error_code const & ec) {
 		} else {
 			if (m_request.get_version().empty())
 				m_request.set_version("HTTP/1.1");
-			m_request.append_header("Host", m_uri->get_host_port());
+			m_request.replace_header("Host", m_uri->get_host_port());
 			if (m_request.get_uri().empty())
 				m_request.set_uri(get_uri()->get_resource());
 		}