Made CURLOPT_UPLOAD and CURLOPT_PUT mean the same thing internally (the

previous difference was not clear nor documented properly). They can now both
be used interchangeably, but we prefer UPLOAD to PUT since it is a more
generic term.

diff --git a/lib/url.c b/lib/url.c
index e11d586..f66f70a 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -499,8 +499,10 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...)
     data->set.http_fail_on_error = va_arg(param, long)?TRUE:FALSE;
     break;
   case CURLOPT_UPLOAD:
+  case CURLOPT_PUT:
     /*
-     * We want to sent data to the remote host
+     * We want to sent data to the remote host. If this is HTTP, that equals
+     * using the PUT request.
      */
     data->set.upload = va_arg(param, long)?TRUE:FALSE;
     if(data->set.upload)
@@ -583,14 +585,6 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...)
      */
     data->set.ftp_ascii = va_arg(param, long)?TRUE:FALSE;
     break;
-  case CURLOPT_PUT:
-    /*
-     * Use the HTTP PUT request to transfer data if this is TRUE.  If this is
-     * FALSE, don't set the httpreq. We can't know what to revert it to!
-     */
-    if(va_arg(param, long))
-      data->set.httpreq = HTTPREQ_PUT;
-    break;
   case CURLOPT_TIMECONDITION:
     /*
      * Set HTTP time condition. This must be one of the defines in the