From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sat, 10 Feb 2018 09:29:44 +0000 (+0100)
Subject: lib-http: server: Use the new connection_input_halt/resume() functions.
X-Git-Tag: 2.2.35~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4d429f219eb429b069e2f1d1273e2505217003f;p=thirdparty%2Fdovecot%2Fcore.git

lib-http: server: Use the new connection_input_halt/resume() functions.
---

diff --git a/src/lib-http/http-server-connection.c b/src/lib-http/http-server-connection.c
index 9c4b9f5752..2f355d35d9 100644
--- a/src/lib-http/http-server-connection.c
+++ b/src/lib-http/http-server-connection.c
@@ -107,18 +107,15 @@ http_server_connection_get_stats(struct http_server_connection *conn)
 static void
 http_server_connection_input_halt(struct http_server_connection *conn)
 {
-	if (conn->conn.io != NULL)
-		io_remove(&conn->conn.io);
+	connection_input_halt(&conn->conn);
 }
 
 static void
 http_server_connection_input_resume(struct http_server_connection *conn)
 {
-	if (conn->conn.io == NULL && !conn->closed &&
-		!conn->input_broken && !conn->close_indicated &&
+	if (!conn->closed && !conn->input_broken && !conn->close_indicated &&
 		!conn->in_req_callback && conn->incoming_payload == NULL) {
-		conn->conn.io = io_add_istream(conn->conn.input,
-       http_server_connection_input, &conn->conn);
+		connection_input_resume(&conn->conn);
 	}
 }