romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-06 12:16:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

'CRLF' in comments

Browse source
This commit is contained in:
Viktor Szakats 2026-07-25 11:31:54 +02:00
parent da9f0e89c4
commit 0ddd0cc37e
No known key found for this signature in database
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ftp.c
View file

@ -3794,7 +3794,7 @@ static CURLcode ftp_done_check_partial(struct Curl_easy *data,
(data->state.infilesize != -1) && /* upload with known size */ (data->state.infilesize != -1) && /* upload with known size */
((!data->set.crlf && !data->state.prefer_ascii && /* no conversion */ ((!data->set.crlf && !data->state.prefer_ascii && /* no conversion */
(data->state.infilesize != data->req.writebytecount)) || (data->state.infilesize != data->req.writebytecount)) ||
((data->set.crlf || data->state.prefer_ascii) && /* maybe crlf conv */ ((data->set.crlf || data->state.prefer_ascii) && /* maybe CRLF conv */
(data->state.infilesize > data->req.writebytecount)) (data->state.infilesize > data->req.writebytecount))
)) { )) {
failf(data, "Uploaded unaligned file size (%" FMT_OFF_T failf(data, "Uploaded unaligned file size (%" FMT_OFF_T

2
lib/pop3.c
View file

@ -1407,7 +1407,7 @@ static const struct SASLproto saslpop3 = {
pop3_continue_auth, /* Send authentication continuation */ pop3_continue_auth, /* Send authentication continuation */
pop3_cancel_auth, /* Send authentication cancellation */ pop3_cancel_auth, /* Send authentication cancellation */
pop3_get_message, /* Get SASL response message */ pop3_get_message, /* Get SASL response message */
255 - 8, /* Max line len - strlen("AUTH ") - 1 space - crlf */ 255 - 8, /* Max line len - strlen("AUTH ") - 1 space - CRLF */
'*', /* Code received when continuation is expected */ '*', /* Code received when continuation is expected */
'+', /* Code to receive upon authentication success */ '+', /* Code to receive upon authentication success */
SASL_AUTH_DEFAULT, /* Default mechanisms */ SASL_AUTH_DEFAULT, /* Default mechanisms */

2
lib/sendf.c
View file

@ -1128,7 +1128,7 @@ static CURLcode do_init_reader_stack(struct Curl_easy *data,
data->req.reader.stack = r; data->req.reader.stack = r;
clen = r->crt->total_length(data, r); clen = r->crt->total_length(data, r);
/* if we do not have 0 length init, and crlf conversion is wanted, /* if we do not have 0 length init, and CRLF conversion is wanted,
* add the reader for it */ * add the reader for it */
if(clen && (data->set.crlf if(clen && (data->set.crlf
#ifdef CURL_PREFER_LF_LINEENDS #ifdef CURL_PREFER_LF_LINEENDS

2
lib/smtp.c
View file

@ -1657,7 +1657,7 @@ static const struct SASLproto saslsmtp = {
smtp_continue_auth, /* Send authentication continuation */ smtp_continue_auth, /* Send authentication continuation */
smtp_cancel_auth, /* Cancel authentication */ smtp_cancel_auth, /* Cancel authentication */
smtp_get_message, /* Get SASL response message */ smtp_get_message, /* Get SASL response message */
512 - 8, /* Max line len - strlen("AUTH ") - 1 space - crlf */ 512 - 8, /* Max line len - strlen("AUTH ") - 1 space - CRLF */
334, /* Code received when continuation is expected */ 334, /* Code received when continuation is expected */
235, /* Code to receive upon authentication success */ 235, /* Code to receive upon authentication success */
SASL_AUTH_DEFAULT, /* Default mechanisms */ SASL_AUTH_DEFAULT, /* Default mechanisms */

4
tests/server/tftpd.c
View file

@ -186,7 +186,7 @@ static struct bf bfs[2];
static int nextone; /* index of next buffer to use */ static int nextone; /* index of next buffer to use */
static int current; /* index of buffer in use */ static int current; /* index of buffer in use */
/* control flags for crlf conversions */ /* control flags for CRLF conversions */
static int newline = 0; /* fillbuf: in middle of newline expansion */ static int newline = 0; /* fillbuf: in middle of newline expansion */
static int prevchar = -1; /* putbuf: previous char (cr check) */ static int prevchar = -1; /* putbuf: previous char (cr check) */
@ -296,7 +296,7 @@ static void nak(int error)
*/ */
static struct tftphdr *rw_init(int x) static struct tftphdr *rw_init(int x)
{ {
newline = 0; /* init crlf flag */ newline = 0; /* init CRLF flag */
prevchar = -1; prevchar = -1;
bfs[0].counter = BF_ALLOC; /* pass out the first buffer */ bfs[0].counter = BF_ALLOC; /* pass out the first buffer */
current = 0; current = 0;