lib-http: client: Reset redirect counter when the request is retried.

The absence of this reset caused problems when there was a redirect limit and
the request was retried, in which case the limit is reached too soon.

diff --git a/src/lib-http/http-client-request.c b/src/lib-http/http-client-request.c
index f90d8be4c39374fc2a1400f729a102762183dfff..15783dc10e439af9212d057e9b4f55b42d86593c 100644 (file)
--- a/src/lib-http/http-client-request.c
+++ b/src/lib-http/http-client-request.c
@@ -1492,6 +1492,7 @@ void http_client_request_redirect(struct http_client_request *req,
                return;
        }
 
+       i_assert(req->redirects <= req->client->set.max_redirects);
        if (++req->redirects > req->client->set.max_redirects) {
                if (req->client->set.max_redirects > 0) {
                        http_client_request_error(&req,
@@ -1584,6 +1585,7 @@ void http_client_request_resubmit(struct http_client_request *req)
 
        req->peer = NULL;
        req->state = HTTP_REQUEST_STATE_QUEUED;
+       req->redirects = 0;
        http_client_host_submit_request(req->host, req);
 }