Mercurial > dovecot > core-2.2

changeset 21461:776bf892e493

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-http: server: Fix premature connection destroy in http_server_connection_output(). Added a reference to the connection object while it is sending the remainder of a response's payload. This is necessary, since http_server_response_send_more() can destroy the connection, for example when the request has a "Connection: close" header. This will only occur for responses with a very large payload, because otherwise the payload is fully sent in in the initial pass.
author Stephan Bosch <stephan.bosch@dovecot.fi>
date Tue, 31 Jan 2017 13:41:48 +0100
parents 6a037631d484
children 6b4bad2c0840
files src/lib-http/http-server-connection.c
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-http/http-server-connection.c	Mon Jan 09 23:13:03 2017 +0200
+++ b/src/lib-http/http-server-connection.c	Tue Jan 31 13:41:48 2017 +0100
@@ -954,6 +954,7 @@
 {
 	bool pipeline_was_full =
 		http_server_connection_pipeline_is_full(conn);
+	int ret;
 
 	if (http_server_connection_flush(conn) < 0)
 		return -1;
@@ -966,8 +967,15 @@
 		struct http_server_response *resp = req->response;
 		const char *error = NULL;
 
+		http_server_connection_ref(conn);
+
 		i_assert(resp != NULL);
-		if (http_server_response_send_more(resp, &error) < 0) {
+		ret = http_server_response_send_more(resp, &error);
+
+		if (http_server_connection_unref_is_closed(conn))
+			return -1;
+
+		if (ret < 0) {
 			http_server_connection_write_failed(conn, error);
 			return -1;
 		}