root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Dr. David von Oheimb 2021-11-30 16:44:59 +01:00 committed by Dr. David von Oheimb
parent e2b7dc353b
commit 38288f424f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crypto/http/http_client.c
View File

@ -624,7 +624,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
/* fall through */ /* fall through */
default: default:
rctx->state = OHS_ERROR; rctx->state = OHS_ERROR;
return 0; goto next_line;
} }
} }
key = (char *)rctx->buf; 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 */ if (*p != '\0') /* not end of headers */
goto next_line; 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 */ if (rctx->keep_alive != 0 /* do not let server initiate keep_alive */
&& !found_keep_alive /* otherwise there is no change */) { && !found_keep_alive /* otherwise there is no change */) {
if (rctx->keep_alive == 2) { if (rctx->keep_alive == 2) {
@ -698,6 +693,14 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
rctx->keep_alive = 0; 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) { if (rctx->state == OHS_REDIRECT) {
/* http status code indicated redirect but there was no Location */ /* http status code indicated redirect but there was no Location */
ERR_raise(ERR_LIB_HTTP, HTTP_R_MISSING_REDIRECT_LOCATION); ERR_raise(ERR_LIB_HTTP, HTTP_R_MISSING_REDIRECT_LOCATION);