Fixed error in documentation, and updated hello_world_server example.

glynos · glynos · commit 64de3c9cbea0 · 2016-06-14T20:43:33.000+02:00
diff --git a/boost/network/protocol/http/client/connection/sync_normal.hpp b/boost/network/protocol/http/client/connection/sync_normal.hpp
@@ -77,7 +77,7 @@ struct http_sync_connection
       }
     }
     if (timeout_ > 0) {
-      timer_.expires_from_now(boost::posix_time::seconds(timeout_));
+      timer_.expires_from_now(std::chrono::seconds(timeout_));
       auto self = this->shared_from_this();
       timer_.async_wait([=] (boost::system::error_code const &ec) {
           self->handle_timeout(ec);
diff --git a/boost/network/protocol/http/client/connection/sync_ssl.hpp b/boost/network/protocol/http/client/connection/sync_ssl.hpp
@@ -119,7 +119,7 @@ struct https_sync_connection
       }
     }
     if (timeout_ > 0) {
-      timer_.expires_from_now(boost::posix_time::seconds(timeout_));
+      timer_.expires_from_now(std::chrono::seconds(timeout_));
       auto self = this->shared_from_this();
       timer_.async_wait(
           [=](boost::system::error_code const& ec) { self->handle_timeout(ec); });
diff --git a/libs/network/doc/examples/http/hello_world_server.rst b/libs/network/doc/examples/http/hello_world_server.rst
@@ -32,6 +32,7 @@ simple response to any HTTP request.
             unsigned int port = request.source_port;
             std::ostringstream data;
             data << "Hello, " << ip << ':' << port << '!';
+            connection->set_status(server::connection::ok);
             connection->write(data.str());
         }
     };
@@ -140,4 +141,3 @@ The ``options`` constructor's single argument is the handler object defined prev
    resources across threads. The handler is passed by reference to the server
    constructor and you should ensure that any calls to the ``operator()`` overload
    are thread-safe.
-
diff --git a/libs/network/example/http/hello_world_server.cpp b/libs/network/example/http/hello_world_server.cpp
@@ -29,6 +29,13 @@ struct hello_world {
     unsigned int port = request.source_port;
     std::ostringstream data;
     data << "Hello, " << ip << ':' << port << '!';
+
+    std::map<std::string, std::string> headers = {
+      {"Content-Type", "text/plain"},
+    };
+
+    connection->set_status(server::connection::ok);
+    connection->set_headers(headers);
     connection->write(data.str());
   }
 };

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ struct http_sync_connection`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`if (timeout_ > 0) {`
`80`		`- timer_.expires_from_now(boost::posix_time::seconds(timeout_));`
	`80`	`+ timer_.expires_from_now(std::chrono::seconds(timeout_));`
`81`	`81`	`auto self = this->shared_from_this();`
`82`	`82`	`timer_.async_wait([=] (boost::system::error_code const &ec) {`
`83`	`83`	`self->handle_timeout(ec);`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ struct https_sync_connection`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`	`if (timeout_ > 0) {`
`122`		`- timer_.expires_from_now(boost::posix_time::seconds(timeout_));`
	`122`	`+ timer_.expires_from_now(std::chrono::seconds(timeout_));`
`123`	`123`	`auto self = this->shared_from_this();`
`124`	`124`	`timer_.async_wait(`
`125`	`125`	`[=](boost::system::error_code const& ec) { self->handle_timeout(ec); });`