Resume partial writes in gnutls_bye() #596
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lavv17
reviewed
Oct 21, 2020
src/lftp_ssl.cc
Outdated
| if(handshake_done) | ||
| gnutls_bye(session,GNUTLS_SHUT_RDWR); // FIXME - E_AGAIN | ||
| res=gnutls_bye(session,GNUTLS_SHUT_RDWR); |
There was a problem hiding this comment.
move declaration of res here, it's better to declare in a more local scope where it is used
There was a problem hiding this comment.
Do you mean:
Suggested change
| res=gnutls_bye(session,GNUTLS_SHUT_RDWR); | |
| int res=gnutls_bye(session,GNUTLS_SHUT_RDWR); |
And remove int res; from the top of lftp_ssl_gnutls::shutdown()?
lavv17
requested changes
Oct 21, 2020
brozs
commented
Oct 21, 2020
src/lftp_ssl.cc
Outdated
| { | ||
| int res; |
|
Forced push based on your feedback. |
lavv17
reviewed
Oct 21, 2020
| @@ -42,7 +42,7 @@ int IOBufferSSL::Do() | |||
| if(Put_LL("",0)<0) | |||
| return MOVED; | |||
| if(ssl->handshake_done && eof) | |||
| ssl->shutdown(); | |||
| PutEOF_LL(); | |||
lavv17
reviewed
Oct 1, 2021
| @@ -340,10 +340,22 @@ void lftp_ssl_gnutls::load_keys() | |||
| } | |||
| gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, cred); | |||
| } | |||
| void lftp_ssl_gnutls::shutdown() | |||
| int lftp_ssl_gnutls::shutdown() | |||
| { | |||
| if(handshake_done) | |||
Co-authored-by: Štěpán Brož <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request should make lftp resume partial writes that happen in gnutls_bye() on SSL shutdown.
A partial write on SSL shutdown can cause problems with some FTPS servers, e.g. IIS on Windows.
This is my first pull request to lftp, any feedback welcome.