David McCreedy fixed a flaw where the CRLF counter wasn't properly cleared

for FTP ASCII transfers.

diff --git a/CHANGES b/CHANGES
index a50f785a5aa057399d0e88bd32432ff9d48372c4..a8f99d9a047b50a4e9bd4326fd4d6508512bfe00 100644 (file)
--- 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 303ea8bbd573a6b288abebf9c1ce23c09fbbed4e..5d76a7086f2b7e5d3e4d3652aefb0f9d00b6a4a3 100644 (file)
--- 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 6e50e7a031ce956449cfbbef6c201c79dafc7e1d..e7537c6ec2806f4ab60c0c8dcf90ae557a63b1a7 100644 (file)
--- 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;