Merge pull request #1798 from dopplershift/fix-curl-7.71

Fix for cURL >7.69. Thanks @dopplershift ! Good catch and good find!
Unidata · Jul 22, 2020 · 023fab0 · 023fab0
2 parents cee0a93 + bff8b22
commit 023fab0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -7,6 +7,7 @@ This file contains a high-level description of this package's evolution. Release
 
 ## 4.8.0 - TBD
 
+* [Bug Fix] Fixed byte-range support with cURL > 7.69. See [https://github.com/Unidata/netcdf-c/pull/1798].
 * [Enhancement] Added new test for using compression with parallel I/O: nc_test4/tst_h_par_compress.c. See [https://github.com/Unidata/netcdf-c/pull/1784].
 * [Bug Fix] Don't return error for extra calls to nc_redef() for netCDF/HDF5 files, unless classic model is in use. See [https://github.com/Unidata/netcdf-c/issues/1779].
 * [Enhancement] Added new parallel I/O benchmark program to mimic NOAA UFS data writes, built when --enable-benchmarks is in configure. See [https://github.com/Unidata/netcdf-c/pull/1777].

diff --git a/libdispatch/dhttp.c b/libdispatch/dhttp.c
@@ -377,7 +377,7 @@ execute(NC_HTTP_STATE* state, int headcmd)
     if(cstat != CURLE_OK) state->httpcode = 0;
 
     if(headcmd) {
-        cstat = CURLERR(curl_easy_setopt(state->curl, CURLOPT_NOBODY, 0L));
+        cstat = CURLERR(curl_easy_setopt(state->curl, CURLOPT_HTTPGET, 1L));
         if(cstat != CURLE_OK) goto fail;
     }