aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPrzemysław Tomaszewski <p.tomaszewski.mail@gmail.com>2018-09-04 08:44:34 +0200
committerDaniel Stenberg <daniel@haxx.se>2018-09-04 11:00:17 +0200
commitdaa3c450d066bbecd76272f7ada7e80f51e2fab5 (patch)
tree5ac52ccc33ba8769a74bc039c2a1c51e2bdb20e6 /lib
parent52c13d6328ff56b2d2e8313e88cfdfc78acda365 (diff)
sftp: don't send post-qoute sequence when retrying a connection
Fixes #2939 Closes #2940
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh-libssh.c5
-rw-r--r--lib/ssh.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/ssh-libssh.c b/lib/ssh-libssh.c
index 002e1d96f..88f3aa63e 100644
--- a/lib/ssh-libssh.c
+++ b/lib/ssh-libssh.c
@@ -2390,8 +2390,9 @@ static CURLcode sftp_done(struct connectdata *conn, CURLcode status,
/* Post quote commands are executed after the SFTP_CLOSE state to avoid
errors that could happen due to open file handles during POSTQUOTE
operation */
- if(!status && !premature && conn->data->set.postquote) {
- sshc->nextstate = SSH_SFTP_POSTQUOTE_INIT;
+ if(!status && !premature && conn->data->set.postquote &&
+ !conn->bits.retry) {
+ sshc->nextstate = SSH_SFTP_POSTQUOTE_INIT;
state(conn, SSH_SFTP_CLOSE);
}
else
diff --git a/lib/ssh.c b/lib/ssh.c
index 0aaba9a6a..a4b2ca43a 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -3219,7 +3219,8 @@ static CURLcode sftp_done(struct connectdata *conn, CURLcode status,
/* Post quote commands are executed after the SFTP_CLOSE state to avoid
errors that could happen due to open file handles during POSTQUOTE
operation */
- if(!status && !premature && conn->data->set.postquote) {
+ if(!status && !premature && conn->data->set.postquote &&
+ !conn->bits.retry) {
sshc->nextstate = SSH_SFTP_POSTQUOTE_INIT;
state(conn, SSH_SFTP_CLOSE);
}