Fixing issue with stoppage and cancellation when the server starts listening.

deanberris · deanberris · commit 1f21307e2fe1 · 2011-04-04T14:32:46.000+08:00
diff --git a/boost/network/protocol/http/server/async_server.hpp b/boost/network/protocol/http/server/async_server.hpp
@@ -55,7 +55,8 @@ namespace boost { namespace network { namespace http {
             // stop accepting new requests and let all the existing
             // handlers finish.
             stopping = true;
-            acceptor.cancel();
+            system::error_code ignored;
+            acceptor.cancel(ignored);
         }
 
         void listen() {
@@ -101,10 +102,15 @@ namespace boost { namespace network { namespace http {
             tcp::resolver resolver(service_);
             tcp::resolver::query query(address_, port_);
             tcp::endpoint endpoint = *resolver.resolve(query);
-            acceptor.open(endpoint.protocol());
-            acceptor.bind(endpoint);
+            
+            system::error_code error;
+            acceptor.open(endpoint.protocol(), error);
+            if (error) return;
+            acceptor.bind(endpoint, error);
+            if (error) return;
             socket_options_base::acceptor_options(acceptor);
-            acceptor.listen();
+            acceptor.listen(asio::socket_base::max_connections, error);
+            if (error) return;
             new_connection.reset(new connection(service_, handler, thread_pool));
             acceptor.async_accept(new_connection->socket(),
                 boost::bind(
diff --git a/boost/network/protocol/http/server/sync_server.hpp b/boost/network/protocol/http/server/sync_server.hpp
@@ -57,7 +57,9 @@ namespace boost { namespace network { namespace http {
 
         void stop() {
             // stop accepting new connections and let all the existing handlers finish.
-            acceptor_.cancel();
+            system::error_code ignored;
+            acceptor_.cancel(ignored);
+            service_.stop();
         }
 
         void listen() {

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,9 @@ namespace boost { namespace network { namespace http {`
`57`	`57`
`58`	`58`	`void stop() {`
`59`	`59`	`// stop accepting new connections and let all the existing handlers finish.`
`60`		`- acceptor_.cancel();`
	`60`	`+ system::error_code ignored;`
	`61`	`+ acceptor_.cancel(ignored);`
	`62`	`+ service_.stop();`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`void listen() {`