Commit bdbd0cf2 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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

parent d7929376
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -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.

+1 −1
Original line number Diff line number Diff line
@@ -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)
+1 −1
Original line number Diff line number Diff line
@@ -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 */