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.

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

[stable25] Detect aborted connection in OC\Files\View and stop writing data to the output buffer #40233

Merged
merged 3 commits into from
Sep 5, 2023

Conversation

come-nc
Copy link
Contributor

@come-nc come-nc commented Sep 4, 2023

Summary

When reading a video through a public link, and moving the time picker to different times in the video, each request keeps running after being aborted by the web browser and that overloads the server.
This is not the same as sabre-io/http#207 because in this case the download does not go through dav.

Checklist

 output buffer

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc added the 3. to review Waiting for reviews label Sep 4, 2023
@come-nc come-nc added this to the Nextcloud 25.0.11 milestone Sep 4, 2023
@come-nc come-nc self-assigned this Sep 4, 2023
@come-nc come-nc force-pushed the fix/fix-video-seeking-public-link branch from 4f9a3de to fe766dc Compare September 4, 2023 14:41
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc force-pushed the fix/fix-video-seeking-public-link branch from fe766dc to 168b07d Compare September 4, 2023 14:45
@come-nc come-nc requested review from AndyScherzinger, a team, ArtificialOwl, Fenn-CS and sorbaugh and removed request for a team September 4, 2023 14:54
@come-nc
Copy link
Contributor Author

come-nc commented Sep 4, 2023

/backport to stable26

@come-nc
Copy link
Contributor Author

come-nc commented Sep 4, 2023

/backport to stable27

@come-nc
Copy link
Contributor Author

come-nc commented Sep 4, 2023

/backport to master

lib/private/Files/View.php Outdated Show resolved Hide resolved
lib/private/Files/View.php Outdated Show resolved Hide resolved
lib/private/Files/View.php Outdated Show resolved Hide resolved
lib/private/Files/View.php Outdated Show resolved Hide resolved
lib/private/Files/View.php Outdated Show resolved Hide resolved
Co-authored-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
Signed-off-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc force-pushed the fix/fix-video-seeking-public-link branch from aef1115 to 6b2580d Compare September 5, 2023 12:36
@blizzz blizzz mentioned this pull request Sep 5, 2023
@blizzz blizzz removed the 3. to review Waiting for reviews label Sep 5, 2023
@blizzz blizzz added the 4. to release Ready to be released and/or waiting for tests to finish label Sep 5, 2023
@blizzz blizzz merged commit cb607b5 into stable25 Sep 5, 2023
29 of 30 checks passed
@blizzz blizzz deleted the fix/fix-video-seeking-public-link branch September 5, 2023 16:54
@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to master failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout master
git pull origin master

# Create the new backport branch
git checkout -b fix/foo-master

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-master

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug performance 🚀
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants