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

diff --git a/CHANGES b/CHANGES
index ceffd3609f6f5af2a6f522b9fa5d971060ac76e0..b57bf84b810f3094ab112fe2275ce5f572d089fc 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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.
 

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7b74752db50944c00ff6526fbb114fc10c631818..586c01e0cd033d0903c7ab884cc4e8819f66eaa4 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -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)

diff --git a/lib/transfer.c b/lib/transfer.c
index 9cf9c292540bab62721671e7ebfc69fc8aa8a961..fb1bcb286034980252f696474bf39706d65de3ad 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -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 */