1 files changed, 8 insertions, 4 deletions
diff --git a/lib/url.c b/lib/url.c
index 7a69ff691..58965123a 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -342,7 +342,8 @@ CURLcode curl_setopt(CURL *curl, CURLoption option, ...)
     break;
   case CURLOPT_POST:
     data->bits.http_post = va_arg(param, long)?TRUE:FALSE;
-    data->httpreq = HTTPREQ_POST;
+    if(data->bits.http_post)
+      data->httpreq = HTTPREQ_POST;
     break;
   case CURLOPT_FILETIME:
     data->bits.get_filetime = va_arg(param, long)?TRUE:FALSE;
@@ -364,7 +365,8 @@ CURLcode curl_setopt(CURL *curl, CURLoption option, ...)
     break;
   case CURLOPT_PUT:
     data->bits.http_put = va_arg(param, long)?TRUE:FALSE;
-    data->httpreq = HTTPREQ_PUT;
+    if(data->bits.http_put)
+      data->httpreq = HTTPREQ_PUT;
     break;
   case CURLOPT_MUTE:
     data->bits.mute = va_arg(param, long)?TRUE:FALSE;
@@ -406,12 +408,14 @@ CURLcode curl_setopt(CURL *curl, CURLoption option, ...)
     break;
   case CURLOPT_CUSTOMREQUEST:
     data->customrequest = va_arg(param, char *);
-    data->httpreq = HTTPREQ_CUSTOM;
+    if(data->customrequest)
+      data->httpreq = HTTPREQ_CUSTOM;
     break;
   case CURLOPT_HTTPPOST:
     data->httppost = va_arg(param, struct HttpPost *);
     data->bits.http_formpost = data->httppost?1:0;
-    data->httpreq = HTTPREQ_POST_FORM;
+    if(data->bits.http_formpost)
+      data->httpreq = HTTPREQ_POST_FORM;
     break;
   case CURLOPT_INFILE:
     data->in = va_arg(param, FILE *);