webdav: add Content-Type to PUT requests - fixes #2664

Before this it was possible hat maxChunkSize was incorrectly set to 200.

backend/jottacloud/jottacloud.go

@@ -464,12 +464,12 @@ func (f *Fs) listFileDir(remoteStartPath string, startFolder *api.JottaFolder, f
 		if folder.Deleted {
 			return nil
 		}
-		folderPath := path.Join(folder.Path, folder.Name)
-		remoteDirLength := len(folderPath) - pathPrefixLength
+		folderPath := restoreReservedChars(path.Join(folder.Path, folder.Name))
+		folderPathLength := len(folderPath)
 		var remoteDir string
-		if remoteDirLength > 0 {
-			remoteDir = restoreReservedChars(folderPath[pathPrefixLength+1:])
-			if remoteDirLength > startPathLength {
+		if folderPathLength > pathPrefixLength {
+			remoteDir = folderPath[pathPrefixLength+1:]
+			if folderPathLength > startPathLength {
 				d := fs.NewDir(remoteDir, time.Time(folder.ModifiedAt))
 				err := fn(d)
 				if err != nil {

backend/opendrive/opendrive.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"mime/multipart"
 	"net/http"
+	"net/url"
 	"path"
 	"strconv"
 	"strings"
@@ -1082,7 +1083,7 @@ func (o *Object) readMetaData() (err error) {
 	err = o.fs.pacer.Call(func() (bool, error) {
 		opts := rest.Opts{
 			Method: "GET",
-			Path:   "/folder/itembyname.json/" + o.fs.session.SessionID + "/" + directoryID + "?name=" + rest.URLPathEscape(replaceReservedChars(leaf)),
+			Path:   "/folder/itembyname.json/" + o.fs.session.SessionID + "/" + directoryID + "?name=" + url.QueryEscape(replaceReservedChars(leaf)),
 		}
 		resp, err = o.fs.srv.CallJSON(&opts, nil, &folderList)
 		return o.fs.shouldRetry(resp, err)

backend/webdav/webdav.go

@@ -968,6 +968,7 @@ func (o *Object) Update(in io.Reader, src fs.ObjectInfo, options ...fs.OpenOptio
 		Body:          in,
 		NoResponse:    true,
 		ContentLength: &size, // FIXME this isn't necessary with owncloud - See https://github.com/nextcloud/nextcloud-snap/issues/365
+		ContentType:   fs.MimeType(src),
 	}
 	if o.fs.useOCMtime {
 		opts.ExtraHeaders = map[string]string{

fs/version.go

@@ -1,4 +1,4 @@
 package fs
 
 // Version of rclone
-var Version = "v1.44"
+var Version = "v1.44-DEV"

fstest/fstests/fstests.go

@@ -540,16 +540,13 @@ func Run(t *testing.T, opt *Opt) {
 			minChunkSize = opt.ChunkedUpload.CeilChunkSize(minChunkSize)
 		}
 
-		maxChunkSize := opt.ChunkedUpload.MaxChunkSize
-		if maxChunkSize < minChunkSize {
-			if minChunkSize <= fs.MebiByte {
-				maxChunkSize = 2 * fs.MebiByte
-			} else {
-				maxChunkSize = 2 * minChunkSize
-			}
-		} else if maxChunkSize >= 2*minChunkSize {
+		maxChunkSize := 2 * fs.MebiByte
+		if maxChunkSize < 2*minChunkSize {
 			maxChunkSize = 2 * minChunkSize
 		}
+		if opt.ChunkedUpload.MaxChunkSize > 0 && maxChunkSize > opt.ChunkedUpload.MaxChunkSize {
+			maxChunkSize = opt.ChunkedUpload.MaxChunkSize
+		}
 		if opt.ChunkedUpload.CeilChunkSize != nil {
 			maxChunkSize = opt.ChunkedUpload.CeilChunkSize(maxChunkSize)
 		}