Commit 95152aec authored Apr 26, 2006 by Daniel Stenberg

David McCreedy brought line end conversions when doing FTP ASCII

transfers. They are done on non-windows systems and translate CRLF to LF.

parent 8ed67623

CHANGES

+11 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,17 @@

		Changelog

		Daniel (26 April 2006)
		- David McCreedy brought initial line end conversions when doing FTP ASCII
		transfers. They are done on non-windows systems and translate CRLF to LF.

		I modified the 15 LIST-using test cases accordingly. The downside is that now
		we'll have even more trouble to get the tests to run on Windows since they
		should get CRLF newlines left intact which the *nix versions don't. I figure
		the only sane thing to do is to add some kind of [newline] macro for the test
		case files and have them expanded to the proper native line ending when the
		test cases are run. This is however left to implement.

		Daniel (25 April 2006)
		- Paul Querna fixed libcurl to better deal with deflate content encoding
		when the stream (wrongly) lacks a proper zlib header. This seems to be the

RELEASE-NOTES

+2 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ Curl and libcurl 7.15.4

		This release includes the following changes:

		o line end conversions for FTP ASCII transfers
		o curl_multi_socket() API added (still mostly untested)
		o conversion callback options for EBCDIC <=> ASCII conversions
		o added CURLINFO_FTP_ENTRY_PATH
		@@ -37,6 +38,7 @@ Other curl-related news since the previous public release:

		o tclcurl 0.15.3 was released:
		http://personal1.iddeo.es/andresgarci/tclcurl/english/
		o http://curl.usphp.com/ is a new mirror in Florida, US

		This release would not have looked like this without help, code, reports and
		advice from friends like these:

TODO-RELEASE

+1 −2

Original line number	Diff line number	Diff line
		To get fixed in 7.15.4 (planned release: June 2006)
		======================

		65 - curl_multi_socket() added but not extensively tested nor particularly
		documented or pushed for.
		66 -

docs/KNOWN_BUGS

+2 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,8 @@ may have been fixed since this was written!
		specification). The receiver will convert the data from the standard
		form to his own internal form.

		Since 7.15.4 at least line endings are converted.

		19. FTP 3rd party transfers with the multi interface doesn't work. Test:
		define CURL_MULTIEASY, rebuild curl, run test case 230 - 232.

lib/ftp.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -2994,6 +2994,13 @@ CURLcode Curl_ftp_done(struct connectdata *conn, CURLcode status)
		}
		else {
		if((-1 != conn->size) && (conn->size != *ftp->bytecountp) &&
		#ifdef CURL_DO_LINEEND_CONV
		/* Most FTP servers don't adjust their file SIZE response for CRLFs, so
		* we'll check to see if the discrepancy can be explained by the number
		* of CRLFs we've changed to LFs.
		*/
		((conn->size + data->state.crlf_conversions) != *ftp->bytecountp) &&
		#endif /* CURL_DO_LINEEND_CONV */
		(conn->maxdownload != *ftp->bytecountp)) {
		failf(data, "Received only partial file: %" FORMAT_OFF_T " bytes",
		*ftp->bytecountp);