Test fails with an exception instead of a crash - progress of a kind...

glynos · glynos · commit 44b9185eac89 · 2013-12-07T19:04:57.000+01:00
diff --git a/http/src/http/v2/client/client.cpp b/http/src/http/v2/client/client.cpp
@@ -19,31 +19,6 @@ namespace network {
     namespace v2 {
       using boost::asio::ip::tcp;
 
-      //struct request_helper {
-      //
-      //  request_helper() {
-      //
-      //  }
-      //
-      //  void connect(client::string_type host,
-      //               const boost::system::error_code &ec,
-      //               tcp::resolver::iterator endpoint_iterator);
-      //
-      //  void write_request(const boost::system::error_code &ec);
-      //
-      //  void read_response_status(const boost::system::error_code &ec,
-      //                            std::size_t bytes_written);
-      //
-      //  void read_response_headers(const boost::system::error_code &ec,
-      //                             std::size_t bytes_read);
-      //
-      //  client::string_type host_;
-      //  boost::asio::streambuf request_;
-      //  std::promise<response> response_promise_;
-      //  boost::asio::streambuf response_;
-      //
-      //};
-
       struct client::impl {
 
 	explicit impl(client_options options);
@@ -105,7 +80,6 @@ namespace network {
         //                            //response_promise_.set_value(v2::response());
         //                            //write_request(ec);
         //                          });
-        response_promise_.set_value(response());
       }
 
       void client::impl::write_request(const boost::system::error_code &ec) {
@@ -167,49 +141,51 @@ namespace network {
           // set error
         }
 
-        response_promise_.set_value(response());
-
+        // HTTP 1.1
+        auto it = std::find_if(std::begin(req.headers()), std::end(req.headers()),
+                               [] (const std::pair<uri::string_type, uri::string_type> &header) {
+                                 return (boost::iequals(header.first, "host"));
+                               });
+        if (it == std::end(req.headers())) {
+          // set error
+          response_promise_.set_value(response());
+          return res;
+        }
 
-        //auto it = std::find_if(std::begin(req.headers()), std::end(req.headers()),
-        //                       [] (const std::pair<uri::string_type, uri::string_type> &header) {
-        //                         return (boost::iequals(header.first, "host"));
-        //                       });
-        //if (it == std::end(req.headers())) {
-        //  // set error
-        //  response_promise_.set_value(response());
-        //  return res;
-        //}
-        //
-        //uri_builder builder;
-        //builder
-        //  .authority(it->second)
-        //  ;
-        //
-        //auto auth = builder.uri();
-        //auto host = auth.host()?
-        //  uri::string_type(std::begin(*auth.host()), std::end(*auth.host())) : uri::string_type();
-        //auto port = auth.port<std::uint16_t>()? *auth.port<std::uint16_t>() : 80;
-        //
-	//resolver_.async_resolve(host, port,
-        //                        [=](const boost::system::error_code &ec,
-        //                            tcp::resolver::iterator endpoint_iterator) {
-        //                          if (ec) {
-        //                            if (endpoint_iterator == tcp::resolver::iterator()) {
-        //                              response_promise_.set_exception(
+        uri_builder builder;
+        builder
+          .authority(it->second)
+          ;
+
+        auto auth = builder.uri();
+        auto host = auth.host()?
+          uri::string_type(std::begin(*auth.host()), std::end(*auth.host())) : uri::string_type();
+        auto port = auth.port<std::uint16_t>()? *auth.port<std::uint16_t>() : 80;
+
+	//resolver_->async_resolve(host, port,
+        //                         [=](const boost::system::error_code &ec,
+        //                             tcp::resolver::iterator endpoint_iterator) {
+        //                           std::cout << "!!!" << std::endl;
+        //                           if (ec) {
+        //                             if (endpoint_iterator == tcp::resolver::iterator()) {
+        //                               response_promise_.set_exception(
         //                                  std::make_exception_ptr(
         //                                      connection_error(client_error::host_not_found)));
-        //                              return;
-        //                            }
+        //                               return;
+        //                             }
         //
-        //                            response_promise_.set_exception(
-        //                                std::make_exception_ptr(
-        //                                    boost::system::system_error(ec)));
-        //                            return;
-        //                          }
+        //                             std::cout << "!!!" << std::endl;
+        //                             //response_promise_.set_exception(
+        //                             //    std::make_exception_ptr(
+        //                             //        boost::system::system_error(ec)));
+        //                             return;
+        //                           }
         //
-        //                          connect(ec, endpoint_iterator);
-        //                        });
+        //                           connect(ec, endpoint_iterator);
+        //                         });
 
+        response_promise_.set_exception(std::make_exception_ptr(
+                                            connection_error(client_error::host_not_found)));
 	return res;
       }
 
