Scott Barrett added support for CURLOPT_NOBODY over SFTP

diff --git a/CHANGES b/CHANGES
index 4a528958f923fc35d55201f6b4384d239f0d6ec6..e55bd540ad91efa76cd645356705df0dd420bbc0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 
                                   Changelog
 
+Daniel Stenberg (3 Apr 2008)
+- Scott Barrett added support for CURLOPT_NOBODY over SFTP
+
 Daniel Fandrich (3 Apr 2008)
 - Made sure that curl_global_init is called in all the multithreaded
   example programs.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e972949873c4f17b184adc6758778ad59cf225c0..19a053ea1ece5872f715282c05797cc7f40da6c3 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -11,6 +11,7 @@ Curl and libcurl 7.18.2
 This release includes the following changes:
  
  o CURLFORM_STREAM was added
+ o CURLOPT_NOBODY is now supported over SFTP
 
 This release includes the following bugfixes:
 
@@ -31,6 +32,6 @@ New curl mirrors:
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- 
+ Michal Marek, Daniel Fandrich, Scott Barrett
 
         Thanks! (and sorry if I forgot to mention someone)

diff --git a/TODO-RELEASE b/TODO-RELEASE
index 527778cc45fa5d5850e2186b97c4720f26dd0481..1a6e188460d4e64c658277f11afbb8aeacc0f775 100644 (file)
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,8 +7,6 @@ To be addressed before 7.18.2 (planned release: June 2008)
 
 130 - Vincent Le Normand's SFTP patch for touch (lacking feedback)
 
-131 - Scott Barrett's Support for CURLOPT_NOBODY with SFTP
-
 133 - Setting CURLOPT_NOBODY to "false" causes cURL to wait for content if a
       content-length header is read
 

diff --git a/lib/ssh.c b/lib/ssh.c
index b238e9c3bc18f5fa27e200767e50123421835a03..5d82b53c237e3f4332324fb96920c995d7d22751 100644 (file)
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -1180,7 +1180,9 @@ static CURLcode ssh_statemach_act(struct connectdata *conn)
     if(data->set.upload)
       state(conn, SSH_SFTP_UPLOAD_INIT);
     else {
-      if(sftp_scp->path[strlen(sftp_scp->path)-1] == '/')
+      if(data->set.opt_no_body)
+        state(conn, SSH_STOP);
+      else if(sftp_scp->path[strlen(sftp_scp->path)-1] == '/')
         state(conn, SSH_SFTP_READDIR_INIT);
       else
         state(conn, SSH_SFTP_DOWNLOAD_INIT);