summaryrefslogtreecommitdiffstats
path: root/crypto/http
diff options
context:
space:
mode:
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>2021-06-09 09:40:48 +0200
committerDr. David von Oheimb <dev@ddvo.net>2021-06-11 14:41:20 +0200
commit8ccbf00d1786f25af5e64a2354f87aef31b57bdf (patch)
treef6e17cc3f57f0e5a91f5bedcc4497db6d2c59a65 /crypto/http
parent95c0b295dea8861a91873653e86636bebbbae65e (diff)
Rename OSSL_HTTP_set_request() to OSSL_HTTP_set1_request() for clarity
Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15697)
Diffstat (limited to 'crypto/http')
-rw-r--r--crypto/http/http_client.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/crypto/http/http_client.c b/crypto/http/http_client.c
index 0906818451..03c42ab38e 100644
--- a/crypto/http/http_client.c
+++ b/crypto/http/http_client.c
@@ -947,11 +947,11 @@ OSSL_HTTP_REQ_CTX *OSSL_HTTP_open(const char *server, const char *port,
return rctx;
}
-int OSSL_HTTP_set_request(OSSL_HTTP_REQ_CTX *rctx, const char *path,
- const STACK_OF(CONF_VALUE) *headers,
- const char *content_type, BIO *req,
- const char *expected_content_type, int expect_asn1,
- size_t max_resp_len, int timeout, int keep_alive)
+int OSSL_HTTP_set1_request(OSSL_HTTP_REQ_CTX *rctx, const char *path,
+ const STACK_OF(CONF_VALUE) *headers,
+ const char *content_type, BIO *req,
+ const char *expected_content_type, int expect_asn1,
+ size_t max_resp_len, int timeout, int keep_alive)
{
int use_http_proxy;
@@ -1090,12 +1090,12 @@ BIO *OSSL_HTTP_get(const char *url, const char *proxy, const char *no_proxy,
buf_size, timeout);
new_rpath:
if (rctx != NULL) {
- if (!OSSL_HTTP_set_request(rctx, path, headers,
- NULL /* content_type */,
- NULL /* req */,
- expected_ct, expect_asn1, max_resp_len,
- -1 /* use same max time (timeout) */,
- 0 /* no keep_alive */))
+ if (!OSSL_HTTP_set1_request(rctx, path, headers,
+ NULL /* content_type */,
+ NULL /* req */,
+ expected_ct, expect_asn1, max_resp_len,
+ -1 /* use same max time (timeout) */,
+ 0 /* no keep_alive */))
OSSL_HTTP_REQ_CTX_free(rctx);
else
resp = OSSL_HTTP_exchange(rctx, &redirection_url);
@@ -1152,9 +1152,9 @@ BIO *OSSL_HTTP_transfer(OSSL_HTTP_REQ_CTX **prctx,
timeout = -1; /* Already set during opening the connection */
}
if (rctx != NULL) {
- if (OSSL_HTTP_set_request(rctx, path, headers, content_type, req,
- expected_ct, expect_asn1,
- max_resp_len, timeout, keep_alive))
+ if (OSSL_HTTP_set1_request(rctx, path, headers, content_type, req,
+ expected_ct, expect_asn1,
+ max_resp_len, timeout, keep_alive))
resp = OSSL_HTTP_exchange(rctx, NULL);
if (resp == NULL || !OSSL_HTTP_is_alive(rctx)) {
if (!OSSL_HTTP_close(rctx, resp != NULL)) {