David McCreedy fixed a remaining mistake from the August 19 TYPE change.

This commit is contained in:
Daniel Stenberg 2006-08-22 21:23:25 +00:00
parent d792937686
commit bdbd0cf27a
3 changed files with 4 additions and 2 deletions

View File

@ -7,6 +7,8 @@
Changelog
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
code when doing pure ipv6 EPRT connections.

View File

@ -34,6 +34,6 @@ This release would not have looked like this without help, code, reports and
advice from friends like these:
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)

View File

@ -170,7 +170,7 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp)
*nreadp = nread;
#ifdef CURL_DOES_CONVERSIONS
if(data->ftp_in_ascii_mode) {
if(data->set.prefer_ascii) {
CURLcode res;
res = Curl_convert_to_network(data, conn->upload_fromhere, nread);
/* Curl_convert_to_network calls failf if unsuccessful */