Confirming that port is being reported properly in the test, cleaning up remaining debugging remnants.

deanberris · deanberris · commit 9e4899e8a293 · 2010-09-29T19:31:53.000+08:00
diff --git a/boost/network/protocol/http/impl/http_async_connection.hpp b/boost/network/protocol/http/impl/http_async_connection.hpp
@@ -163,9 +163,7 @@ namespace boost { namespace network { namespace http { namespace impl {
                             boost::asio::placeholders::error
                             )));
             } else {
-                boost::system::system_error error(
-                        ec ? ec : boost::asio::error::host_not_found
-                        );
+                boost::system::system_error error(ec ? ec : boost::asio::error::host_not_found);
                 version_promise.set_exception(boost::copy_exception(error));
                 status_promise.set_exception(boost::copy_exception(error));
                 status_message_promise.set_exception(boost::copy_exception(error));
@@ -244,8 +242,6 @@ namespace boost { namespace network { namespace http { namespace impl {
         }
 
         void parse_version() {
-            std::cerr << '\n';
-
             logic::tribool parsed_ok;
             typename boost::iterator_range<typename buffer_type::const_iterator> result_range;
             fusion::tie(parsed_ok, result_range) = response_parser_.parse_until(
diff --git a/boost/network/protocol/http/policies/async_resolver.hpp b/boost/network/protocol/http/policies/async_resolver.hpp
@@ -79,11 +79,6 @@ namespace boost { namespace network { namespace http { namespace policies {
             resolver_iterator endpoint_iterator
             )
         {
-            if (ec) {
-                once_resolved(ec, std::make_pair(endpoint_iterator,resolver_iterator()));
-                return;
-            }
-
             typename endpoint_cache::iterator iter;
             bool inserted = false;
             if (!ec && cache_resolved_) {
diff --git a/libs/network/test/http_1_0_test.cpp b/libs/network/test/http_1_0_test.cpp
@@ -44,6 +44,8 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_timeout, T, tag_types) {
     typename client::request request("http://localhost:12121/");
     client client_;
     typename client::response response_;
+    boost::uint16_t port_ = port(request);
+    BOOST_CHECK_EQUAL ( 12121, port_ );
     BOOST_CHECK_THROW ( response_ = client_.get(request), boost::system::system_error );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -79,11 +79,6 @@ namespace boost { namespace network { namespace http { namespace policies {`
`79`	`79`	`resolver_iterator endpoint_iterator`
`80`	`80`	`)`
`81`	`81`	`{`
`82`		`- if (ec) {`
`83`		`- once_resolved(ec, std::make_pair(endpoint_iterator,resolver_iterator()));`
`84`		`- return;`
`85`		`- }`
`86`		`-`
`87`	`82`	`typename endpoint_cache::iterator iter;`
`88`	`83`	`bool inserted = false;`
`89`	`84`	`if (!ec && cache_resolved_) {`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_timeout, T, tag_types) {`
`44`	`44`	`typename client::request request("http://localhost:12121/");`
`45`	`45`	`client client_;`
`46`	`46`	`typename client::response response_;`
	`47`	`+ boost::uint16_t port_ = port(request);`
	`48`	`+ BOOST_CHECK_EQUAL ( 12121, port_ );`
`47`	`49`	`BOOST_CHECK_THROW ( response_ = client_.get(request), boost::system::system_error );`
`48`	`50`	`}`
`49`	`51`