summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPatrick Monnerat <patrick@monnerat.net>2018-03-08 01:39:29 +0100
committerPatrick Monnerat <patrick@monnerat.net>2018-03-08 01:39:29 +0100
commit82f0508099b14710499a32f40c7ef8fa1837e4fd (patch)
treee7f1546e91849744fbc4baabc26eedc79567e30c /src
parentb2afc36da19f9e9a169b3708683677d716c2f97a (diff)
downloadcurl-82f0508099b14710499a32f40c7ef8fa1837e4fd.tar.gz
curl tool: accept --compressed also if Brotli is enabled and zlib is not.
Diffstat (limited to 'src')
-rw-r--r--src/tool_getparam.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index c6b1a0d6f..7ce9c28c7 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -655,7 +655,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
break;
case 'j': /* --compressed */
- if(toggle && !(curlinfo->features & CURL_VERSION_LIBZ))
+ if(toggle &&
+ !(curlinfo->features & (CURL_VERSION_LIBZ | CURL_VERSION_BROTLI)))
return PARAM_LIBCURL_DOESNT_SUPPORT;
config->encoding = toggle;
break;