1 files changed, 15 insertions, 2 deletions
diff --git a/lib/http.c b/lib/http.c
index a9b9c5d97..7553b613b 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -429,8 +429,21 @@ CURLcode Curl_http(struct connectdata *conn)
       }
     }
   }
-  if((data->bits.set_range) && !checkheaders(data, "Range:")) {
-    data->ptr_rangeline = aprintf("Range: bytes=%s\015\012", data->range);
+  if(data->bits.set_range) {
+    /*
+     * A range is selected. We use different headers whether we're downloading
+     * or uploading and we always let customized headers override our internal
+     * ones if any such are specified.
+     */
+    if((data->httpreq == HTTPREQ_GET) &&
+       !checkheaders(data, "Range:")) {
+      data->ptr_rangeline = aprintf("Range: bytes=%s\015\012", data->range);
+    }
+    else if((data->httpreq != HTTPREQ_GET) &&
+            !checkheaders(data, "Content-Range:")) {
+      data->ptr_rangeline = aprintf("Content-Range: bytes=%s\015\012",
+                                    data->range);
+    }
   }
   if((data->bits.http_set_referer) && !checkheaders(data, "Referer:")) {
     data->ptr_ref = aprintf("Referer: %s\015\012", data->referer);