From 1bb62819cfe91ac6c50f72488022b22f93d2c9bc Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Fri, 15 Aug 2014 16:00:07 +0300 Subject: [PATCH] lib-http server: Use io_add_istream() to wait for the payload istream. This way the stream doesn't necessarily have to have a fd. --- src/lib-http/http-server-response.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib-http/http-server-response.c b/src/lib-http/http-server-response.c index c365787a88..40079dfeaa 100644 --- a/src/lib-http/http-server-response.c +++ b/src/lib-http/http-server-response.c @@ -204,7 +204,6 @@ int http_server_response_send_more(struct http_server_response *resp, struct http_server_connection *conn = resp->request->conn; struct ostream *output = resp->payload_output; off_t ret; - int fd; *error_r = NULL; @@ -251,11 +250,9 @@ int http_server_response_send_more(struct http_server_response *resp, //http_server_response_debug(resp, "Partially sent payload"); } else { /* input is blocking */ - fd = i_stream_get_fd(resp->payload_input); conn->output_locked = TRUE; - i_assert(fd >= 0); - conn->io_resp_payload = io_add - (fd, IO_READ, http_server_response_payload_input, resp); + conn->io_resp_payload = io_add_istream(resp->payload_input, + http_server_response_payload_input, resp); } return ret < 0 ? -1 : 0; } -- 2.47.3