Scott Barrett added support for CURLOPT_NOBODY over SFTP

This commit is contained in:
Daniel Stenberg 2008-04-03 20:56:59 +00:00
parent bf52cef16f
commit d051dd8087
4 changed files with 8 additions and 4 deletions

@ -6,6 +6,9 @@
Changelog Changelog
Daniel Stenberg (3 Apr 2008)
- Scott Barrett added support for CURLOPT_NOBODY over SFTP
Daniel Fandrich (3 Apr 2008) Daniel Fandrich (3 Apr 2008)
- Made sure that curl_global_init is called in all the multithreaded - Made sure that curl_global_init is called in all the multithreaded
example programs. example programs.

@ -11,6 +11,7 @@ Curl and libcurl 7.18.2
This release includes the following changes: This release includes the following changes:
o CURLFORM_STREAM was added o CURLFORM_STREAM was added
o CURLOPT_NOBODY is now supported over SFTP
This release includes the following bugfixes: 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 This release would not have looked like this without help, code, reports and
advice from friends like these: advice from friends like these:
Michal Marek, Daniel Fandrich, Scott Barrett
Thanks! (and sorry if I forgot to mention someone) Thanks! (and sorry if I forgot to mention someone)

@ -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) 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 133 - Setting CURLOPT_NOBODY to "false" causes cURL to wait for content if a
content-length header is read content-length header is read

@ -1180,7 +1180,9 @@ static CURLcode ssh_statemach_act(struct connectdata *conn)
if(data->set.upload) if(data->set.upload)
state(conn, SSH_SFTP_UPLOAD_INIT); state(conn, SSH_SFTP_UPLOAD_INIT);
else { 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); state(conn, SSH_SFTP_READDIR_INIT);
else else
state(conn, SSH_SFTP_DOWNLOAD_INIT); state(conn, SSH_SFTP_DOWNLOAD_INIT);