Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Fix race conditions in FTP socket closure that cause intermittent errors #17540

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
Loading
from
+137 −1
Open

Fix race conditions in FTP socket closure that cause intermittent errors #17540

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e571e75
Fix race conditions in FTP close
ViRb3 Oct 3, 2025
e84e5ee
Improvements in FTPSocket
ViRb3 Oct 3, 2025
c79862d
Fix constant flushing in FTPSocket
ViRb3 Oct 3, 2025
ad035ed
Replace buffered with proxy streams in FTPSocket
ViRb3 Oct 5, 2025
b227e01
Surface critical errors in FTPSocket
ViRb3 Oct 5, 2025
352e11c
Fix read amplification in FTPSocket
ViRb3 Oct 5, 2025
47b7033
Refactor FTPSocket to address comments
ViRb3 Oct 9, 2025
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
Prev Previous commit
Next Next commit
Replace buffered with proxy streams in FTPSocket
  • Loading branch information
@ViRb3
ViRb3 committed Oct 5, 2025
commit ad035ed11771c541f40477bf37c6ee4ae8c4eada
12 changes: 4 additions & 8 deletions 12 ftp/src/main/java/ch/cyberduck/core/ftp/FTPSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@
* Bug fixes, suggestions and comments should be sent to feedback@cyberduck.ch
*/

import ch.cyberduck.core.preferences.PreferencesFactory;

import org.apache.commons.io.input.ProxyInputStream;
import org.apache.commons.io.output.ProxyOutputStream;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
Expand Down Expand Up @@ -137,8 +135,7 @@ public SocketChannel getChannel() {
@Override
public synchronized OutputStream getOutputStream() throws IOException {
if(outputStreamWrapper == null) {
outputStreamWrapper = new BufferedOutputStream(delegate.getOutputStream(),
PreferencesFactory.get().getInteger("connection.buffer")) {
outputStreamWrapper = new ProxyOutputStream(delegate.getOutputStream()) {
@Override
public void close() throws IOException {
try {
Expand All @@ -162,8 +159,7 @@ public void close() throws IOException {
@Override
public synchronized InputStream getInputStream() throws IOException {
if(inputStreamWrapper == null) {
inputStreamWrapper = new BufferedInputStream(delegate.getInputStream(),
PreferencesFactory.get().getInteger("connection.buffer")) {
inputStreamWrapper = new ProxyInputStream(delegate.getInputStream()) {
@Override
public void close() throws IOException {
// Stream close will call Socket.close(), so override it with ours
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.