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

glynos · glynos · commit b91743c96bf3 · 2010-01-23T14:23:47.000+01:00
diff --git a/boost/network/protocol/http/connection.hpp b/boost/network/protocol/http/connection.hpp
@@ -45,11 +45,6 @@ namespace boost { namespace network { namespace http {
         , socket_(service_)
         , wrapper_(service_)
         {
-            try {
-                socket_.set_option(tcp::no_delay(true)); // Don't delay writing
-            } catch (system::system_error & e) {
-                handler_.log(e.what());
-            }
         }
 
         tcp::socket & socket() {
@@ -62,6 +57,9 @@ namespace boost { namespace network { namespace http {
             // and then pass that request object to the
             // handler_ instance.
             //
+            boost::system::error_code option_error;
+            socket_.set_option(tcp::no_delay(true), option_error);
+            if (option_error) handler_.log(system::system_error(option_error).what());
             socket_.async_read_some(
                 boost::asio::buffer(buffer_),
                 wrapper_.wrap(
diff --git a/libs/network/test/hello_world.cpp b/libs/network/test/hello_world.cpp
@@ -16,20 +16,26 @@ namespace http = boost::network::http;
 using boost::assign::list_of;
 using boost::lexical_cast;
 using std::string;
+using std::cerr;
+using std::endl;
 
 struct hello_world;
 typedef http::server<hello_world> server;
 
 struct hello_world {
+
     void operator()(server::request const & request, server::response & response) {
         response = server::response::stock_reply(server::response::ok, "Hello, World!");
         assert(response.status == server::response::ok);
         assert(response.headers.size() == 2);
         assert(response.content == "Hello, World!");
     }
-    void log(...) {
-        // do nothing
+
+    void log(string const & data) {
+        cerr << data << endl;
+        abort();
     }
+
 };
 
 int main(int argc, char * argv[]) {
@@ -38,3 +44,4 @@ int main(int argc, char * argv[]) {
     server_.run();
     return EXIT_SUCCESS;
 }
+
