Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0e989ef authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #19 from nextcloud/upload_bigfiles

Increase the last chunk timeout in uploads
parents 3a81bd5b 70228c3d
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ import java.util.Set;

public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation {

    private static final int LAST_CHUNK_TIMEOUT = 900000; //15 mins.

    public static final long CHUNK_SIZE = 1024000;
    private static final String OC_CHUNKED_HEADER = "OC-Chunked";
    private static final String OC_CHUNK_SIZE_HEADER = "OC-Chunk-Size";
@@ -114,6 +116,14 @@ public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation
                    mPutMethod.abort();
                    // next method will throw an exception
                }

                if (chunkIndex == chunkCount - 1) {
                    // Added a high timeout to the last chunk due to when the last chunk
                    // arrives to the server with the last PUT, all chunks get assembled
                    // within that PHP request, so last one takes longer.
                    mPutMethod.getParams().setSoTimeout(LAST_CHUNK_TIMEOUT);
                }

                status = client.executeMethod(mPutMethod);

                if (status == 400) {