aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2006-08-22 21:23:25 +0000
committerDaniel Stenberg <daniel@haxx.se>2006-08-22 21:23:25 +0000
commitbdbd0cf27a7342b5eab41623fcd44459921d7f4a (patch)
treeb74ddf52281f17d01314787b4382674861d3b2ec
parentd792937686dac6a0a5217a589d8a2ba3ec083f51 (diff)
David McCreedy fixed a remaining mistake from the August 19 TYPE change.
-rw-r--r--CHANGES2
-rw-r--r--RELEASE-NOTES2
-rw-r--r--lib/transfer.c2
3 files changed, 4 insertions, 2 deletions
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 */