From 651a75e1e71be0eeb27cbfa041225a725debef9e Mon Sep 17 00:00:00 2001 From: Peng-Yu Chen Date: Mon, 10 May 2021 23:50:27 +0100 Subject: [PATCH] http2: use nghttp2_session_upgrade2 instead of nghttp2_session_upgrade Following the upstream deprecation of nghttp2_session_upgrade. Also provides further checks for requests with the HEAD method. Closes #7041 --- lib/http2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/http2.c b/lib/http2.c index 03c101e35..661a4cbab 100644 --- a/lib/http2.c +++ b/lib/http2.c @@ -2273,10 +2273,10 @@ CURLcode Curl_http2_switched(struct Curl_easy *data, /* stream 1 is opened implicitly on upgrade */ stream->stream_id = 1; /* queue SETTINGS frame (again) */ - rv = nghttp2_session_upgrade(httpc->h2, httpc->binsettings, - httpc->binlen, NULL); + rv = nghttp2_session_upgrade2(httpc->h2, httpc->binsettings, httpc->binlen, + data->state.httpreq == HTTPREQ_HEAD, NULL); if(rv) { - failf(data, "nghttp2_session_upgrade() failed: %s(%d)", + failf(data, "nghttp2_session_upgrade2() failed: %s(%d)", nghttp2_strerror(rv), rv); return CURLE_HTTP2; }