Skip to content

Commit 516e1ab

Browse files
etrclaude
etr
and
claude
committed
Merge TASK-036: Handler return-by-value dispatch cutover (PRD-HDL-REQ-001, PRD-RSP-REQ-007)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2 parents 973d96c + ef2623a commit 516e1ab

61 files changed

Lines changed: 1000 additions & 546 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎examples/allowing_disallowing_methods.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
class hello_world_resource : public httpserver::http_resource {
2626
public:
27-
std::shared_ptr<httpserver::http_response> render(const httpserver::http_request&) {
28-
return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string("Hello, World!")));
27+
httpserver::http_response render(const httpserver::http_request&) {
28+
return httpserver::http_response::string("Hello, World!");
2929
}
3030
};
3131

‎examples/args_processing.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
class args_resource : public httpserver::http_resource {
3737
public:
38-
std::shared_ptr<httpserver::http_response> render(const httpserver::http_request& req) {
38+
httpserver::http_response render(const httpserver::http_request& req) {
3939
std::stringstream response_body;
4040

4141
response_body << "=== Using get_args() (supports multiple values per key) ===\n\n";
@@ -82,7 +82,7 @@ class args_resource : public httpserver::http_resource {
8282
response_body << "name (via get_arg_flat): " << name_flat << "\n";
8383
}
8484

85-
return std::make_shared<httpserver::http_response>(httpserver::http_response::string(response_body.str()));
85+
return httpserver::http_response::string(response_body.str());
8686
}
8787
};
8888

‎examples/basic_authentication.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525

2626
class user_pass_resource : public httpserver::http_resource {
2727
public:
28-
std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request& req) {
28+
httpserver::http_response render_get(const httpserver::http_request& req) {
2929
if (req.get_user() != "myuser" || req.get_pass() != "mypass") {
30-
return std::make_shared<httpserver::http_response>(
31-
httpserver::http_response::unauthorized("Basic", "test@example.com", "FAIL"));
30+
return
31+
httpserver::http_response::unauthorized("Basic", "test@example.com", "FAIL");
3232
}
3333

34-
return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string(std::string(req.get_user()) + " " + std::string(req.get_pass()))));
34+
return httpserver::http_response::string(std::string(req.get_user()) + " " + std::string(req.get_pass()));
3535
}
3636
};
3737

‎examples/benchmark_nodelay.cpp‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,12 @@
2828

2929
class hello_world_resource : public httpserver::http_resource {
3030
public:
31-
explicit hello_world_resource(const std::shared_ptr<httpserver::http_response>& resp):
32-
resp(resp) {
31+
// TASK-036: http_response is a movable value type; build it
32+
// per-request rather than caching a shared instance.
33+
httpserver::http_response render(const httpserver::http_request&) override {
34+
return httpserver::http_response::string(BODY)
35+
.with_header("Server", "libhttpserver");
3336
}
34-
35-
std::shared_ptr<httpserver::http_response> render(const httpserver::http_request&) {
36-
return resp;
37-
}
38-
39-
private:
40-
std::shared_ptr<httpserver::http_response> resp;
4137
};
4238

4339
int main(int argc, char** argv) {
@@ -48,10 +44,7 @@ int main(int argc, char** argv) {
4844
.tcp_nodelay()
4945
.max_threads(atoi(argv[2]))};
5046

51-
std::shared_ptr<httpserver::http_response> hello = std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string(BODY)));
52-
hello->with_header("Server", "libhttpserver");
53-
54-
auto hwr = std::make_shared<hello_world_resource>(hello);
47+
auto hwr = std::make_shared<hello_world_resource>();
5548
ws.register_path(PATH, hwr);
5649

5750
ws.start(true);

‎examples/benchmark_select.cpp‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,12 @@
2828

2929
class hello_world_resource : public httpserver::http_resource {
3030
public:
31-
explicit hello_world_resource(const std::shared_ptr<httpserver::http_response>& resp):
32-
resp(resp) {
31+
// TASK-036: http_response is a movable value type; build it
32+
// per-request rather than caching a shared instance.
33+
httpserver::http_response render(const httpserver::http_request&) override {
34+
return httpserver::http_response::string(BODY)
35+
.with_header("Server", "libhttpserver");
3336
}
34-
35-
std::shared_ptr<httpserver::http_response> render(const httpserver::http_request&) {
36-
return resp;
37-
}
38-
39-
private:
40-
std::shared_ptr<httpserver::http_response> resp;
4137
};
4238

4339
int main(int argc, char** argv) {
@@ -47,10 +43,7 @@ int main(int argc, char** argv) {
4743
.start_method(httpserver::http::http_utils::INTERNAL_SELECT)
4844
.max_threads(atoi(argv[2]))};
4945

50-
std::shared_ptr<httpserver::http_response> hello = std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string(BODY)));
51-
hello->with_header("Server", "libhttpserver");
52-
53-
auto hwr = std::make_shared<hello_world_resource>(hello);
46+
auto hwr = std::make_shared<hello_world_resource>();
5447
ws.register_path(PATH, hwr);
5548

5649
ws.start(true);

‎examples/benchmark_threads.cpp‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,12 @@
2828

2929
class hello_world_resource : public httpserver::http_resource {
3030
public:
31-
explicit hello_world_resource(const std::shared_ptr<httpserver::http_response>& resp):
32-
resp(resp) {
31+
// TASK-036: http_response is a movable value type; build it
32+
// per-request rather than caching a shared instance.
33+
httpserver::http_response render(const httpserver::http_request&) override {
34+
return httpserver::http_response::string(BODY)
35+
.with_header("Server", "libhttpserver");
3336
}
34-
35-
std::shared_ptr<httpserver::http_response> render(const httpserver::http_request&) {
36-
return resp;
37-
}
38-
39-
private:
40-
std::shared_ptr<httpserver::http_response> resp;
4137
};
4238

4339
int main(int argc, char** argv) {
@@ -46,10 +42,7 @@ int main(int argc, char** argv) {
4642
httpserver::webserver ws{httpserver::create_webserver(atoi(argv[1]))
4743
.start_method(httpserver::http::http_utils::THREAD_PER_CONNECTION)};
4844

49-
std::shared_ptr<httpserver::http_response> hello = std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string(BODY)));
50-
hello->with_header("Server", "libhttpserver");
51-
52-
auto hwr = std::make_shared<hello_world_resource>(hello);
45+
auto hwr = std::make_shared<hello_world_resource>();
5346
ws.register_path(PATH, hwr);
5447

5548
ws.start(true);

‎examples/binary_buffer_response.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ static std::string generate_png_data() {
5858

5959
class image_resource : public httpserver::http_resource {
6060
public:
61-
std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request&) {
61+
httpserver::http_response render_get(const httpserver::http_request&) {
6262
// Build binary content as a std::string. The string can contain any
6363
// bytes — it is not limited to printable characters or null-terminated
6464
// C strings. The size is tracked internally by std::string::size().
6565
std::string image_data = generate_png_data();
6666

6767
// Use string_response with the appropriate content type. The response
6868
// will send the exact bytes contained in the string.
69-
return std::make_shared<httpserver::http_response>(httpserver::http_response::string(std::move(image_data), "image/png"));
69+
return httpserver::http_response::string(std::move(image_data), "image/png");
7070
}
7171
};
7272

‎examples/centralized_authentication.cpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,24 @@ using httpserver::create_webserver;
3131
// Simple resource that doesn't need to handle auth itself
3232
class hello_resource : public http_resource {
3333
public:
34-
std::shared_ptr<http_response> render_get(const http_request&) {
35-
return std::make_shared<http_response>(http_response::string("Hello, authenticated user!"));
34+
http_response render_get(const http_request&) {
35+
return http_response::string("Hello, authenticated user!");
3636
}
3737
};
3838

3939
class health_resource : public http_resource {
4040
public:
41-
std::shared_ptr<http_response> render_get(const http_request&) {
42-
return std::make_shared<http_response>(http_response::string("OK"));
41+
http_response render_get(const http_request&) {
42+
return http_response::string("OK");
4343
}
4444
};
4545

4646
// Centralized authentication handler
4747
// Returns nullptr to allow the request, or an http_response to reject it
4848
std::shared_ptr<http_response> auth_handler(const http_request& req) {
4949
if (req.get_user() != "admin" || req.get_pass() != "secret") {
50-
return std::make_shared<http_response>(http_response::unauthorized("Basic", "MyRealm", "Unauthorized"));
50+
return std::make_shared<http_response>(
51+
http_response::unauthorized("Basic", "MyRealm", "Unauthorized"));
5152
}
5253
return nullptr; // Allow request
5354
}

‎examples/client_cert_auth.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ std::set<std::string> allowed_fingerprints;
6767
// Resource that requires client certificate authentication
6868
class secure_resource : public httpserver::http_resource {
6969
public:
70-
std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request& req) {
70+
httpserver::http_response render_get(const httpserver::http_request& req) {
7171
// Check if client provided a certificate
7272
if (!req.has_client_certificate()) {
73-
return std::make_shared<httpserver::http_response>(httpserver::http_response::string("Client certificate required").with_status(httpserver::http::http_utils::http_unauthorized));
73+
return httpserver::http_response::string("Client certificate required").with_status(httpserver::http::http_utils::http_unauthorized);
7474
}
7575

7676
// Get certificate information. TASK-019: the four string-typed
@@ -85,13 +85,13 @@ class secure_resource : public httpserver::http_resource {
8585

8686
// Check if certificate is verified by our CA
8787
if (!verified) {
88-
return std::make_shared<httpserver::http_response>(httpserver::http_response::string("Certificate not verified by trusted CA").with_status(httpserver::http::http_utils::http_forbidden));
88+
return httpserver::http_response::string("Certificate not verified by trusted CA").with_status(httpserver::http::http_utils::http_forbidden);
8989
}
9090

9191
// Optional: Check fingerprint against allowlist
9292
if (!allowed_fingerprints.empty() &&
9393
allowed_fingerprints.find(fingerprint) == allowed_fingerprints.end()) {
94-
return std::make_shared<httpserver::http_response>(httpserver::http_response::string("Certificate not in allowlist").with_status(httpserver::http::http_utils::http_forbidden));
94+
return httpserver::http_response::string("Certificate not in allowlist").with_status(httpserver::http::http_utils::http_forbidden);
9595
}
9696

9797
// Check certificate validity times. TASK-019 narrows the
@@ -101,11 +101,11 @@ class secure_resource : public httpserver::http_resource {
101101
std::int64_t not_after = req.get_client_cert_not_after();
102102

103103
if (now < not_before) {
104-
return std::make_shared<httpserver::http_response>(httpserver::http_response::string("Certificate not yet valid").with_status(httpserver::http::http_utils::http_forbidden));
104+
return httpserver::http_response::string("Certificate not yet valid").with_status(httpserver::http::http_utils::http_forbidden);
105105
}
106106

107107
if (now > not_after) {
108-
return std::make_shared<httpserver::http_response>(httpserver::http_response::string("Certificate has expired").with_status(httpserver::http::http_utils::http_forbidden));
108+
return httpserver::http_response::string("Certificate has expired").with_status(httpserver::http::http_utils::http_forbidden);
109109
}
110110

111111
// Build response with certificate info
@@ -116,14 +116,14 @@ class secure_resource : public httpserver::http_resource {
116116
response += " Fingerprint (SHA-256): " + fingerprint + "\n";
117117
response += " Verified: " + std::string(verified ? "Yes" : "No") + "\n";
118118

119-
return std::make_shared<httpserver::http_response>(httpserver::http_response::string(response));
119+
return httpserver::http_response::string(response);
120120
}
121121
};
122122

123123
// Public resource that shows certificate info but doesn't require it
124124
class info_resource : public httpserver::http_resource {
125125
public:
126-
std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request& req) {
126+
httpserver::http_response render_get(const httpserver::http_request& req) {
127127
std::string response;
128128

129129
if (req.has_client_certificate()) {
@@ -137,7 +137,7 @@ class info_resource : public httpserver::http_resource {
137137
response += "Use --cert and --key with curl to provide one.\n";
138138
}
139139

140-
return std::make_shared<httpserver::http_response>(httpserver::http_response::string(response));
140+
return httpserver::http_response::string(response);
141141
}
142142
};
143143

‎examples/custom_access_log.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ void custom_access_log(const std::string& url) {
3030

3131
class hello_world_resource : public httpserver::http_resource {
3232
public:
33-
std::shared_ptr<httpserver::http_response> render(const httpserver::http_request&) {
34-
return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string("Hello, World!")));
33+
httpserver::http_response render(const httpserver::http_request&) {
34+
return httpserver::http_response::string("Hello, World!");
3535
}
3636
};
3737

0 commit comments

Comments
 (0)