From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 22 Aug 2006 21:23:25 +0000 (+0000)
Subject: David McCreedy fixed a remaining mistake from the August 19 TYPE change.
X-Git-Tag: curl-7_15_6-prepipeline~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdbd0cf27a7342b5eab41623fcd44459921d7f4a;p=curl

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

diff --git a/CHANGES b/CHANGES
index ceffd3609..b57bf84b8 100644
--- 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 7b74752db..586c01e0c 100644
--- 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 9cf9c2925..fb1bcb286 100644
--- 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 */