summaryrefslogtreecommitdiffstats
path: root/crypto/http
diff options
context:
space:
mode:
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>2021-11-30 16:44:59 +0100
committerDr. David von Oheimb <dev@ddvo.net>2021-12-03 12:21:12 +0100
commit38288f424faa0cf61bd705c497bb1a1657611da1 (patch)
treefa43930a24228ae6011c4b19d6d6b0c9b7c4476a /crypto/http
parente2b7dc353b353efccd1d228f743baa7c2d2f9f49 (diff)
OSSL_HTTP_REQ_CTX_nbio(): Fix parsing of responses with status code != 200
This way keep-alive is not (needlessly) cancelled on error. Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/17171)
Diffstat (limited to 'crypto/http')
-rw-r--r--crypto/http/http_client.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/crypto/http/http_client.c b/crypto/http/http_client.c
index 0e47dbbd92..45e92cd7fd 100644
--- a/crypto/http/http_client.c
+++ b/crypto/http/http_client.c
@@ -624,7 +624,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
/* fall through */
default:
rctx->state = OHS_ERROR;
- return 0;
+ goto next_line;
}
}
key = (char *)rctx->buf;
@@ -683,11 +683,6 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
if (*p != '\0') /* not end of headers */
goto next_line;
- if (rctx->expected_ct != NULL && !found_expected_ct) {
- ERR_raise_data(ERR_LIB_HTTP, HTTP_R_MISSING_CONTENT_TYPE,
- "expected=%s", rctx->expected_ct);
- return 0;
- }
if (rctx->keep_alive != 0 /* do not let server initiate keep_alive */
&& !found_keep_alive /* otherwise there is no change */) {
if (rctx->keep_alive == 2) {
@@ -698,6 +693,14 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
rctx->keep_alive = 0;
}
+ if (rctx->state == OHS_ERROR)
+ return 0;
+
+ if (rctx->expected_ct != NULL && !found_expected_ct) {
+ ERR_raise_data(ERR_LIB_HTTP, HTTP_R_MISSING_CONTENT_TYPE,
+ "expected=%s", rctx->expected_ct);
+ return 0;
+ }
if (rctx->state == OHS_REDIRECT) {
/* http status code indicated redirect but there was no Location */
ERR_raise(ERR_LIB_HTTP, HTTP_R_MISSING_REDIRECT_LOCATION);