diff options
author | Andrea Faulds <ajf@ajf.me> | 2014-11-29 01:45:54 +0000 |
---|---|---|
committer | Andrea Faulds <ajf@ajf.me> | 2014-11-29 01:45:54 +0000 |
commit | 01554bf3e417f13baf7af874e449c265c0309279 (patch) | |
tree | 8aca46ab27a54cea34c14001af774942f0502e39 /win32/sendmail.c | |
parent | 65c8edd525108f6598a8bb25fb3c5d6c80233322 (diff) | |
parent | 719083bd943e6c287c2dcb47918cf51f89a4ac08 (diff) | |
download | php-git-01554bf3e417f13baf7af874e449c265c0309279.tar.gz |
Merge branch 'master' into zppFailOnOverflow
Diffstat (limited to 'win32/sendmail.c')
-rw-r--r-- | win32/sendmail.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/sendmail.c b/win32/sendmail.c index aaeeea3aa5..a88323722d 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -3,7 +3,7 @@ * * This file is rewriten specificly for PHPFI. Some functionality * has been removed (MIME and file attachments). This code was - * modified from code based on code writen by Jarle Aase. + * modified from code based on code written by Jarle Aase. * * This class is based on the original code by Jarle Aase, see bellow: * wSendmail.cpp It has been striped of some functionality to match @@ -572,7 +572,7 @@ static int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char pos1 = pointer IN headers where the Bcc starts '4' = Length of the characters 'bcc:' Because we've added +4 above for parsing the Emails - we've to substract them here. */ + we've to subtract them here. */ memcpy(stripped_header, headers, pos1 - headers - 4); if (pos1 != pos2) { /* if pos1 != pos2 , pos2 points to the rest of the headers. |