Skip to content

Commit 2e73dcb

Browse files
etrclaude
andcommitted
refactor: rename three mis-scoped translation units
Each file's name described only a fraction of its contents. Rename to match what they actually hold (pure file renames + reference updates; no behavior change). Build green, full suite 109/109. webserver_finalize.cpp -> webserver_hook_firing.cpp Holds only the four gated hook-firing helpers (before_handler, after_handler, response_sent, request_completed). finalize_answer itself lives in webserver_request.cpp. webserver_setup.cpp -> webserver_lifecycle.cpp Holds MHD option building AND start/stop/run/quiesce/get_fdset/ add_connection, the IP ACL setters, and the server info getters -- the daemon lifecycle surface, not just setup. http_utils_inet.hpp -> http_utils_helpers.hpp Holds the free-function helper overflow from http_utils.hpp: only get_ip_str/get_port are inet; the rest are dump_header_map/ dump_arg_map/http_unescape/load_file/base_unescaper. specs/ planning archive still references the old filenames; left as-is (dated historical records, out of scope for the code readability pass). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent dcee7a2 commit 2e73dcb

11 files changed

Lines changed: 18 additions & 18 deletions

src/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ lib_LTLIBRARIES = libhttpserver.la
2525
# builds. The WS-off branch in websocket_handler.cpp provides stub
2626
# definitions (every member throws feature_unavailable except is_valid()
2727
# which returns false).
28-
libhttpserver_la_SOURCES = string_utilities.cpp webserver.cpp webserver_add_hook.cpp http_utils.cpp file_info.cpp http_request.cpp http_request_auth.cpp http_response.cpp http_response_factories.cpp http_resource.cpp create_webserver.cpp create_test_request.cpp websocket_handler.cpp hook_handle.cpp peer_address.cpp resource_hook_table.cpp cookie.cpp detail/http_endpoint.cpp detail/body.cpp detail/ip_representation.cpp detail/http_request_impl.cpp detail/http_request_impl_args.cpp detail/http_request_impl_tls.cpp detail/webserver_setup.cpp detail/webserver_register.cpp detail/webserver_routes.cpp detail/webserver_routes_upsert.cpp detail/webserver_callbacks.cpp detail/webserver_callbacks_lifecycle.cpp detail/webserver_websocket.cpp detail/webserver_dispatch.cpp detail/webserver_request.cpp detail/webserver_response_queue.cpp detail/webserver_body_pipeline.cpp detail/webserver_error_pages.cpp detail/webserver_aliases.cpp detail/webserver_finalize.cpp detail/hook_phase_dispatch.cpp
28+
libhttpserver_la_SOURCES = string_utilities.cpp webserver.cpp webserver_add_hook.cpp http_utils.cpp file_info.cpp http_request.cpp http_request_auth.cpp http_response.cpp http_response_factories.cpp http_resource.cpp create_webserver.cpp create_test_request.cpp websocket_handler.cpp hook_handle.cpp peer_address.cpp resource_hook_table.cpp cookie.cpp detail/http_endpoint.cpp detail/body.cpp detail/ip_representation.cpp detail/http_request_impl.cpp detail/http_request_impl_args.cpp detail/http_request_impl_tls.cpp detail/webserver_lifecycle.cpp detail/webserver_register.cpp detail/webserver_routes.cpp detail/webserver_routes_upsert.cpp detail/webserver_callbacks.cpp detail/webserver_callbacks_lifecycle.cpp detail/webserver_websocket.cpp detail/webserver_dispatch.cpp detail/webserver_request.cpp detail/webserver_response_queue.cpp detail/webserver_body_pipeline.cpp detail/webserver_error_pages.cpp detail/webserver_aliases.cpp detail/webserver_hook_firing.cpp detail/hook_phase_dispatch.cpp
2929
# noinst_HEADERS: shipped in the tarball but NEVER installed under $prefix/include.
3030
# Detail headers (httpserver/detail/*.hpp) live here so they cannot leak to
3131
# downstream consumers — the public surface comes in through <httpserver.hpp>.
3232
noinst_HEADERS = httpserver/string_utilities.hpp httpserver/detail/modded_request.hpp httpserver/detail/http_endpoint.hpp httpserver/detail/body.hpp httpserver/detail/webserver_impl.hpp httpserver/detail/webserver_impl_dispatch.hpp httpserver/detail/connection_state.hpp httpserver/detail/secure_zero.hpp httpserver/detail/http_request_impl.hpp httpserver/detail/resource_hook_table.hpp httpserver/detail/route_entry.hpp httpserver/detail/lambda_resource.hpp httpserver/detail/segment_trie.hpp httpserver/detail/route_cache.hpp httpserver/detail/route_tier.hpp httpserver/detail/unescape_helpers.hpp gettext.h
33-
nobase_include_HEADERS = httpserver.hpp httpserver/body_kind.hpp httpserver/cookie.hpp httpserver/constants.hpp httpserver/create_webserver.hpp httpserver/create_webserver_setters.hpp httpserver/create_test_request.hpp httpserver/webserver.hpp httpserver/webserver_routes.hpp httpserver/webserver_runtime.hpp httpserver/webserver_websocket.hpp httpserver/webserver_hooks.hpp httpserver/websocket_handler.hpp httpserver/http_utils.hpp httpserver/http_utils_inet.hpp httpserver/ip_representation.hpp httpserver/file_info.hpp httpserver/http_request.hpp httpserver/http_request_auth.hpp httpserver/http_request_getters.hpp httpserver/http_response.hpp httpserver/http_response_factories.hpp httpserver/http_resource.hpp httpserver/feature_unavailable.hpp httpserver/iovec_entry.hpp httpserver/http_arg_value.hpp httpserver/http_method.hpp httpserver/hook_phase.hpp httpserver/hook_action.hpp httpserver/hook_handle.hpp httpserver/hook_context.hpp
33+
nobase_include_HEADERS = httpserver.hpp httpserver/body_kind.hpp httpserver/cookie.hpp httpserver/constants.hpp httpserver/create_webserver.hpp httpserver/create_webserver_setters.hpp httpserver/create_test_request.hpp httpserver/webserver.hpp httpserver/webserver_routes.hpp httpserver/webserver_runtime.hpp httpserver/webserver_websocket.hpp httpserver/webserver_hooks.hpp httpserver/websocket_handler.hpp httpserver/http_utils.hpp httpserver/http_utils_helpers.hpp httpserver/ip_representation.hpp httpserver/file_info.hpp httpserver/http_request.hpp httpserver/http_request_auth.hpp httpserver/http_request_getters.hpp httpserver/http_response.hpp httpserver/http_response_factories.hpp httpserver/http_resource.hpp httpserver/feature_unavailable.hpp httpserver/iovec_entry.hpp httpserver/http_arg_value.hpp httpserver/http_method.hpp httpserver/hook_phase.hpp httpserver/hook_action.hpp httpserver/hook_handle.hpp httpserver/hook_context.hpp
3434

3535
AM_CXXFLAGS += -fPIC -Wall
3636

src/detail/hook_phase_dispatch.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ detail::webserver_impl::fire_handler_exception(
307307
//
308308
// after_handler is the post-handler short-circuit. Returns engaged
309309
// optional iff a hook short-circuited with respond_with(); the caller
310-
// (fire_after_handler_gated in webserver_finalize.cpp) emplaces the new
310+
// (fire_after_handler_gated in webserver_hook_firing.cpp) emplaces the new
311311
// response into mr->response ahead of materialize_and_queue_response.
312312

313313
std::optional<::httpserver::http_response>

src/detail/ip_representation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ bool is_v4_mapped_prefix_octet_pair(uint16_t a, uint16_t b) {
362362
// case does not apply are bytes 10-11 folded into the scores and the
363363
// totals compared.
364364
//
365-
// insert_wildcard_aware in src/detail/webserver_setup.cpp relies on
365+
// insert_wildcard_aware in src/detail/webserver_lifecycle.cpp relies on
366366
// this equivalence: std::set::find must locate a stored entry that
367367
// merely OVERLAPS the new one (wildcard-subsumed, or v4-mapped vs
368368
// plain form) so the more-permissive entry can win.

src/detail/webserver_callbacks_lifecycle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ namespace detail {
134134
void webserver_impl::connection_notify(void* cls, struct MHD_Connection* connection,
135135
void** socket_context,
136136
enum MHD_ConnectionNotificationCode toe) {
137-
// cls is the owning webserver* (set in webserver_setup.cpp at
137+
// cls is the owning webserver* (set in webserver_lifecycle.cpp at
138138
// MHD_OPTION_NOTIFY_CONNECTION). It MAY be null in tests that
139139
// exercise the callback without an enclosing webserver; defensive
140140
// null-check gates every hook fire on a non-null impl.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
USA
1919
*/
2020

21-
// Gated hook-firing helpers for the after_handler, response_sent, and
22-
// request_completed lifecycle phases. Carved out of webserver_request.cpp
23-
// and webserver_callbacks.cpp to keep each TU under the project LOC
24-
// ceiling. See per-function comments for behavioral details.
21+
// Gated hook-firing helpers for the before_handler, after_handler,
22+
// response_sent, and request_completed lifecycle phases. Carved out of
23+
// webserver_request.cpp and webserver_callbacks.cpp to keep each TU under
24+
// the project LOC ceiling. See per-function comments for behavioral details.
2525

2626
#include "httpserver/webserver.hpp"
2727
#include "httpserver/detail/webserver_impl.hpp"

src/detail/webserver_register.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ void webserver::unregister_resource(const string& resource) {
330330
// deny_ip / remove_denied_ip -> the deny list (exception under ACCEPT)
331331
// allow_ip / remove_allowed_ip -> the allow list (exception under REJECT;
332332
// also overrides a deny entry under ACCEPT)
333-
// See webserver::deny_ip / allow_ip (impls in webserver_setup.cpp) and
333+
// See webserver::deny_ip / allow_ip (impls in webserver_lifecycle.cpp) and
334334
// classify_decision (webserver_callbacks_lifecycle.cpp).
335335

336336
} // namespace httpserver

src/httpserver/detail/webserver_impl_dispatch.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ void fire_request_completed(
224224

225225
// Gated-fire helpers, members so the http_response friendship
226226
// applies (response_sent_ctx::bytes_queued reads response.body_->size()).
227-
// Definitions live in src/detail/webserver_finalize.cpp.
227+
// Definitions live in src/detail/webserver_hook_firing.cpp.
228228
//
229229
// @p resource is the resolved resource borrowed from finalize_answer's
230230
// owning shared_ptr (nullptr on the 404 / short-circuit paths where no
@@ -248,7 +248,7 @@ void fire_request_completed_gated(modded_request* mr,
248248
// short-circuited (mr->response already populated; caller must go
249249
// straight to materialize_and_queue_response). False means both chains
250250
// passed (or both gates were closed) and dispatch should proceed.
251-
// Definition lives in src/detail/webserver_finalize.cpp alongside the
251+
// Definition lives in src/detail/webserver_hook_firing.cpp alongside the
252252
// other gated-fire helpers. @p hrm is the resolved resource (non-null at
253253
// the call site in finalize_answer).
254254
bool fire_before_handler_gated(

src/httpserver/http_utils.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,6 @@ using arg_view_map = std::map<std::string_view, http_arg_value, http::arg_compar
445445
// consumers of <httpserver/http_utils.hpp> still see the type.
446446
#include "httpserver/ip_representation.hpp"
447447

448-
#include "httpserver/http_utils_inet.hpp"
448+
#include "httpserver/http_utils_helpers.hpp"
449449
#endif // SRC_HTTPSERVER_HTTP_UTILS_HPP_
450450

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
2323
#endif
2424

25-
// http_utils_inet.hpp -- free-function helpers in namespace
25+
// http_utils_helpers.hpp -- free-function helpers in namespace
2626
// httpserver::http (sockaddr -> string/port, header/arg map dumps, URL
2727
// unescape, file loading).
2828
//
@@ -32,8 +32,8 @@
3232
// after the types these declarations reference (header_view_map /
3333
// header_map / arg_view_map / unescaper_ptr) are defined; not intended to
3434
// be included on its own.
35-
#ifndef SRC_HTTPSERVER_HTTP_UTILS_INET_HPP_
36-
#define SRC_HTTPSERVER_HTTP_UTILS_INET_HPP_
35+
#ifndef SRC_HTTPSERVER_HTTP_UTILS_HELPERS_HPP_
36+
#define SRC_HTTPSERVER_HTTP_UTILS_HELPERS_HPP_
3737

3838
#include <stddef.h>
3939
#include <stdint.h>
@@ -105,4 +105,4 @@ size_t base_unescaper(std::string*, unescaper_ptr unescaper);
105105
} // namespace http
106106
} // namespace httpserver
107107

108-
#endif // SRC_HTTPSERVER_HTTP_UTILS_INET_HPP_
108+
#endif // SRC_HTTPSERVER_HTTP_UTILS_HELPERS_HPP_

0 commit comments

Comments
 (0)