Fixed --use-ascii to properly convert text files on Symbian OS, MS-DOS

and OS/2.

diff --git a/CHANGES b/CHANGES
index 3b82c57343e7298682519e55013a4e0e2e10eec8..9374eb3bda5f53d0571de295e5b9d28ccb5d9c90 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel Fandrich (29 Jul 2008)
+- Fixed --use-ascii to properly convert text files on Symbian OS, MS-DOS
+  and OS/2.
+
 Daniel Fandrich (28 Jul 2008)
 - Fixed display of the interface bind address in the trace output when it's
   an IPv6 address.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d30d7a3ce93d4c8bf22970c5387e7ade32668896..ba6121f0628d3cc37370f3c54ac493496889b5c4 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -36,6 +36,7 @@ This release includes the following bugfixes:
  o poll not working on Windows Vista due to POLLPRI being incorrectly used
  o user-agent in CONNECT with non-HTTP protocols
  o CURL_READFUNC_PAUSE problems fixed
+ o --use-ascii now works on Symbian OS, MS-DOS and OS/2
 
 This release includes the following known bugs:
 

diff --git a/lib/urldata.h b/lib/urldata.h
index 6eb6539d52fa6f23b0e081bb698c782071f1de3c..7cdc7342ab7e791cc27bb3003329d321c67abc2c 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -1211,7 +1211,8 @@ struct UrlState {
   bool pipe_broke; /* TRUE if the connection we were pipelined on broke
                       and we need to restart from the beginning */
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(MSDOS) && !defined(__EMX__) && \
+    !defined(__SYMBIAN32__)
 /* do FTP line-end conversions on most platforms */
 #define CURL_DO_LINEEND_CONV
   /* for FTP downloads: track CRLF sequences that span blocks */