From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Fri, 12 Jan 2018 20:03:41 +0000 (+0100)
Subject: lib-http: queue: Update the correct timout while dropping a request from the delay... 
X-Git-Tag: 2.2.35~99
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26d50f3cfea2e63dacd594f38dd7a5f6758627f4;p=thirdparty%2Fdovecot%2Fcore.git

lib-http: queue: Update the correct timout while dropping a request from the delay queue.

The absolute request timeout rather than the delay timeout was updated for the
removal of the request from the delay queue.
---

diff --git a/src/lib-http/http-client-queue.c b/src/lib-http/http-client-queue.c
index 5e1e4d28de..923881bef1 100644
--- a/src/lib-http/http-client-queue.c
+++ b/src/lib-http/http-client-queue.c
@@ -667,7 +667,7 @@ http_client_queue_drop_request(struct http_client_queue *queue,
 					timeout_remove(&queue->to_delayed);
 					if (count > 1) {
 						i_assert(reqs[1]->release_time.tv_sec > 0);
-						http_client_queue_set_request_timer(queue, &reqs[1]->release_time);
+						http_client_queue_set_delay_timer(queue, reqs[1]->release_time);
 					}
 				}
 			}