Merge branch '0.9-devel' of github.com:mikhailberis/cpp-netlib into 0.9-devel

deanberris · deanberris · commit 2047a63eb1e1 · 2011-06-17T01:52:03.000+10:00
diff --git a/boost/network/protocol/http/server/async_server.hpp b/boost/network/protocol/http/server/async_server.hpp
@@ -141,12 +141,12 @@ namespace boost { namespace network { namespace http {
                 BOOST_NETWORK_MESSAGE("Error opening socket: " << address_ << ":" << port_);
                 return;
             }
+            socket_options_base::acceptor_options(acceptor);
             acceptor.bind(endpoint, error);
             if (error) {
                 BOOST_NETWORK_MESSAGE("Error binding socket: " << address_ << ":" << port_);
                 return;
             }
-            socket_options_base::acceptor_options(acceptor);
             acceptor.listen(asio::socket_base::max_connections, error);
             if (error) {
                 BOOST_NETWORK_MESSAGE("Error listening on socket: '" << error << "' on " << address_ << ":" << port_);

Original file line number	Diff line number	Diff line change
`@@ -141,12 +141,12 @@ namespace boost { namespace network { namespace http {`
`141`	`141`	`BOOST_NETWORK_MESSAGE("Error opening socket: " << address_ << ":" << port_);`
`142`	`142`	`return;`
`143`	`143`	`}`
	`144`	`+ socket_options_base::acceptor_options(acceptor);`
`144`	`145`	`acceptor.bind(endpoint, error);`
`145`	`146`	`if (error) {`
`146`	`147`	`BOOST_NETWORK_MESSAGE("Error binding socket: " << address_ << ":" << port_);`
`147`	`148`	`return;`
`148`	`149`	`}`
`149`		`- socket_options_base::acceptor_options(acceptor);`
`150`	`150`	`acceptor.listen(asio::socket_base::max_connections, error);`
`151`	`151`	`if (error) {`
`152`	`152`	`BOOST_NETWORK_MESSAGE("Error listening on socket: '" << error << "' on " << address_ << ":" << port_);`