mirror of https://github.com/moparisthebest/curl
Fixed some problems with SFTP range support to fix test cases 634 through 637.
This commit is contained in:
parent
3f2de3d101
commit
7ff38c14a9
4
CHANGES
4
CHANGES
|
@ -6,6 +6,10 @@
|
||||||
|
|
||||||
Changelog
|
Changelog
|
||||||
|
|
||||||
|
Daniel Fandrich (21 Oct 2008)
|
||||||
|
- Fixed some problems with SFTP range support to fix test cases 634 through
|
||||||
|
637.
|
||||||
|
|
||||||
Daniel Fandrich (17 Oct 2008)
|
Daniel Fandrich (17 Oct 2008)
|
||||||
- Fixed a compile error reported by Albert Chin on AIX and IRIX when using
|
- Fixed a compile error reported by Albert Chin on AIX and IRIX when using
|
||||||
GTLS.
|
GTLS.
|
||||||
|
|
|
@ -15,8 +15,6 @@ Awaiting feedback, updates or removal:
|
||||||
|
|
||||||
182 - Make CURLINFO_LASTSOCKET accessible during perform
|
182 - Make CURLINFO_LASTSOCKET accessible during perform
|
||||||
|
|
||||||
187 - Failing SFTP range tests cases 634 through 637
|
|
||||||
|
|
||||||
Patches pending commit:
|
Patches pending commit:
|
||||||
|
|
||||||
183 - "libcurl issue with IPv6 and c-ares"
|
183 - "libcurl issue with IPv6 and c-ares"
|
||||||
|
|
18
lib/ssh.c
18
lib/ssh.c
|
@ -1644,11 +1644,21 @@ static CURLcode ssh_statemach_act(struct connectdata *conn)
|
||||||
while(ptr && *ptr && (isspace((int)*ptr) || (*ptr=='-')))
|
while(ptr && *ptr && (isspace((int)*ptr) || (*ptr=='-')))
|
||||||
ptr++;
|
ptr++;
|
||||||
to=curlx_strtoofft(ptr, &ptr2, 0);
|
to=curlx_strtoofft(ptr, &ptr2, 0);
|
||||||
if ((ptr == ptr2) /* no "to" value given */
|
if((ptr == ptr2) /* no "to" value given */
|
||||||
|| (to > size)) {
|
|| (to >= size)) {
|
||||||
to = size;
|
to = size - 1;
|
||||||
}
|
}
|
||||||
if (from > to) {
|
if(from < 0) {
|
||||||
|
/* from is relative to end of file */
|
||||||
|
from += size;
|
||||||
|
}
|
||||||
|
if(from >= size) {
|
||||||
|
failf(data, "Offset (%"
|
||||||
|
FORMAT_OFF_T ") was beyond file size (%" FORMAT_OFF_T ")",
|
||||||
|
from, attrs.filesize);
|
||||||
|
return CURLE_BAD_DOWNLOAD_RESUME;
|
||||||
|
}
|
||||||
|
if(from > to) {
|
||||||
from = to;
|
from = to;
|
||||||
size = 0;
|
size = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,3 @@
|
||||||
# test cases are run by runtests.pl. Just add the plain test case numbers, one
|
# test cases are run by runtests.pl. Just add the plain test case numbers, one
|
||||||
# per line.
|
# per line.
|
||||||
# Lines starting with '#' letters are treated as comments.
|
# Lines starting with '#' letters are treated as comments.
|
||||||
634
|
|
||||||
635
|
|
||||||
636
|
|
||||||
637
|
|
||||||
|
|
Loading…
Reference in New Issue