Skip to content

Increase the last chunk timeout in uploads #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 10, 2016
Merged

Increase the last chunk timeout in uploads #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d83efa
Increase the last chunk timeout in uploads
jabarros Sep 20, 2016
6c3374c
Update Jackrabbit-WebDAV version
davivel Sep 27, 2016
af4adbe
update Android gradle plugin
AndyScherzinger Oct 17, 2016
70228c3
set plugin version to 2.2.0
AndyScherzinger Oct 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file renamed libs/jackrabbit-webdav-2.12.2.jar → libs/jackrabbit-webdav-2.12.4.jar
View file
Open in desktop
Binary file not shown.
12 changes: 11 additions & 1 deletion src/com/owncloud/android/lib/resources/files/ChunkedUploadRemoteFileOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@


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";
Expand Down Expand Up @@ -114,6 +116,14 @@ protected int uploadFile(OwnCloudClient client) throws IOException {
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) {
Expand Down