From: Markus Valentin <markus.valentin@open-xchange.com>
Date: Mon, 4 Dec 2023 14:15:24 +0000 (+0100)
Subject: lib-http: Remove debug from http-server-settings
X-Git-Tag: 2.4.1~1061
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a24f760c4bbbb0e35bc623757f3e6671fb0bba18;p=thirdparty%2Fdovecot%2Fcore.git

lib-http: Remove debug from http-server-settings
---

diff --git a/src/lib-http/http-server.c b/src/lib-http/http-server.c
index c9243f7d5c..8e655bec6a 100644
--- a/src/lib-http/http-server.c
+++ b/src/lib-http/http-server.c
@@ -55,11 +55,9 @@ struct http_server *http_server_init(const struct http_server_settings *set,
 	server->set.request_hdr_max_fields = set->request_hdr_max_fields;
 	server->set.socket_send_buffer_size = set->socket_send_buffer_size;
 	server->set.socket_recv_buffer_size = set->socket_recv_buffer_size;
-	server->set.debug = set->debug;
 
 	server->event = event_create(event_parent);
 	event_add_category(server->event, &event_category_http_server);
-	event_set_forced_debug(server->event, set->debug);
 	event_set_append_log_prefix(server->event, "http-server: ");
 
 	server->conn_list = http_server_connection_list_init();
diff --git a/src/lib-http/http-server.h b/src/lib-http/http-server.h
index f7c12e0ad4..7ca19b415b 100644
--- a/src/lib-http/http-server.h
+++ b/src/lib-http/http-server.h
@@ -52,9 +52,6 @@ struct http_server_settings {
 	   defaults are used when these settings are 0. */
 	size_t socket_send_buffer_size;
 	size_t socket_recv_buffer_size;
-
-	/* Enable logging debug messages */
-	bool debug;
 };
 
 
diff --git a/src/lib-http/test-http-payload.c b/src/lib-http/test-http-payload.c
index 588eaf54f9..e0026e84d7 100644
--- a/src/lib-http/test-http-payload.c
+++ b/src/lib-http/test-http-payload.c
@@ -1764,7 +1764,6 @@ test_init_server_settings(struct http_server_settings *server_set_r)
 {
 	i_zero(server_set_r);
 	server_set_r->request_max_payload_size = UOFF_T_MAX;
-	server_set_r->debug = debug;
 
 	if (small_socket_buffers) {
 		server_set_r->socket_send_buffer_size = 40960;
@@ -2433,6 +2432,7 @@ static void main_init(void)
 	event_set_append_log_prefix(client_event, "test client: ");
 	server_event = event_create(test_event);
 	event_set_append_log_prefix(server_event, "test server: ");
+	event_set_forced_debug(server_event, debug);
 }
 
 static void main_deinit(void)
diff --git a/src/lib-http/test-http-server-errors.c b/src/lib-http/test-http-server-errors.c
index bd5dcb3aa2..f78720c60c 100644
--- a/src/lib-http/test-http-server-errors.c
+++ b/src/lib-http/test-http-server-errors.c
@@ -842,7 +842,6 @@ static void test_server_defaults(struct http_server_settings *http_set)
 	i_zero(http_set);
 	http_set->max_client_idle_time_msecs = 5*1000;
 	http_set->max_pipelined_requests = 1;
-	http_set->debug = debug;
 }
 
 /* client connection */
@@ -885,6 +884,7 @@ static void test_server_run(const struct http_server_settings *http_set)
 {
 	struct timeout *to;
 	struct event *event = event_create(NULL);
+	event_set_forced_debug(event, debug);
 
 	to = timeout_add(SERVER_MAX_TIMEOUT_MSECS, test_server_timeout, NULL);
 
diff --git a/src/lib-http/test-http-server.c b/src/lib-http/test-http-server.c
index bbc64d4b34..2e2f5ab20f 100644
--- a/src/lib-http/test-http-server.c
+++ b/src/lib-http/test-http-server.c
@@ -213,11 +213,10 @@ int main(int argc, char *argv[])
 	i_zero(&http_set);
 	http_set.max_client_idle_time_msecs = 20*1000; /* defaults to indefinite! */
 	http_set.max_pipelined_requests = 4;
-	http_set.debug = debug;
 
 	ioloop = io_loop_create();
 	struct event *event = event_create(NULL);
-
+	event_set_forced_debug(event, debug);
 	http_server = http_server_init(&http_set, event);
 
 	lib_signals_init();