From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 27 Jul 2020 09:44:01 +0000 (+0200)
Subject: setopt: unset NOBODY switches to GET if still HEAD
X-Git-Tag: curl-7_72_0~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91cb16b21faa556d4467399781379ad3abafd3fe;p=thirdparty%2Fcurl.git

setopt: unset NOBODY switches to GET if still HEAD

Unsetting CURLOPT_NOBODY with 0L when doing HTTP has no documented
action but before 7.71.0 that used to switch back to GET and with this
change (assuming the method is still set to HEAD) this behavior is
brought back.

Reported-by: causal-agent on github
Fixes #5725
Closes #5728
---

diff --git a/lib/setopt.c b/lib/setopt.c
index 90edf6aa7a..d6213357cc 100644
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -274,6 +274,8 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
     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;
     break;
   case CURLOPT_FAILONERROR:
     /*