lib-http: Rename http_client_ssl_tunnel to http_client_proxy_ssl_tunnel

diff --git a/src/lib-http/http-client-request.c b/src/lib-http/http-client-request.c
index 379ed1ee8167579048a21256880e8a6cb0cd4d7b..3e310bdb4cf971a53b047927c723365633692b73 100644 (file)
--- a/src/lib-http/http-client-request.c
+++ b/src/lib-http/http-client-request.c
@@ -956,7 +956,7 @@ static void http_client_request_do_submit(struct http_client_request *req)
                        /* Specific normal proxy */
                        req->host_socket = NULL;
                } else if (req->origin_url.have_ssl &&
-                          client->set->ssl_tunnel &&
+                          client->set->proxy_ssl_tunnel &&
                           !req->connect_tunnel) {
                        /* Tunnel to origin server */
                        req->host_url = &req->origin_url;

diff --git a/src/lib-http/http-client-settings.c b/src/lib-http/http-client-settings.c
index a681367000b8b49afd2138061027b816283507ae..448cf257c9702aa3c5f2ea351dcf1ded26292db3 100644 (file)
--- a/src/lib-http/http-client-settings.c
+++ b/src/lib-http/http-client-settings.c
@@ -41,7 +41,7 @@ static const struct setting_define http_client_setting_defines[] = {
 
        DEF(BOOL_HIDDEN, auto_redirect),
        DEF(BOOL_HIDDEN, auto_retry),
-       DEF(BOOL, ssl_tunnel),
+       DEF(BOOL, proxy_ssl_tunnel),
 
        DEF(UINT, request_max_redirects),
        DEF(UINT, request_max_attempts),
@@ -91,7 +91,7 @@ static const struct http_client_settings http_client_default_settings = {
 
        .auto_redirect = TRUE,
        .auto_retry = TRUE,
-       .ssl_tunnel = TRUE,
+       .proxy_ssl_tunnel = TRUE,
 
        .request_max_redirects = 0,
        .request_max_attempts = 1,

diff --git a/src/lib-http/http-client.c b/src/lib-http/http-client.c
index b00d439a360a9156503729db518bb250d900a821..42f126dbc5d9c2cf9a0f62cb709ef60d2cb6a0d0 100644 (file)
--- a/src/lib-http/http-client.c
+++ b/src/lib-http/http-client.c
@@ -118,7 +118,7 @@ void http_client_settings_init(pool_t pool, struct http_client_settings *set_r)
                HTTP_CLIENT_DEFAULT_REQUEST_TIMEOUT_MSECS;
        set_r->auto_redirect = TRUE;
        set_r->auto_retry = TRUE;
-       set_r->ssl_tunnel = TRUE;
+       set_r->proxy_ssl_tunnel = TRUE;
 }
 
 struct http_client *

diff --git a/src/lib-http/http-client.h b/src/lib-http/http-client.h
index 7a6830af23c46207f03e23ba2079748e2f5526d7..47ca43902a507aaf00b78c20de3db8a80d4eb507 100644 (file)
--- a/src/lib-http/http-client.h
+++ b/src/lib-http/http-client.h
@@ -71,7 +71,7 @@ struct http_client_settings {
 
        /* FALSE = If we use a proxy, delegate SSL negotiation to proxy, rather
           than creating a CONNECT tunnel through the proxy for the SSL link */
-       bool ssl_tunnel;
+       bool proxy_ssl_tunnel;
 
        /* Maximum number of redirects for a request
           (default = 0; redirects result in