Skip to content
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

Jump to bottom

[stable15] Fix empty file uploads to S3 (and other streaming storages) #14273

Merged
merged 5 commits into from
Feb 20, 2019
Merged

[stable15] Fix empty file uploads to S3 (and other streaming storages) #14273

merged 5 commits into from
Feb 20, 2019

Conversation

rullzer
Copy link
Member

@rullzer rullzer commented Feb 18, 2019 •
edited by MorrisJobke
Loading

@rullzer rullzer added this to the Nextcloud 15.0.5 milestone Feb 18, 2019
@rullzer
[3rdparty] Bump icewind/streams to 0.7.1
fc8745e 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
Fix empty file uploads to S3
58fd016 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
Add a wrapper to determine if a file is EOF
6bdd9d1 
The stream is already closed at this point. Which means feof will always
return false. We have to determine if the stream is EOF in the
preCloseCallback. And pass this info along. Then the logic works as
expected.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
Make sure that we have a stream
141ea50 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer rullzer force-pushed the backport/14210/stable15 branch from 09a8f05 to 141ea50 Compare February 19, 2019 09:16
@rullzer
Copy link
Member Author

rullzer commented Feb 19, 2019

Rebased

@rullzer rullzer mentioned this pull request Feb 20, 2019
Merged
@rullzer @MorrisJobke
Hanlde writestream not closing source
7cc3486 
Fixes #14298

If a storage doesn'tclose the write stream then $isEOF is not yet set.
So we have to fallback.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@MorrisJobke
Copy link
Member

I added the commit from #14299 as well to this PR 👍

@MorrisJobke MorrisJobke mentioned this pull request Feb 20, 2019
Merged
4 tasks
@rullzer
Copy link
Member Author

rullzer commented Feb 20, 2019

Of course also 👍 from me

@MorrisJobke MorrisJobke mentioned this pull request Feb 20, 2019
Merged
@rullzer rullzer merged commit c9a4f01 into stable15 Feb 20, 2019
@rullzer rullzer deleted the backport/14210/stable15 branch February 20, 2019 14:26
@weirdion weirdion mentioned this pull request Feb 21, 2019
Closed
@algbaer algbaer mentioned this pull request Mar 1, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@icewind1991 icewind1991 Awaiting requested review from icewind1991

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

Assignees
No one assigned
Labels
3. to review Waiting for reviews bug feature: files regression
Projects
None yet
Milestone
Nextcloud 15.0.5
Development

Successfully merging this pull request may close these issues.
2 participants
@rullzer @MorrisJobke