Merge TASK-024: register_path / register_prefix split

etr · claude · etr · commit 744187fbe301 · 2026-05-10T16:01:12.000+02:00
Co-Authored-By: Claude Opus 4.7 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/examples/allowing_disallowing_methods.cpp b/examples/allowing_disallowing_methods.cpp
@@ -35,7 +35,7 @@ int main() {
     auto hwr = std::make_shared<hello_world_resource>();
     hwr->disallow_all();
     hwr->set_allowing(httpserver::http_method::get, true);
-    ws.register_resource("/hello", hwr);
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/args_processing.cpp b/examples/args_processing.cpp
@@ -90,7 +90,7 @@ int main() {
     httpserver::webserver ws = httpserver::create_webserver(8080);
 
     auto ar = std::make_shared<args_resource>();
-    ws.register_resource("/args", ar);
+    ws.register_path("/args", ar);
 
     std::cout << "Server running on http://localhost:8080/args\n";
     std::cout << "Try: http://localhost:8080/args?name=john&age=30\n";
diff --git a/examples/basic_authentication.cpp b/examples/basic_authentication.cpp
@@ -39,7 +39,7 @@ int main() {
     httpserver::webserver ws = httpserver::create_webserver(8080);
 
     auto hwr = std::make_shared<user_pass_resource>();
-    ws.register_resource("/hello", hwr);
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/benchmark_nodelay.cpp b/examples/benchmark_nodelay.cpp
@@ -52,7 +52,7 @@ int main(int argc, char** argv) {
     hello->with_header("Server", "libhttpserver");
 
     auto hwr = std::make_shared<hello_world_resource>(hello);
-    ws.register_resource(PATH, hwr, false);
+    ws.register_path(PATH, hwr);
 
     ws.start(true);
 
diff --git a/examples/benchmark_select.cpp b/examples/benchmark_select.cpp
@@ -51,7 +51,7 @@ int main(int argc, char** argv) {
     hello->with_header("Server", "libhttpserver");
 
     auto hwr = std::make_shared<hello_world_resource>(hello);
-    ws.register_resource(PATH, hwr, false);
+    ws.register_path(PATH, hwr);
 
     ws.start(true);
 
diff --git a/examples/benchmark_threads.cpp b/examples/benchmark_threads.cpp
@@ -50,7 +50,7 @@ int main(int argc, char** argv) {
     hello->with_header("Server", "libhttpserver");
 
     auto hwr = std::make_shared<hello_world_resource>(hello);
-    ws.register_resource(PATH, hwr, false);
+    ws.register_path(PATH, hwr);
 
     ws.start(true);
 
diff --git a/examples/binary_buffer_response.cpp b/examples/binary_buffer_response.cpp
@@ -74,7 +74,7 @@ int main() {
     httpserver::webserver ws = httpserver::create_webserver(8080);
 
     auto ir = std::make_shared<image_resource>();
-    ws.register_resource("/image", ir);
+    ws.register_path("/image", ir);
     ws.start(true);
 
     return 0;
diff --git a/examples/centralized_authentication.cpp b/examples/centralized_authentication.cpp
@@ -63,8 +63,8 @@ int main() {
     auto hello = std::make_shared<hello_resource>();
     auto health = std::make_shared<health_resource>();
 
-    ws.register_resource("/api", hello);
-    ws.register_resource("/health", health);
+    ws.register_path("/api", hello);
+    ws.register_path("/health", health);
 
     ws.start(true);
 
diff --git a/examples/client_cert_auth.cpp b/examples/client_cert_auth.cpp
@@ -157,8 +157,8 @@ int main() {
     auto secure = std::make_shared<secure_resource>();
     auto info = std::make_shared<info_resource>();
 
-    ws.register_resource("/secure", secure);
-    ws.register_resource("/info", info);
+    ws.register_path("/secure", secure);
+    ws.register_path("/info", info);
 
     std::cout << "Server started. Press Ctrl+C to stop.\n\n";
     std::cout << "Test commands:\n";
diff --git a/examples/custom_access_log.cpp b/examples/custom_access_log.cpp
@@ -40,7 +40,7 @@ int main() {
         .log_access(custom_access_log);
 
     auto hwr = std::make_shared<hello_world_resource>();
-    ws.register_resource("/hello", hwr);
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/custom_error.cpp b/examples/custom_error.cpp
@@ -45,7 +45,7 @@ int main() {
     auto hwr = std::make_shared<hello_world_resource>();
     hwr->disallow_all();
     hwr->set_allowing(httpserver::http_method::get, true);
-    ws.register_resource("/hello", hwr);
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/daemon_info.cpp b/examples/daemon_info.cpp
@@ -35,7 +35,7 @@ int main() {
     httpserver::webserver ws = httpserver::create_webserver(0);
 
     auto hr = std::make_shared<hello_resource>();
-    ws.register_resource("/hello", hr);
+    ws.register_path("/hello", hr);
     ws.start(false);
 
     // Query daemon information
diff --git a/examples/deferred_with_accumulator.cpp b/examples/deferred_with_accumulator.cpp
@@ -84,7 +84,7 @@ int main() {
     httpserver::webserver ws = httpserver::create_webserver(8080);
 
     auto hwr = std::make_shared<deferred_resource>();
-    ws.register_resource("/hello", hwr);
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/digest_authentication.cpp b/examples/digest_authentication.cpp
@@ -46,7 +46,7 @@ int main() {
     httpserver::webserver ws = httpserver::create_webserver(8080);
 
     auto hwr = std::make_shared<digest_resource>();
-    ws.register_resource("/hello", hwr);
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/empty_response_example.cpp b/examples/empty_response_example.cpp
@@ -46,7 +46,7 @@ int main() {
     httpserver::webserver ws = httpserver::create_webserver(8080);
 
     auto ncr = std::make_shared<no_content_resource>();
-    ws.register_resource("/items", ncr);
+    ws.register_path("/items", ncr);
     ws.start(true);
 
     return 0;
diff --git a/examples/external_event_loop.cpp b/examples/external_event_loop.cpp
@@ -50,7 +50,7 @@ int main() {
         .start_method(httpserver::http::http_utils::EXTERNAL_SELECT);
 
     auto hr = std::make_shared<hello_resource>();
-    ws.register_resource("/hello", hr);
+    ws.register_path("/hello", hr);
     ws.start(false);
 
     std::cout << "Server running on port " << ws.get_bound_port() << std::endl;
diff --git a/examples/file_upload.cpp b/examples/file_upload.cpp
@@ -111,7 +111,7 @@ int main(int argc, char** argv) {
                               .file_upload_target(httpserver::FILE_UPLOAD_DISK_ONLY);
 
     auto fur = std::make_shared<file_upload_resource>();
-    ws.register_resource("/", fur);
+    ws.register_path("/", fur);
     ws.start(true);
 
     return 0;
diff --git a/examples/file_upload_with_callback.cpp b/examples/file_upload_with_callback.cpp
@@ -104,7 +104,7 @@ int main(int argc, char** argv) {
         });
 
     auto fur = std::make_shared<file_upload_resource>();
-    ws.register_resource("/", fur);
+    ws.register_path("/", fur);
     ws.start(true);
 
     return 0;
diff --git a/examples/handlers.cpp b/examples/handlers.cpp
@@ -37,7 +37,7 @@ int main() {
     httpserver::webserver ws = httpserver::create_webserver(8080);
 
     auto hwr = std::make_shared<hello_world_resource>();
-    ws.register_resource("/hello", hwr);
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/hello_with_get_arg.cpp b/examples/hello_with_get_arg.cpp
@@ -34,7 +34,7 @@ int main() {
     httpserver::webserver ws = httpserver::create_webserver(8080);
 
     auto hwr = std::make_shared<hello_world_resource>();
-    ws.register_resource("/hello", hwr);
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/hello_world.cpp b/examples/hello_world.cpp
@@ -52,7 +52,7 @@ int main() {
     // "/hello". The requested method is called (if the request is a GET we call the render_get
     // method. In case that the specific render method is not implemented, the generic "render"
     // method is called.
-    ws.register_resource("/hello", hwr, true);
+    ws.register_prefix("/hello", hwr);
 
     // This way we are putting the created webserver in listen. We pass true in order to have
     // a blocking call; if we want the call to be non-blocking we can just pass false to the method.
diff --git a/examples/iovec_response_example.cpp b/examples/iovec_response_example.cpp
@@ -50,7 +50,7 @@ int main() {
     httpserver::webserver ws = httpserver::create_webserver(8080);
 
     auto ir = std::make_shared<iovec_resource>();
-    ws.register_resource("/data", ir);
+    ws.register_path("/data", ir);
     ws.start(true);
 
     return 0;
diff --git a/examples/minimal_deferred.cpp b/examples/minimal_deferred.cpp
@@ -66,7 +66,7 @@ int main() {
     httpserver::webserver ws = httpserver::create_webserver(8080);
 
     auto hwr = std::make_shared<deferred_resource>();
-    ws.register_resource("/hello", hwr);
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/minimal_file_response.cpp b/examples/minimal_file_response.cpp
@@ -35,7 +35,7 @@ int main() {
     httpserver::webserver ws = httpserver::create_webserver(8080);
 
     auto hwr = std::make_shared<file_response_resource>();
-    ws.register_resource("/hello", hwr);
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/minimal_hello_world.cpp b/examples/minimal_hello_world.cpp
@@ -33,7 +33,7 @@ int main() {
     httpserver::webserver ws = httpserver::create_webserver(8080);
 
     auto hwr = std::make_shared<hello_world_resource>();
-    ws.register_resource("/hello", hwr);
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/minimal_https.cpp b/examples/minimal_https.cpp
@@ -36,7 +36,7 @@ int main() {
         .https_mem_cert("cert.pem");
 
     auto hwr = std::make_shared<hello_world_resource>();
-    ws.register_resource("/hello", hwr);
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/minimal_https_psk.cpp b/examples/minimal_https_psk.cpp
@@ -56,7 +56,7 @@ int main() {
         .https_priorities("NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+PSK:+DHE-PSK");
 
     auto hwr = std::make_shared<hello_world_resource>();
-    ws.register_resource("/hello", hwr);
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/minimal_ip_ban.cpp b/examples/minimal_ip_ban.cpp
@@ -35,7 +35,7 @@ int main() {
     ws.allow_ip("127.0.0.1");
 
     auto hwr = std::make_shared<hello_world_resource>();
-    ws.register_resource("/hello", hwr);
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/pipe_response_example.cpp b/examples/pipe_response_example.cpp
@@ -65,7 +65,7 @@ int main() {
     httpserver::webserver ws = httpserver::create_webserver(8080);
 
     auto pr = std::make_shared<pipe_resource>();
-    ws.register_resource("/stream", pr);
+    ws.register_path("/stream", pr);
     ws.start(true);
 
     return 0;
diff --git a/examples/service.cpp b/examples/service.cpp
@@ -204,7 +204,7 @@ int main(int argc, char **argv) {
     // Create and register service resource available at /service
     //
     auto res = std::make_shared<service_resource>();
-    ws.register_resource("/service", res, true);
+    ws.register_prefix("/service", res);
 
     //
     // Start and block the webserver
diff --git a/examples/setting_headers.cpp b/examples/setting_headers.cpp
@@ -35,7 +35,7 @@ int main() {
     httpserver::webserver ws = httpserver::create_webserver(8080);
 
     auto hwr = std::make_shared<hello_world_resource>();
-    ws.register_resource("/hello", hwr);
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/turbo_mode.cpp b/examples/turbo_mode.cpp
@@ -41,7 +41,7 @@ int main() {
         .listen_backlog(128);
 
     auto hr = std::make_shared<hello_resource>();
-    ws.register_resource("/hello", hr);
+    ws.register_path("/hello", hr);
     ws.start(true);
 
     return 0;
diff --git a/examples/url_registration.cpp b/examples/url_registration.cpp
@@ -51,15 +51,16 @@ int main() {
     httpserver::webserver ws = httpserver::create_webserver(8080);
 
     auto hwr = std::make_shared<hello_world_resource>();
-    ws.register_resource("/hello", hwr);
+    ws.register_path("/hello", hwr);
 
     auto hmr = std::make_shared<handling_multiple_resource>();
-    ws.register_resource("/family", hmr, true);
-    ws.register_resource("/with_regex_[0-9]+", hmr);
+    // Prefix-match: serves "/family" and any "/family/..." child URL.
+    ws.register_prefix("/family", hmr);
+    ws.register_path("/with_regex_[0-9]+", hmr);
 
     auto uar = std::make_shared<url_args_resource>();
-    ws.register_resource("/url/with/{arg1}/and/{arg2}", uar);
-    ws.register_resource("/url/with/parametric/args/{arg1|[0-9]+}/and/{arg2|[A-Z]+}", uar);
+    ws.register_path("/url/with/{arg1}/and/{arg2}", uar);
+    ws.register_path("/url/with/parametric/args/{arg1|[0-9]+}/and/{arg2|[A-Z]+}", uar);
 
     ws.start(true);
 
diff --git a/specs/tasks/M4-handlers/TASK-024.md b/specs/tasks/M4-handlers/TASK-024.md
@@ -8,12 +8,12 @@
 Make prefix-vs-exact matching a named API choice rather than a positional `bool` flag.
 
 **Action Items:**
-- [ ] Add `register_path(const std::string& path, std::unique_ptr<http_resource>);` and `(..., std::shared_ptr<http_resource>);` — exact-match registration.
-- [ ] Add `register_prefix(const std::string& path, std::unique_ptr<http_resource>);` and `(..., std::shared_ptr<http_resource>);` — prefix-match registration.
-- [ ] Document the distinction: `register_path("/users/{id}")` matches only the parameterized exact form; `register_prefix("/static/")` matches `/static/anything/here`.
-- [ ] `register_resource` (TASK-023) becomes either an alias for `register_path` or is kept as the umbrella entry point that internally calls one of the two — pick one and document.
-- [ ] Remove the `bool family` parameter from any surviving overload.
-- [ ] Update `unregister_resource(path)` to handle both registration kinds (or split into `unregister_path`/`unregister_prefix`).
+- [x] Add `register_path(const std::string& path, std::unique_ptr<http_resource>);` and `(..., std::shared_ptr<http_resource>);` — exact-match registration.
+- [x] Add `register_prefix(const std::string& path, std::unique_ptr<http_resource>);` and `(..., std::shared_ptr<http_resource>);` — prefix-match registration.
+- [x] Document the distinction: `register_path("/users/{id}")` matches only the parameterized exact form; `register_prefix("/static/")` matches `/static/anything/here`.
+- [x] `register_resource` (TASK-023) becomes either an alias for `register_path` or is kept as the umbrella entry point that internally calls one of the two — pick one and document. *(Decision: kept as a `[[deprecated]]` alias for `register_path`, documented in webserver.hpp; the 3-arg `bool family` overload is removed.)*
+- [x] Remove the `bool family` parameter from any surviving overload.
+- [x] Update `unregister_resource(path)` to handle both registration kinds (or split into `unregister_path`/`unregister_prefix`). *(Did both: split into `unregister_path` / `unregister_prefix`, kept `unregister_resource` as the kind-agnostic convenience.)*
 
 **Dependencies:**
 - Blocked by: TASK-023
@@ -28,4 +28,4 @@ Make prefix-vs-exact matching a named API choice rather than a positional `bool`
 **Related Requirements:** PRD-HDL-REQ-004
 **Related Decisions:** §4.7
 
-**Status:** Not Started
+**Status:** Done
diff --git a/specs/tasks/_index.md b/specs/tasks/_index.md
@@ -106,7 +106,7 @@ Nominally: **13 sequential tasks**, each S–XL. Most other tasks parallelize of
 | TASK-021 | `http_resource` allow-mask via `method_set` | M4 | Done | TASK-005 |
 | TASK-022 | Snake_case `render_*` overrides on `http_resource` | M4 | Done | TASK-021 |
 | TASK-023 | Smart-pointer `register_resource` overloads | M4 | Done | TASK-014 |
-| TASK-024 | `register_path` and `register_prefix` (replace `bool family`) | M4 | Not Started | TASK-023 |
+| TASK-024 | `register_path` and `register_prefix` (replace `bool family`) | M4 | Done | TASK-023 |
 | TASK-025 | Lambda handler entry points `on_*` | M4 | Not Started | TASK-005, TASK-009, TASK-014 |
 | TASK-026 | Generic `webserver::route(method, path, handler)` | M4 | Not Started | TASK-005, TASK-025 |
 | TASK-027 | 3-tier route table with LRU cache | M5 | Not Started | TASK-005, TASK-014, TASK-021, TASK-024, TASK-025, TASK-026 |
diff --git a/specs/unworked_review_issues/2026-05-10_155313_task-024.md b/specs/unworked_review_issues/2026-05-10_155313_task-024.md
diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp
diff --git a/src/webserver.cpp b/src/webserver.cpp
diff --git a/test/Makefile.am b/test/Makefile.am
diff --git a/test/integ/authentication.cpp b/test/integ/authentication.cpp
diff --git a/test/integ/ban_system.cpp b/test/integ/ban_system.cpp
diff --git a/test/integ/basic.cpp b/test/integ/basic.cpp
diff --git a/test/integ/daemon_info.cpp b/test/integ/daemon_info.cpp
diff --git a/test/integ/deferred.cpp b/test/integ/deferred.cpp
diff --git a/test/integ/file_upload.cpp b/test/integ/file_upload.cpp
diff --git a/test/integ/new_response_types.cpp b/test/integ/new_response_types.cpp
diff --git a/test/integ/nodelay.cpp b/test/integ/nodelay.cpp
diff --git a/test/integ/threaded.cpp b/test/integ/threaded.cpp
diff --git a/test/integ/ws_start_stop.cpp b/test/integ/ws_start_stop.cpp
diff --git a/test/unit/webserver_register_path_prefix_test.cpp b/test/unit/webserver_register_path_prefix_test.cpp
diff --git a/test/unit/webserver_register_smartptr_test.cpp b/test/unit/webserver_register_smartptr_test.cpp
