lib-http: Rename max_auto_retry_delay to max_auto_retry_delay_secs

diff --git a/src/lib-http/http-client-request.c b/src/lib-http/http-client-request.c
index 8453294cae3acd96b62b3518e5b2d354fdfba1f2..60602e0a904ce94720dea67be2ce939cde73b8a9 100644 (file)
--- a/src/lib-http/http-client-request.c
+++ b/src/lib-http/http-client-request.c
@@ -694,9 +694,9 @@ int http_client_request_delay_from_response(
                return 0;  /* no delay */
        if (retry_after < ioloop_time)
                return 0;  /* delay already expired */
-       max = (req->client->set.max_auto_retry_delay == 0 ?
+       max = (req->client->set.max_auto_retry_delay_secs == 0 ?
               req->attempt_timeout_msecs / 1000 :
-              req->client->set.max_auto_retry_delay);
+              req->client->set.max_auto_retry_delay_secs);
        if ((unsigned int)(retry_after - ioloop_time) > max)
                return -1; /* delay too long */
        req->release_time.tv_sec = retry_after;

diff --git a/src/lib-http/http-client.c b/src/lib-http/http-client.c
index 98670a82b8dc6bfb8d857fe4865823869b289582..5e71b63bf27f95c2bab12b482d832782a2afc0d7 100644 (file)
--- a/src/lib-http/http-client.c
+++ b/src/lib-http/http-client.c
@@ -221,8 +221,8 @@ http_client_init_shared(struct http_client_context *cctx,
                        client->set.socket_send_buffer_size = set->socket_send_buffer_size;
                if (set->socket_recv_buffer_size > 0)
                        client->set.socket_recv_buffer_size = set->socket_recv_buffer_size;
-               if (set->max_auto_retry_delay > 0)
-                       client->set.max_auto_retry_delay = set->max_auto_retry_delay;
+               if (set->max_auto_retry_delay_secs > 0)
+                       client->set.max_auto_retry_delay_secs = set->max_auto_retry_delay_secs;
                client->set.debug = client->set.debug || set->debug;
        }
 
@@ -503,7 +503,7 @@ http_client_context_create(const struct http_client_settings *set)
                        set->request_timeout_msecs;
        cctx->set.connect_timeout_msecs = set->connect_timeout_msecs;
        cctx->set.soft_connect_timeout_msecs = set->soft_connect_timeout_msecs;
-       cctx->set.max_auto_retry_delay = set->max_auto_retry_delay;
+       cctx->set.max_auto_retry_delay_secs = set->max_auto_retry_delay_secs;
        cctx->set.socket_send_buffer_size = set->socket_send_buffer_size;
        cctx->set.socket_recv_buffer_size = set->socket_recv_buffer_size;
        cctx->set.debug = set->debug;

diff --git a/src/lib-http/http-client.h b/src/lib-http/http-client.h
index 26289b670b4c210cc63aea4bfbd2195024535b1f..4f04222b24e124d2c2aa3f0f3d02543dbf44433b 100644 (file)
--- a/src/lib-http/http-client.h
+++ b/src/lib-http/http-client.h
@@ -117,7 +117,7 @@ struct http_client_settings {
           retrying/redirecting requests. if a server sends a response with a
           Retry-After header that causes a delay longer than this, the request
           is not automatically retried and the response is returned */
-       unsigned int max_auto_retry_delay;
+       unsigned int max_auto_retry_delay_secs;
 
        /* the kernel send/receive buffer sizes used for the connection sockets.
           Configuring this is mainly useful for the test suite. The kernel