Skip to content

Fix #80880: SSL_read on shutdown, ftp/proc_open #6803

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

Closed
wants to merge 4 commits into from
Closed

Fix #80880: SSL_read on shutdown, ftp/proc_open #6803

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7ffba2
Fix #80880: SSL_read on shutdown, ftp/proc_open
cmb69 Mar 24, 2021
2ad2e90
Only break on WSAECONNABORTED
cmb69 Mar 25, 2021
c163f26
Unconditionally bail out on SSL_ERROR_SYSCALL
cmb69 Mar 30, 2021
ed62588
Clarify comment
cmb69 Apr 6, 2021
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
6 changes: 6 additions & 0 deletions ext/ftp/ftp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1931,6 +1931,12 @@ static void ftp_ssl_shutdown(ftpbuf_t *ftp, php_socket_t fd, SSL *ssl_handle) {
/* SSL wants a write. Really odd. Let's bail out. */
done = 1;
break;
case SSL_ERROR_SYSCALL:
/* most likely the peer closed the connection without
sending a close_notify shutdown alert;
bail out to avoid raising a spurious warning */
done = 1;
break;
default:
if ((sslerror = ERR_get_error())) {
ERR_error_string_n(sslerror, buf, sizeof(buf));
Expand Down