From: Daniel Stenberg Date: Mon, 23 Aug 2021 07:58:54 +0000 (+0200) Subject: setopt: enable CURLOPT_IGNORE_CONTENT_LENGTH for hyper X-Git-Tag: curl-7_79_0~72 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46d4373ea7a0c2306daacdfb5825862cd94ff764;p=thirdparty%2Fcurl.git setopt: enable CURLOPT_IGNORE_CONTENT_LENGTH for hyper Since this option is also used for FTP, it needs to work to set for applications even if hyper doesn't support it for HTTP. Verified by test 1137. Updated docs to specify that the option doesn't work for HTTP when using the hyper backend. Closes #7614 --- diff --git a/docs/cmdline-opts/ignore-content-length.d b/docs/cmdline-opts/ignore-content-length.d index cec990a8d6..2555ccaaef 100644 --- a/docs/cmdline-opts/ignore-content-length.d +++ b/docs/cmdline-opts/ignore-content-length.d @@ -10,4 +10,4 @@ files larger than 2 gigabytes. For FTP (since 7.46.0), skip the RETR command to figure out the size before downloading a file. -This option doesn't work if libcurl was built to use hyper for HTTP. +This option doesn't work for HTTP if libcurl was built to use hyper. diff --git a/docs/libcurl/opts/CURLOPT_IGNORE_CONTENT_LENGTH.3 b/docs/libcurl/opts/CURLOPT_IGNORE_CONTENT_LENGTH.3 index 56e9ec9543..1465832a43 100644 --- a/docs/libcurl/opts/CURLOPT_IGNORE_CONTENT_LENGTH.3 +++ b/docs/libcurl/opts/CURLOPT_IGNORE_CONTENT_LENGTH.3 @@ -61,7 +61,7 @@ if(curl) { .fi .SH AVAILABILITY Added in 7.14.1. Support for FTP added in 7.46.0. This option is not working -for the hyper backend. +for HTTP when libcurl is built to use the hyper backend. .SH RETURN VALUE Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not. .SH "SEE ALSO" diff --git a/lib/setopt.c b/lib/setopt.c index 076fe5f59c..08827d1ef9 100644 --- a/lib/setopt.c +++ b/lib/setopt.c @@ -2370,12 +2370,8 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) break; case CURLOPT_IGNORE_CONTENT_LENGTH: -#ifndef USE_HYPER data->set.ignorecl = (0 != va_arg(param, long)) ? TRUE : FALSE; break; -#else - return CURLE_NOT_BUILT_IN; -#endif case CURLOPT_CONNECT_ONLY: /* diff --git a/tests/data/DISABLED b/tests/data/DISABLED index 80e9b4ec6e..5aaec2b209 100644 --- a/tests/data/DISABLED +++ b/tests/data/DISABLED @@ -86,7 +86,6 @@ 1129 1130 1131 -1137 1144 1156 1160