From daef1cf34d6df8b199cf2081bda4b1b4d1916b97 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 14 Jul 2006 18:58:42 +0000 Subject: [PATCH] David McCreedy fixed a flaw where the CRLF counter wasn't properly cleared for FTP ASCII transfers. --- CHANGES | 4 ++++ RELEASE-NOTES | 3 ++- lib/url.c | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index a50f785a5..a8f99d9a0 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,10 @@ Changelog +Daniel (14 July 2006) +- David McCreedy fixed a flaw where the CRLF counter wasn't properly cleared + for FTP ASCII transfers. + Daniel (8 July 2006) - Ates Goral pointed out that libcurl's cookie parser did case insensitive string comparisons on the path which is incorrect and provided a patch that diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 303ea8bbd..5d76a7086 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -18,6 +18,7 @@ This release includes the following changes: This release includes the following bugfixes: + o FTP ASCII CRLF counter reset o cookie parser now compares paths case sensitive o an easy handle with shared DNS cache added to a multi handle caused a crash o couldn't override the Proxy-Connection: header for non-CONNECT requests @@ -38,6 +39,6 @@ This release would not have looked like this without help, code, reports and advice from friends like these: Dan Fandrich, Peter Silva, Arve Knudsen, Michael Wallner, Toshiyuki Maezawa, - Ingmar Runge, Ates Goral + Ingmar Runge, Ates Goral, David McCreedy Thanks! (and sorry if I forgot to mention someone) diff --git a/lib/url.c b/lib/url.c index 6e50e7a03..e7537c6ec 100644 --- a/lib/url.c +++ b/lib/url.c @@ -3930,6 +3930,9 @@ static CURLcode SetupConnection(struct connectdata *conn, conn->bytecount = 0; conn->headerbytecount = 0; +#ifdef CURL_DO_LINEEND_CONV + data->state.crlf_conversions = 0; /* reset CRLF conversion counter */ +#endif /* CURL_DO_LINEEND_CONV */ if(CURL_SOCKET_BAD == conn->sock[FIRSTSOCKET]) { bool connected = FALSE;