FTP: partly revert eeb7c12807

Since ASCII transfers on FTP means sending CRLF line endings, we should
still keep converting them to LF-only on platforms where text files
typically do not use CRLF.

This also DOES NOT convert existing CRLF line endings on ASCII uploads
but only does stand-alone LF => CRLF.

Regression from eeb7c12807 shipped in 8.10.0

Reported-by: finkjsc on github
Fixes #14873
Closes #14875
This commit is contained in:
Daniel Stenberg 2024-09-12 08:15:14 +02:00
parent 2b652b8634
commit 7eda757d99
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
7 changed files with 54 additions and 19 deletions

View file

@ -16,8 +16,12 @@ ftp
<name>
FTP PASV upload ASCII file
</name>
<file name="%LOGDIR/test%TESTNUMBER.txt">
<file name="%LOGDIR/test%TESTNUMBER.txt" nonewline="yes">
%if win32
%repeat[1750 x a line of text used for verifying this !%0d%0a]%
%else
%repeat[1750 x a line of text used for verifying this !%0a]%
%endif
</file>
<command>
"ftp://%HOSTIP:%FTPPORT/%TESTNUMBER;type=a" -T %LOGDIR/test%TESTNUMBER.txt
@ -29,7 +33,7 @@ FTP PASV upload ASCII file
<strip>
QUIT
</strip>
<upload crlf="yes">
<upload crlf="yes" nonewline="yes">
%repeat[1750 x a line of text used for verifying this !%0a]%
</upload>
<protocol>