From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 14 Dec 2020 13:10:33 +0000 (+0100)
Subject: setopt: adjust to Hyper and disabled HTTP builds
X-Git-Tag: curl-7_75_0~217
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edc89839be4b70a3e383f77acf9e0e4c19db5de8;p=thirdparty%2Fcurl.git

setopt: adjust to Hyper and disabled HTTP builds
---

diff --git a/lib/setopt.c b/lib/setopt.c
index 58956c1e95..b8fc4e8da5 100644
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -274,11 +274,13 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
      * Do not include the body part in the output data stream.
      */
     data->set.opt_no_body = (0 != va_arg(param, long)) ? TRUE : FALSE;
+#ifndef CURL_DISABLE_HTTP
     if(data->set.opt_no_body)
       /* in HTTP lingo, no body means using the HEAD request... */
       data->set.method = HTTPREQ_HEAD;
     else if(data->set.method == HTTPREQ_HEAD)
       data->set.method = HTTPREQ_GET;
+#endif
     break;
   case CURLOPT_FAILONERROR:
     /*
@@ -865,7 +867,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
       ;
     else
 #endif
-#ifndef USE_NGHTTP2
+#if !defined(USE_NGHTTP2) && !defined(USE_HYPER)
     if(arg >= CURL_HTTP_VERSION_2)
       return CURLE_UNSUPPORTED_PROTOCOL;
 #else