moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

smtp: Updated RFC-2821 references to RFC-5321

This commit is contained in:
Steve Holme 2013-05-04 09:58:32 +01:00
parent 99b4045183
commit 92ef5f19c8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/smtp.c
View File

@ -564,7 +564,7 @@ static CURLcode smtp_perform_mail(struct connectdata *conn)
/* Calculate the FROM parameter */ /* Calculate the FROM parameter */
if(!data->set.str[STRING_MAIL_FROM]) if(!data->set.str[STRING_MAIL_FROM])
/* Null reverse-path, RFC-2821, sect. 3.7 */ /* Null reverse-path, RFC-5321, sect. 3.6.3 */
from = strdup("<>"); from = strdup("<>");
else if(data->set.str[STRING_MAIL_FROM][0] == '<') else if(data->set.str[STRING_MAIL_FROM][0] == '<')
from = aprintf("%s", data->set.str[STRING_MAIL_FROM]); from = aprintf("%s", data->set.str[STRING_MAIL_FROM]);
@ -1797,7 +1797,7 @@ CURLcode Curl_smtp_escape_eob(struct connectdata *conn, ssize_t nread)
they are sent as CRLF.. instead, as a . on the beginning of a line will they are sent as CRLF.. instead, as a . on the beginning of a line will
be deleted by the server when not part of an EOB terminator and a be deleted by the server when not part of an EOB terminator and a
genuine CRLF.CRLF which isn't escaped will wrongly be detected as end of genuine CRLF.CRLF which isn't escaped will wrongly be detected as end of
data by the server. data by the server
*/ */
ssize_t i; ssize_t i;
ssize_t si; ssize_t si;
@ -1841,7 +1841,7 @@ CURLcode Curl_smtp_escape_eob(struct connectdata *conn, ssize_t nread)
smtp->trailing_crlf = FALSE; smtp->trailing_crlf = FALSE;
} }
/* Do we have a match for CRLF. as per RFC-2821, sect. 4.5.2 */ /* Do we have a match for CRLF. as per RFC-5321, sect. 4.5.2 */
if(SMTP_EOB_FIND_LEN == smtp->eob) { if(SMTP_EOB_FIND_LEN == smtp->eob) {
/* Copy the replacement data to the target buffer */ /* Copy the replacement data to the target buffer */
memcpy(&data->state.scratch[si], SMTP_EOB_REPL, SMTP_EOB_REPL_LEN); memcpy(&data->state.scratch[si], SMTP_EOB_REPL, SMTP_EOB_REPL_LEN);