X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fhttp%2Fhttp_lib.c;fp=crypto%2Fhttp%2Fhttp_lib.c;h=bd9c096b989cf58e4c037cbe679b68fa441ab040;hp=2aa0736ac54bb649f088da4318de19cc96c4b126;hb=ab9d67efa4c2a4ee6787430a447de675cb78c8e2;hpb=eefdb8e013fa9d0881566b41291c5725a77b332a diff --git a/crypto/http/http_lib.c b/crypto/http/http_lib.c index 2aa0736ac5..bd9c096b98 100644 --- a/crypto/http/http_lib.c +++ b/crypto/http/http_lib.c @@ -15,8 +15,6 @@ #include #include "internal/cryptlib.h" /* for ossl_assert() */ -#include "http_local.h" - static void init_pstring(char **pstr) { if (pstr != NULL) { @@ -241,7 +239,7 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost, } /* Respect no_proxy, taking default value from environment variable(s) */ -int ossl_http_use_proxy(const char *no_proxy, const char *server) +static int use_proxy(const char *no_proxy, const char *server) { size_t sl; const char *found = NULL; @@ -269,7 +267,7 @@ int ossl_http_use_proxy(const char *no_proxy, const char *server) } /* Take default value from environment variable(s), respect no_proxy */ -const char *ossl_http_adapt_proxy(const char *proxy, const char *no_proxy, +const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy, const char *server, int use_ssl) { /* @@ -282,8 +280,7 @@ const char *ossl_http_adapt_proxy(const char *proxy, const char *no_proxy, proxy = getenv(use_ssl ? OPENSSL_HTTP_PROXY : OPENSSL_HTTPS_PROXY); - if (proxy == NULL || *proxy == '\0' - || !ossl_http_use_proxy(no_proxy, server)) + if (proxy == NULL || *proxy == '\0' || !use_proxy(no_proxy, server)) return NULL; return proxy; }