]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-http: client: Use the new connection_input_halt/resume() functions.
authorStephan Bosch <stephan.bosch@dovecot.fi>
Sat, 10 Feb 2018 09:27:19 +0000 (10:27 +0100)
committerStephan Bosch <stephan.bosch@dovecot.fi>
Fri, 16 Feb 2018 12:54:55 +0000 (13:54 +0100)
src/lib-http/http-client-connection.c

index 99becea21557a52e9af0bed7eb7dc10831fe6b89..9c1cf0efb97e346e9df6600417b4671e0eb58f7c 100644 (file)
@@ -587,8 +587,7 @@ static void http_client_connection_destroy(struct connection *_conn)
 static void http_client_payload_finished(struct http_client_connection *conn)
 {
        timeout_remove(&conn->to_input);
-       conn->conn.io = io_add_istream(conn->conn.input,
-                                      http_client_connection_input, &conn->conn);
+       connection_input_resume(&conn->conn);
        if (array_count(&conn->request_wait_list) > 0)
                http_client_connection_start_request_timeout(conn);
 }
@@ -707,7 +706,7 @@ http_client_connection_return_response(
                                              req);
                /* the callback may add its own I/O, so we need to remove
                   our one before calling it */
-               io_remove(&conn->conn.io);
+               connection_input_halt(&conn->conn);
                /* we've received the request itself, and we can't reset the
                   timeout during the payload reading. */
                http_client_connection_stop_request_timeout(conn);
@@ -731,9 +730,7 @@ http_client_connection_return_response(
                        i_stream_remove_destroy_callback(conn->incoming_payload,
                                                         http_client_payload_destroyed);
                        i_stream_unref(&conn->incoming_payload);
-                       conn->conn.io = io_add_istream(conn->conn.input,
-                                              http_client_connection_input,
-                                              &conn->conn);
+                       connection_input_resume(&conn->conn);
                }
                http_client_connection_unref_request(conn, &req);
                return http_client_connection_unref(&conn);