]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-http: server: Replace i_error() with e_error().
authorStephan Bosch <stephan.bosch@dovecot.fi>
Fri, 8 Nov 2019 16:11:32 +0000 (17:11 +0100)
committermartti.rannanjarvi <martti.rannanjarvi@open-xchange.com>
Sat, 18 Apr 2020 14:55:11 +0000 (14:55 +0000)
src/lib-http/http-server-connection.c
src/lib-http/http-server-response.c

index 4982a4ee08de6f4649a0d43b0620b646a0eaec64..f6de2c78a57ce44516354f24ae90eb826dedb5d7 100644 (file)
@@ -1108,17 +1108,19 @@ http_server_connection_create(struct http_server *server,
                net_set_nonblock(fd_out, TRUE);
        (void)net_set_tcp_nodelay(fd_out, TRUE);
 
-       if (set->socket_send_buffer_size > 0) {
-               if (net_set_send_buffer_size(fd_out,
-                       set->socket_send_buffer_size) < 0)
-                       i_error("net_set_send_buffer_size(%zu) failed: %m",
-                               set->socket_send_buffer_size);
+       if (set->socket_send_buffer_size > 0 &&
+           net_set_send_buffer_size(fd_out,
+                                    set->socket_send_buffer_size) < 0) {
+               e_error(conn->event,
+                       "net_set_send_buffer_size(%zu) failed: %m",
+                       set->socket_send_buffer_size);
        }
-       if (set->socket_recv_buffer_size > 0) {
-               if (net_set_recv_buffer_size(fd_in,
-                       set->socket_recv_buffer_size) < 0)
-                       i_error("net_set_recv_buffer_size(%zu) failed: %m",
-                               set->socket_recv_buffer_size);
+       if (set->socket_recv_buffer_size > 0 &&
+           net_set_recv_buffer_size(fd_in,
+                                    set->socket_recv_buffer_size) < 0) {
+               e_error(conn->event,
+                       "net_set_recv_buffer_size(%zu) failed: %m",
+                       set->socket_recv_buffer_size);
        }
 
        conn_event = event_create(server->event);
index f77ef30f99c4b5dde966193e966f595ce3bc7270..27b7a4f2b471bc87edb2365c839ca9ffe9c6d7e9 100644 (file)
@@ -184,7 +184,7 @@ void http_server_response_set_payload(struct http_server_response *resp,
        resp->payload_input = input;
        if ((ret = i_stream_get_size(input, TRUE, &resp->payload_size)) <= 0) {
                if (ret < 0) {
-                       i_error("i_stream_get_size(%s) failed: %s",
+                       e_error(resp->event, "i_stream_get_size(%s) failed: %s",
                                i_stream_get_name(input),
                                i_stream_get_error(input));
                }