diff --git a/master/reference/classcrow_1_1_router-members.html b/master/reference/classcrow_1_1_router-members.html index db06692a8..c45e04ea9 100644 --- a/master/reference/classcrow_1_1_router-members.html +++ b/master/reference/classcrow_1_1_router-members.html @@ -112,8 +112,8 @@ get_recursive_child_methods(Blueprint *blueprint, std::vector< HTTPMethod > &methods) (defined in crow::Router)crow::Routerinline handle(request &req, response &res, routing_handle_result found) (defined in crow::Router)crow::Routerinline handle_initial(request &req, response &res) (defined in crow::Router)crow::Routerinline - handle_rule(BaseRule *rule, crow::request &req, crow::response &res, const crow::routing_params &rp) (defined in crow::Router)crow::Routerinline - handle_rule(BaseRule *rule, crow::request &req, crow::response &res, const crow::routing_params &rp) (defined in crow::Router)crow::Routerinline + handle_rule(BaseRule &rule, crow::request &req, crow::response &res, const crow::routing_params &rp) (defined in crow::Router)crow::Routerinline + handle_rule(BaseRule &rule, crow::request &req, crow::response &res, const crow::routing_params &rp) (defined in crow::Router)crow::Routerinline handle_upgrade(const request &req, response &res, Adaptor &&adaptor) (defined in crow::Router)crow::Routerinline internal_add_rule_object(const std::string &rule, BaseRule *ruleObject) (defined in crow::Router)crow::Routerinline internal_add_rule_object(const std::string &rule, BaseRule *ruleObject, const uint16_t &BP_index, std::vector< Blueprint * > &blueprints) (defined in crow::Router)crow::Routerinline diff --git a/master/reference/classcrow_1_1_router.html b/master/reference/classcrow_1_1_router.html index 948257610..466e20793 100644 --- a/master/reference/classcrow_1_1_router.html +++ b/master/reference/classcrow_1_1_router.html @@ -162,14 +162,14 @@ template<typename App > void handle (request &req, response &res, routing_handle_result found)   - + template<typename App > -std::enable_if< std::tuple_size< typename App::mw_container_t >::value !=0, void >::type handle_rule (BaseRule *rule, crow::request &req, crow::response &res, const crow::routing_params &rp) -  - +std::enable_if< std::tuple_size< typename App::mw_container_t >::value !=0, void >::type handle_rule (BaseRule &rule, crow::request &req, crow::response &res, const crow::routing_params &rp) +  + template<typename App > -std::enable_if< std::tuple_size< typename App::mw_container_t >::value==0, void >::type handle_rule (BaseRule *rule, crow::request &req, crow::response &res, const crow::routing_params &rp) -  +std::enable_if< std::tuple_size< typename App::mw_container_t >::value==0, void >::type handle_rule (BaseRule &rule, crow::request &req, crow::response &res, const crow::routing_params &rp) +  void debug_print ()   diff --git a/master/reference/classcrow_1_1_router.js b/master/reference/classcrow_1_1_router.js index 41c900407..4d868ceeb 100644 --- a/master/reference/classcrow_1_1_router.js +++ b/master/reference/classcrow_1_1_router.js @@ -10,8 +10,8 @@ var classcrow_1_1_router = [ "get_recursive_child_methods", "classcrow_1_1_router.html#a6438f06d942775e79cc4c12cb954b658", null ], [ "handle", "classcrow_1_1_router.html#a20232543268cd08d681a29d6c740fc4f", null ], [ "handle_initial", "classcrow_1_1_router.html#a45e8c0f1910b045f3c97fe7718447560", null ], - [ "handle_rule", "classcrow_1_1_router.html#aafb79b1b02c1f2739a74240e89bacf92", null ], - [ "handle_rule", "classcrow_1_1_router.html#a1d965ad074d377e6fc87afdcdad20595", null ], + [ "handle_rule", "classcrow_1_1_router.html#a52fe6a199029fd15e37ef9c6c316ccc8", null ], + [ "handle_rule", "classcrow_1_1_router.html#ac3e8a9eff1a86971872b810ea41f1cb5", null ], [ "handle_upgrade", "classcrow_1_1_router.html#a2b37f05675d075c3de79f6a4de42320d", null ], [ "internal_add_rule_object", "classcrow_1_1_router.html#a67549da074b6c19280db15a25747417d", null ], [ "internal_add_rule_object", "classcrow_1_1_router.html#a20f16874473f813c92ee8b9df771a437", null ], diff --git a/master/reference/navtreeindex0.js b/master/reference/navtreeindex0.js index a35c7bee6..0e356e48e 100644 --- a/master/reference/navtreeindex0.js +++ b/master/reference/navtreeindex0.js @@ -139,7 +139,6 @@ var NAVTREEINDEX0 = "classcrow_1_1_i_log_handler.html#a86f05e42d2495f90ed63cc8482064c7e":[1,0,0,17,0], "classcrow_1_1_i_log_handler.html#ae17f05549983c9d7d6aea77cda589f60":[1,0,0,17,1], "classcrow_1_1_router.html":[1,0,0,39], -"classcrow_1_1_router.html#a1d965ad074d377e6fc87afdcdad20595":[1,0,0,39,11], "classcrow_1_1_router.html#a20232543268cd08d681a29d6c740fc4f":[1,0,0,39,8], "classcrow_1_1_router.html#a20f16874473f813c92ee8b9df771a437":[1,0,0,39,14], "classcrow_1_1_router.html#a2b37f05675d075c3de79f6a4de42320d":[1,0,0,39,12], @@ -149,6 +148,7 @@ var NAVTREEINDEX0 = "classcrow_1_1_router.html#a446ae6a77f1a425a724489d9812aa0f7":[1,0,0,39,21], "classcrow_1_1_router.html#a45e8c0f1910b045f3c97fe7718447560":[1,0,0,39,9], "classcrow_1_1_router.html#a4d65ef343dc5bfbc6c80cb0987a19151":[1,0,0,39,6], +"classcrow_1_1_router.html#a52fe6a199029fd15e37ef9c6c316ccc8":[1,0,0,39,10], "classcrow_1_1_router.html#a61157adad80f901413a4023d8fb0fd9d":[1,0,0,39,3], "classcrow_1_1_router.html#a6438f06d942775e79cc4c12cb954b658":[1,0,0,39,7], "classcrow_1_1_router.html#a67549da074b6c19280db15a25747417d":[1,0,0,39,13], @@ -156,8 +156,8 @@ var NAVTREEINDEX0 = "classcrow_1_1_router.html#a7e20f1e99321ad71db0eb936d2fb267e":[1,0,0,39,16], "classcrow_1_1_router.html#a8e286f22cb96519b15b962470387e724":[1,0,0,39,19], "classcrow_1_1_router.html#aac8617b861a3f936334a1d502425e759":[1,0,0,39,20], -"classcrow_1_1_router.html#aafb79b1b02c1f2739a74240e89bacf92":[1,0,0,39,10], "classcrow_1_1_router.html#ac3ccb4f72fa43650356b485d744c49cb":[1,0,0,39,15], +"classcrow_1_1_router.html#ac3e8a9eff1a86971872b810ea41f1cb5":[1,0,0,39,11], "classcrow_1_1_router.html#ad757b52858f405c09e7757e1e1b1acb6":[1,0,0,39,2], "classcrow_1_1_router.html#ae5c4c84e7b66b23c20a893bf320137de":[1,0,0,39,0], "classcrow_1_1_router.html#afe22b2cfd1ada8c06d9e181d155cda61":[1,0,0,39,1], diff --git a/master/reference/navtreeindex5.js b/master/reference/navtreeindex5.js index b8cd8ef79..8cdb39984 100644 --- a/master/reference/navtreeindex5.js +++ b/master/reference/navtreeindex5.js @@ -54,9 +54,9 @@ var NAVTREEINDEX5 = "websocket_8h_source.html":[2,0,0,0,29], "":[0,0,0,5], "":[0,0,0,2], -"":[0,0,0,0], +"":[0,0,0,1,0], +"":[0,0,0,1], "":[0,0,0,2,0], "":[0,0,0,4,0], -"":[0,0,0,1,0], -"":[0,0,0,1] +"":[0,0,0,0] }; diff --git a/master/reference/routing_8h_source.html b/master/reference/routing_8h_source.html index 7df684ea4..0a95b59ff 100644 --- a/master/reference/routing_8h_source.html +++ b/master/reference/routing_8h_source.html @@ -1811,7 +1811,7 @@
1710 
1711  try
1712  {
-
1713  auto& rule = rules[rule_index];
+
1713  BaseRule& rule = *rules[rule_index];
1714  handle_rule<App>(rule, req, res, found.r_params);
1715  }
1716  catch (...)
@@ -1824,13 +1824,13 @@
1723 
1724  template<typename App>
1725  typename std::enable_if<std::tuple_size<typename App::mw_container_t>::value != 0, void>::type
-
1726  handle_rule(BaseRule* rule, crow::request& req, crow::response& res, const crow::routing_params& rp)
+
1726  handle_rule(BaseRule& rule, crow::request& req, crow::response& res, const crow::routing_params& rp)
1727  {
-
1728  if (!rule->mw_indices_.empty())
+
1728  if (!rule.mw_indices_.empty())
1729  {
1730  auto& ctx = *reinterpret_cast<typename App::context_t*>(req.middleware_context);
1731  auto& container = *reinterpret_cast<typename App::mw_container_t*>(req.middleware_container);
-
1732  detail::middleware_call_criteria_dynamic<false> crit_fwd(rule->mw_indices_.indices());
+
1732  detail::middleware_call_criteria_dynamic<false> crit_fwd(rule.mw_indices_.indices());
1733 
1734  auto glob_completion_handler = std::move(res.complete_request_handler_);
1735  res.complete_request_handler_ = [] {};
@@ -1845,7 +1845,7 @@
1744  }
1745 
1746  res.complete_request_handler_ = [&rule, &ctx, &container, &req, &res, glob_completion_handler] {
-
1747  detail::middleware_call_criteria_dynamic<true> crit_bwd(rule->mw_indices_.indices());
+
1747  detail::middleware_call_criteria_dynamic<true> crit_bwd(rule.mw_indices_.indices());
1748 
1749  detail::after_handlers_call_helper<
1750  decltype(crit_bwd),
@@ -1855,14 +1855,14 @@
1754  glob_completion_handler();
1755  };
1756  }
-
1757  rule->handle(req, res, rp);
+
1757  rule.handle(req, res, rp);
1758  }
1759 
1760  template<typename App>
1761  typename std::enable_if<std::tuple_size<typename App::mw_container_t>::value == 0, void>::type
-
1762  handle_rule(BaseRule* rule, crow::request& req, crow::response& res, const crow::routing_params& rp)
+
1762  handle_rule(BaseRule& rule, crow::request& req, crow::response& res, const crow::routing_params& rp)
1763  {
-
1764  rule->handle(req, res, rp);
+
1764  rule.handle(req, res, rp);
1765  }
1766 
1767  void debug_print()