mirror of
https://github.com/moparisthebest/curl
synced 2024-11-11 12:05:06 -05:00
David McCreedy fixed a remaining mistake from the August 19 TYPE change.
This commit is contained in:
parent
d792937686
commit
bdbd0cf27a
2
CHANGES
2
CHANGES
@ -7,6 +7,8 @@
|
|||||||
Changelog
|
Changelog
|
||||||
|
|
||||||
Daniel (22 August 2006)
|
Daniel (22 August 2006)
|
||||||
|
- David McCreedy fixed a remaining mistake from the August 19 TYPE change.
|
||||||
|
|
||||||
- Peter Sylvester pointed out a flaw in the AllowServerConnect() in the FTP
|
- Peter Sylvester pointed out a flaw in the AllowServerConnect() in the FTP
|
||||||
code when doing pure ipv6 EPRT connections.
|
code when doing pure ipv6 EPRT connections.
|
||||||
|
|
||||||
|
@ -34,6 +34,6 @@ This release would not have looked like this without help, code, reports and
|
|||||||
advice from friends like these:
|
advice from friends like these:
|
||||||
|
|
||||||
Domenico Andreoli, Armel Asselin, Gisle Vanem, Yang Tse, Andrew Biggs,
|
Domenico Andreoli, Armel Asselin, Gisle Vanem, Yang Tse, Andrew Biggs,
|
||||||
Peter Sylvester
|
Peter Sylvester, David McCreedy
|
||||||
|
|
||||||
Thanks! (and sorry if I forgot to mention someone)
|
Thanks! (and sorry if I forgot to mention someone)
|
||||||
|
@ -170,7 +170,7 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp)
|
|||||||
*nreadp = nread;
|
*nreadp = nread;
|
||||||
|
|
||||||
#ifdef CURL_DOES_CONVERSIONS
|
#ifdef CURL_DOES_CONVERSIONS
|
||||||
if(data->ftp_in_ascii_mode) {
|
if(data->set.prefer_ascii) {
|
||||||
CURLcode res;
|
CURLcode res;
|
||||||
res = Curl_convert_to_network(data, conn->upload_fromhere, nread);
|
res = Curl_convert_to_network(data, conn->upload_fromhere, nread);
|
||||||
/* Curl_convert_to_network calls failf if unsuccessful */
|
/* Curl_convert_to_network calls failf if unsuccessful */
|
||||||
|
Loading…
Reference in New Issue
Block a user