From 38941ad6f315b9277833df74b9feb6b2df3f50e2 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 23 Aug 2021 13:04:59 +0200 Subject: c-hyper: deal with Expect: 100-continue combined with POSTFIELDS Enable test 1130 and 1131 Closes #7616 --- lib/c-hyper.c | 14 +++++++++++--- tests/data/DISABLED | 2 -- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/c-hyper.c b/lib/c-hyper.c index 5cb04bb3e..f17180bc8 100644 --- a/lib/c-hyper.c +++ b/lib/c-hyper.c @@ -203,11 +203,9 @@ static int hyper_body_chunk(void *userdata, const hyper_buf *chunk) } else { /* >= 4xx */ k->exp100 = EXP100_FAILED; - done = TRUE; } } - if(data->state.hconnect && - (data->req.httpcode/100 != 2)) { + if(data->state.hconnect && (data->req.httpcode/100 != 2)) { done = TRUE; result = CURLE_OK; } @@ -596,6 +594,16 @@ static int uploadpostfields(void *userdata, hyper_context *ctx, { struct Curl_easy *data = (struct Curl_easy *)userdata; (void)ctx; + if(data->req.exp100 > EXP100_SEND_DATA) { + if(data->req.exp100 == EXP100_FAILED) + return HYPER_POLL_ERROR; + + /* still waiting confirmation */ + if(data->hyp.exp100_waker) + hyper_waker_free(data->hyp.exp100_waker); + data->hyp.exp100_waker = hyper_context_waker(ctx); + return HYPER_POLL_PENDING; + } if(data->req.upload_done) *chunk = NULL; /* nothing more to deliver */ else { diff --git a/tests/data/DISABLED b/tests/data/DISABLED index d5f1b7087..301de6c70 100644 --- a/tests/data/DISABLED +++ b/tests/data/DISABLED @@ -78,8 +78,6 @@ 1123 1125 1129 -1130 -1131 1144 1156 1160 -- cgit v1.2.1