Immanuel Gregoire fixed a problem with persistent transfers over SFTP - the

previous proto struct was kept.

diff --git a/CHANGES b/CHANGES
index fb3646be94c9928404fca25b169ce464f3f7fbd2..a53e60f8ea37d324a1775dddd7d7838673b33b92 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 
                                   Changelog
 
+Daniel S (29 September 2007)
+- Immanuel Gregoire fixed a problem with persistent transfers over SFTP.
+
 Daniel S (28 September 2007)
 - Adapted the c-ares code to the API change c-ares 1.5.0 brings in the
   notifier callback(s).

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c6e666decf8d59f1d9f9e0cbf56ad1ed8b4b66c7..5618ae5028b483ad88cc7edfbf10cc932a89ef81 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -27,6 +27,7 @@ This release includes the following bugfixes:
  o --ftp-method nocwd on directory listings
  o FTP, CURLOPT_NOBODY enabled and CURLOPT_HEADER disabled now does TYPE
    before SIZE
+ o persistent transfers over SFTP
 
 This release includes the following known bugs:
 

diff --git a/lib/ssh.c b/lib/ssh.c
index b7da3bff3cece468901dc577a51e77f5e4b2cf07..d56eb855c05b5f01902c406f96bce95dde9ae4d2 100644 (file)
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -1765,6 +1765,11 @@ CURLcode Curl_ssh_connect(struct connectdata *conn, bool *done)
   CURLcode result;
   struct SessionHandle *data = conn->data;
 
+  if (data->reqdata.proto.ssh) {
+    Curl_safefree(data->reqdata.proto.ssh);
+    data->reqdata.proto.ssh = NULL;
+  }
+
   result = ssh_init(conn);
   if (result)
     return result;