WARNING! Gitlab maintenance operation scheduled for Monday, 20 April between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.

Unverified Commit daa3c450 authored Sep 04, 2018 by Przemysław Tomaszewski Committed by Daniel Stenberg Sep 04, 2018

sftp: don't send post-qoute sequence when retrying a connection

Fixes #2939
Closes #2940

parent 52c13d63

lib/ssh-libssh.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -2390,7 +2390,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);
		}

lib/ssh.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}