Merge pull request #9588 from nextcloud/bugfix/9582/percent-encoding-chunked-uploads

fix(propagateuploadng): do not encode davUrl

Author: nilsding

src/libsync/propagateuploadng.cpp

@@ -25,6 +25,8 @@
 #include <cmath>
 #include <cstring>
 
+using namespace Qt::StringLiterals;
+
 namespace OCC {
 
 constexpr auto relativeUploadsPath = "remote.php/dav/uploads/";
@@ -80,9 +82,9 @@ QUrl PropagateUploadFileNG::chunkUrl(const int chunk) const
 QByteArray PropagateUploadFileNG::destinationHeader() const
 {
     const auto davUrl = Utility::trailingSlashPath(propagator()->account()->davUrl().toString());
-    const auto remotePath = Utility::noLeadingSlashPath(propagator()->fullRemotePath(_fileToUpload._file));
+    const auto remotePath = QUrl::toPercentEncoding(Utility::noLeadingSlashPath(propagator()->fullRemotePath(_fileToUpload._file)), "/"_ba);
     const auto destination = QString(davUrl + remotePath);
-    return QUrl::toPercentEncoding(destination, "/");
+    return destination.toUtf8();
 }
 
 void PropagateUploadFileNG::doStartUpload()

test/testchunkingng.cpp

@@ -151,6 +151,7 @@ private slots:
         QVERIFY(destinationHeader.contains("SQ-0.5%25BF-150"));
         QVERIFY(destinationHeader.contains("/A/SQ-0.5%25BF-150/"));
         QVERIFY(!destinationHeader.contains("%2F"));
+        QVERIFY(destinationHeader.startsWith("http://"));
     }
 
     // Test resuming when there's a confusing chunk added