[FOLD]

Author: vinniefalco

include/boost/http_proto/server/route_handler.hpp

@@ -56,7 +56,13 @@ struct Request : basic_request
     /** A container for storing arbitrary data associated with the request.
         This starts out empty for each new request.
     */
-    capy::datastore data;
+    capy::datastore route_data;
+
+    /** A container for storing arbitrary data associated with the session.
+
+        This starts out empty for each new session.
+    */
+    capy::datastore session_data;
 };
 
 //-----------------------------------------------
@@ -81,12 +87,6 @@ struct BOOST_SYMBOL_VISIBLE
     */
     detacher detach;
 
-    /** A container for storing arbitrary data associated with the session.
-
-        This starts out empty for each new session.
-    */
-    capy::datastore data;
-
     /** Constructor.
     */
     BOOST_HTTP_PROTO_DECL

test/unit/server/route_handler.cpp

@@ -53,37 +53,37 @@ struct route_handler_test
 
         test_router r;
         r.use(
-            [](Request&, Response& res)
+            [](Request& req, Response&)
             {
                 // create session_token
-                auto& st = res.data.try_emplace<session_token>();
+                auto& st = req.session_data.try_emplace<session_token>();
                 BOOST_TEST_EQ(st.valid, false);
                 return route::next;
             });
         r.use("/user",
-            [](Request&, Response& res)
+            [](Request& req, Response&)
             {
                 // make session token valid
-                auto* st = res.data.find<session_token>();
+                auto* st = req.session_data.find<session_token>();
                 if(BOOST_TEST_NE(st, nullptr))
                     st->valid = true;
                 return route::next;
             });
         r.route("/user/auth")
             .add(POST,
-                [](Request& req, Response& res)
+                [](Request& req, Response&)
                 {
-                    auto& st = res.data.get<session_token>();
+                    auto& st = req.session_data.get<session_token>();
                     BOOST_TEST_EQ(st.valid, true);
                     // create auth_token each time
-                    auto& at = req.data.emplace<auth_token>();
+                    auto& at = req.route_data.emplace<auth_token>();
                     at.valid = true;
                     return route::next;
                 },
-                [](Request& req, Response& res)
+                [](Request& req, Response&)
                 {
-                    auto& at = req.data.get<auth_token>();
-                    auto& st = res.data.get<session_token>();
+                    auto& at = req.route_data.get<auth_token>();
+                    auto& st = req.session_data.get<session_token>();
                     BOOST_TEST_EQ(at.valid, true);
                     BOOST_TEST_EQ(st.valid, true);
                     return route::send;