diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-06-12 17:43:15 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2021-06-16 14:36:01 +0100 |
| commit | ab9d67efa4c2a4ee6787430a447de675cb78c8e2 (patch) | |
| tree | 8a7a336f91247b9f45e13f48980084a4ed2a68ce /crypto/http/http_client.c | |
| parent | eefdb8e013fa9d0881566b41291c5725a77b332a (diff) | |
HTTP client: fix use of OSSL_HTTP_adapt_proxy(), which is needed also in cmp.c
For this reason, export this function, which allows removing http_local.h
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15764)
Diffstat (limited to 'crypto/http/http_client.c')
| -rw-r--r-- | crypto/http/http_client.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/http/http_client.c b/crypto/http/http_client.c index 03c42ab38e..648b02255f 100644 --- a/crypto/http/http_client.c +++ b/crypto/http/http_client.c @@ -23,8 +23,6 @@ #include "internal/sockets.h" #include "internal/cryptlib.h" /* for ossl_assert() */ -#include "http_local.h" - #define HTTP_PREFIX "HTTP/" #define HTTP_VERSION_PATT "1." /* allow 1.x */ #define HTTP_PREFIX_VERSION HTTP_PREFIX""HTTP_VERSION_PATT @@ -897,7 +895,7 @@ OSSL_HTTP_REQ_CTX *OSSL_HTTP_open(const char *server, const char *port, port = NULL; if (port == NULL && strchr(server, ':') == NULL) port = use_ssl ? OSSL_HTTPS_PORT : OSSL_HTTP_PORT; - proxy = ossl_http_adapt_proxy(proxy, no_proxy, server, use_ssl); + proxy = OSSL_HTTP_adapt_proxy(proxy, no_proxy, server, use_ssl); if (proxy != NULL && !OSSL_HTTP_parse_url(proxy, NULL /* use_ssl */, NULL /* user */, &proxy_host, &proxy_port, NULL /* num */, |