From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 4 Feb 2020 16:32:55 +0000 (+0100)
Subject: curl: error on --alt-svc use w/o support
X-Git-Tag: curl-7_69_0~141
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cc97ba6e42820ad0d8d69ba101b3b830aa1316d;p=thirdparty%2Fcurl.git

curl: error on --alt-svc use w/o support

Make the tool check for alt-svc support at run-time and return error
accordingly if not present when the option is used.

Reported-by: Harry Sintonen
Closes #4878
---

diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index 1a72edf3ee..764caa203a 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -1278,7 +1278,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
     case 'b':
       switch(subletter) {
       case 'a': /* --alt-svc */
-        GetStr(&config->altsvc, nextarg);
+        if(curlinfo->features & CURL_VERSION_ALTSVC)
+          GetStr(&config->altsvc, nextarg);
+        else
+          return PARAM_LIBCURL_DOESNT_SUPPORT;
         break;
       default:  /* --cookie string coming up: */
         if(nextarg[0] == '@') {
diff --git a/src/tool_operate.c b/src/tool_operate.c
index 2855f0f8f8..4b3caa80c9 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -1966,11 +1966,8 @@ static CURLcode single_transfer(struct GlobalConfig *global,
         if(config->disallow_username_in_url)
           my_setopt(curl, CURLOPT_DISALLOW_USERNAME_IN_URL, 1L);
 
-#ifdef USE_ALTSVC
-        /* only if explicitly enabled in configure */
         if(config->altsvc)
           my_setopt_str(curl, CURLOPT_ALTSVC, config->altsvc);
-#endif
 
 #ifdef USE_METALINK
         if(!metalink && config->use_metalink) {