Continued to work on the HTTP client.

glynos · glynos · commit a8bad17a778d · 2013-12-07T23:01:06.000+01:00
diff --git a/http/src/http/v2/client/client.cpp b/http/src/http/v2/client/client.cpp
@@ -30,6 +30,9 @@ namespace network {
 
         void write_request(const boost::system::error_code &ec);
 
+        void read_response(const boost::system::error_code &ec,
+                           std::size_t bytes_written);
+
         void read_response_status(const boost::system::error_code &ec,
                                   std::size_t bytes_written);
 
@@ -78,7 +81,7 @@ namespace network {
           }
 
           response_promise_.set_exception(std::make_exception_ptr(
-                                            boost::system::system_error(ec)));
+                                            std::system_error(ec.value(), std::system_category())));
           return;
         }
 
@@ -92,30 +95,48 @@ namespace network {
       void client::impl::write_request(const boost::system::error_code &ec) {
         if (ec) {
           response_promise_.set_exception(std::make_exception_ptr(
-                                              boost::system::system_error(ec)));
+                                              std::system_error(ec.value(), std::system_category())));
           return;
         }
 
         connection_->async_write(request_,
                                  [=] (const boost::system::error_code &ec,
                                       std::size_t bytes_written) {
-                                   read_response_status(ec, bytes_written);
+                                   read_response(ec, bytes_written);
                                  });
       }
 
+      void client::impl::read_response(const boost::system::error_code &ec, std::size_t) {
+        if (ec) {
+          response_promise_.set_exception(std::make_exception_ptr(
+                                            std::system_error(ec.value(), std::system_category())));
+          return;
+        }
+
+        connection_->async_read_until(response_,
+                                      "\r\n",
+                                      [=] (const boost::system::error_code &ec,
+                                           std::size_t bytes_read) {
+                                        read_response_status(ec, bytes_read);
+                                      });
+      }
+
       void client::impl::read_response_status(const boost::system::error_code &ec,
                                               std::size_t) {
         if (ec) {
           response_promise_.set_exception(std::make_exception_ptr(
-                                              boost::system::system_error(ec)));
+                                            std::system_error(ec.value(), std::system_category())));
           return;
         }
 
+        std::istream is(&response_);
+        std::string status;
+        std::getline(is, status);
+
         connection_->async_read_until(response_,
                                       "\r\n",
                                       [=] (const boost::system::error_code &ec,
                                            std::size_t bytes_read) {
-                                        // fill headers
                                         read_response_headers(ec, bytes_read);
                                       });
       }
@@ -124,10 +145,11 @@ namespace network {
                                                std::size_t) {
         if (ec) {
           response_promise_.set_exception(std::make_exception_ptr(
-                                            boost::system::system_error(ec)));
+                                            std::system_error(ec.value(), std::system_category())));
           return;
         }
 
+        // fill headers
         connection_->async_read_until(response_,
                                       "\r\n\r\n",
                                       [=] (const boost::system::error_code &ec,
diff --git a/http/src/http/v2/client/client_errors.cpp b/http/src/http/v2/client/client_errors.cpp
@@ -39,10 +39,6 @@ namespace network {
 	  return "Requires HTTP or HTTPS URL.";
 	case client_error::resolver_error:
 	  return "Unable to resolve host";
-	case client_error::connection_timeout:
-	  return "Connection timeout.";
-	case client_error::https_not_supported:
-	  return "HTTPS is not supported.";
 	default:
 	  break;
 	}
diff --git a/http/src/network/http/v2/client/client.hpp b/http/src/network/http/v2/client/client.hpp
@@ -236,7 +236,7 @@ namespace network {
        * \ingroup http_client
        * \class client network/http/v2/client/client.hpp
        * \brief A class that encapsulates the operations and methods
-       *        for communicating with an HTTP servier.
+       *        for communicating with an HTTP server.
        */
       class client {
 
diff --git a/http/src/network/http/v2/client/client_errors.hpp b/http/src/network/http/v2/client/client_errors.hpp
@@ -32,14 +32,9 @@ namespace network {
 
         // connection
         host_not_found,
-        connection_timeout,
-        https_not_supported,
 
         // response
-        invalid_version,
-        invalid_status,
-        invalid_status_message,
-        invalid_header,
+        invalid_response,
       };
 
       /**
diff --git a/http/src/network/http/v2/status.hpp b/http/src/network/http/v2/status.hpp
@@ -82,6 +82,7 @@ namespace network {
   } // namespace http
 } // namespace network
 
+#if !defined(DOXYGEN_SHOULD_SKIP_THIS)
 namespace std {
   template <>
   struct hash<network::http::v2::status::code> {
@@ -91,6 +92,7 @@ namespace std {
     }
   };
 } // namespace std
+#endif // !defined(DOXYGEN_SHOULD_SKIP_THIS)
 
 namespace network {
   namespace http {
