Fixed bug in parsing the HTTP headers in the HTTP client.

glynos · glynos · commit 23ef8d00d532 · 2013-12-11T20:28:34.000+01:00
diff --git a/contrib/http_examples/read_headers.cpp b/contrib/http_examples/read_headers.cpp
@@ -24,6 +24,10 @@ main(int argc, char *argv[]) {
     auto future_response = client.head(request);
     auto response = future_response.get();
 
+    std::cout << "HTTP version: " << response.version() << std::endl;
+    std::cout << "HTTP status: " << static_cast<int>(response.status()) << std::endl;
+    std::cout << "HTTP status message: " << response.status_message() << std::endl;
+    std::cout << std::endl;
     for (auto header : response.headers()) {
       std::cout << header.first << ": " << header.second << std::endl;
     }
diff --git a/http/src/http/v2/client/client.cpp b/http/src/http/v2/client/client.cpp
@@ -6,8 +6,8 @@
 #include <future>
 #include <boost/asio/strand.hpp>
 #include <boost/algorithm/string/trim.hpp>
-#include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/range/algorithm/find_first_of.hpp>
 #include <network/uri.hpp>
 #include <network/config.hpp>
 #include <network/http/v2/client/client.hpp>
@@ -179,9 +179,11 @@ namespace network {
         std::istream is(&response_);
         string_type header;
         while (std::getline(is, header) && (header != "\r")) {
-          std::vector<string_type> kvp;
-          boost::split(kvp, header, boost::is_any_of(":"));
-          res->add_header(kvp[0], boost::trim_copy(kvp[1]));
+          auto delim = boost::find_first_of(header, ":");
+          string_type key(std::begin(header), delim);
+          while (*++delim == ' ') { }
+          string_type value(delim, std::end(header));
+          res->add_header(key, value);
         }
 
         connection_->async_read(response_,
