improved socket accept

build/Jamfile

@@ -46,6 +46,7 @@ lib boost_http_io
    : http_io_sources
    : requirements
      <library>/boost//http_proto
+     <library>/boost//url
      <include>../
      <define>BOOST_HTTP_IO_SOURCE
    : usage-requirements

example/server/asio_params.hpp

@@ -10,13 +10,13 @@
 #ifndef BOOST_HTTP_IO_EXAMPLE_SERVER_ASIO_PARAMS_HPP
 #define BOOST_HTTP_IO_EXAMPLE_SERVER_ASIO_PARAMS_HPP
 
-#include "http_params.hpp"
 #include <boost/http_io/detail/config.hpp>
+#include <boost/http_io/server/handler_params.hpp>
 
 namespace boost {
 namespace http_io {
 
-struct asio_params : http_params
+struct asio_params : handler_params
 {
 };
 

example/server/handler.cpp

@@ -301,11 +301,11 @@ service_unavailable(
 void
 file_responder::
 operator()(
-    http_params& params) const
+    handler_params& params) const
 {
     if(params.is_shutting_down)
         return service_unavailable(
-            params.res, params.sr, params.req);
+            params.res, params.serializer, params.req);
 
 #if 0
     // Returns a server error response
@@ -327,7 +327,7 @@ operator()(
         params.req.target()[0] != '/' ||
         params.req.target().find("..") != core::string_view::npos)
         return make_error_response(http_proto::status::bad_request,
-            params.req, params.res, params.sr);
+            params.req, params.res, params.serializer);
 
     // Build the path to the requested file
     std::string path; 
@@ -355,31 +355,31 @@ operator()(
         params.res.append(
             http_proto::field::content_type, mt);
 
-        params.sr.start<http_proto::file_source>(
+        params.serializer.start<http_proto::file_source>(
             params.res, std::move(f), size);
         return;
     }
 
     if(ec == system::errc::no_such_file_or_directory)
         return make_error_response(
             http_proto::status::not_found,
-                params.req, params.res, params.sr);
+                params.req, params.res, params.serializer);
 
     // ec.message()?
     return make_error_response(
         http_proto::status::internal_server_error,
-            params.req, params.res, params.sr);
+            params.req, params.res, params.serializer);
 }
 
 //------------------------------------------------
 
 void
 https_redirect_responder::
-operator()(http_params& params) const
+operator()(handler_params& params) const
 {
     if(params.is_shutting_down)
         return service_unavailable(
-            params.res, params.sr, params.req);
+            params.res, params.serializer, params.req);
 
     std::string body;
     prepare_error(params.res, body,
@@ -388,7 +388,7 @@ operator()(http_params& params) const
     u1.set_scheme_id(urls::scheme::https);
     u1.set_host_address("localhost"); // VFALCO WTF IS THIS!
     params.res.append(http_proto::field::location, u1.buffer());
-    params.sr.start(params.res,
+    params.serializer.start(params.res,
         http_proto::string_body( std::move(body)));
 }
 

example/server/handler.hpp

@@ -10,8 +10,8 @@
 #ifndef BOOST_HTTP_IO_EXAMPLE_SERVER_HANDLER_HPP
 #define BOOST_HTTP_IO_EXAMPLE_SERVER_HANDLER_HPP
 
-#include "http_params.hpp"
 #include <boost/http_io/detail/config.hpp>
+#include <boost/http_io/server/handler_params.hpp>
 #include <boost/http_io/server/router.hpp>
 #include <boost/http_proto/request_base.hpp>
 #include <boost/http_proto/response.hpp>
@@ -21,13 +21,13 @@
 namespace boost {
 namespace http_io {
 
-using router_type = router<http_params>;
+using router_type = router<handler_params>;
 
 //------------------------------------------------
 
 struct https_redirect_responder
 {
-    void operator()(http_params&) const;
+    void operator()(handler_params&) const;
 };
 
 //------------------------------------------------
@@ -40,7 +40,7 @@ struct file_responder
     {
     }
 
-    void operator()(http_params&) const;
+    void operator()(handler_params&) const;
 
 private:
     std::string doc_root_;