From: Stephan Bosch <stephan@rename-it.nl>
Date: Thu, 23 Oct 2014 02:55:51 +0000 (+0300)
Subject: lib-http: client: Clear req->conn when request is finished.
X-Git-Tag: 2.2.15~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e3c6e99844b1981df1b6ffa484211dc0e3ce089;p=thirdparty%2Fdovecot%2Fcore.git

lib-http: client: Clear req->conn when request is finished.
This prevents a spurious assert failure.
---

diff --git a/src/lib-http/http-client-connection.c b/src/lib-http/http-client-connection.c
index 764de62ca9..7d456ae983 100644
--- a/src/lib-http/http-client-connection.c
+++ b/src/lib-http/http-client-connection.c
@@ -438,6 +438,7 @@ static void http_client_payload_destroyed(struct http_client_request *req)
 	   the payload. make sure here that it's switched back. */
 	net_set_nonblock(conn->conn.fd_in, TRUE);
 
+	req->conn = NULL;
 	conn->incoming_payload = NULL;
 	conn->pending_request = NULL;
 	http_client_request_finish(&req);
@@ -495,6 +496,7 @@ http_client_connection_return_response(struct http_client_connection *conn,
 	retrying = !http_client_request_callback(req, response);
 	http_client_connection_unref(&conn);
 	if (conn == NULL) {
+		req->conn = NULL;
 		/* the callback managed to get this connection destroyed */
 		if (!retrying)
 			http_client_request_finish(&req);
@@ -531,6 +533,7 @@ http_client_connection_return_response(struct http_client_connection *conn,
 			http_client_payload_finished(conn);
 		}
 	} else {
+		req->conn = NULL;
 		http_client_request_finish(&req);
 		http_client_request_unref(&req);
 	}