summaryrefslogtreecommitdiff
path: root/win32/sendmail.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-06-10 14:20:18 -0700
committerStanislav Malyshev <stas@php.net>2013-06-10 14:30:59 -0700
commit02e4d7a290ae437688b3a3d114621a1d32444560 (patch)
treeab3b9d2387ac6914ab7dd68afda87134d3b81e4b /win32/sendmail.c
parentec790753948d190db354cbce97786b4a1aac63fc (diff)
downloadphp-git-02e4d7a290ae437688b3a3d114621a1d32444560.tar.gz
Merge branch 'pull-request/341'
* pull-request/341: (23 commits) typofixes
Diffstat (limited to 'win32/sendmail.c')
-rw-r--r--win32/sendmail.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/win32/sendmail.c b/win32/sendmail.c
index 4b09697e95..3078307263 100644
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -119,8 +119,8 @@ static char *ErrorMessages[] =
{"Error while trimming mail header with PCRE, please file a bug report at http://bugs.php.net/"} /* 21 */
};
-/* This pattern converts all single occurences of \n (Unix)
- * withour a leading \r to \r\n and all occurences of \r (Mac)
+/* This pattern converts all single occurrences of \n (Unix)
+ * withour a leading \r to \r\n and all occurrences of \r (Mac)
* without a trailing \n to \r\n
* Thx to Nibbler from ircnet/#linuxger
*/
@@ -130,7 +130,7 @@ static char *ErrorMessages[] =
/* This pattern removes \r\n from the start of the string,
* \r\n from the end of the string and also makes sure every line
* is only wrapped with a single \r\n (thus reduces multiple
- * occurences of \r\n between lines to a single \r\n) */
+ * occurrences of \r\n between lines to a single \r\n) */
#define PHP_WIN32_MAIL_RMVDBL_PATTERN "/^\r\n|(\r\n)+$/m"
#define PHP_WIN32_MAIL_RMVDBL_REPLACE ""
@@ -142,11 +142,11 @@ static char *ErrorMessages[] =
#define PHP_WIN32_MAIL_DOT_REPLACE "\n.."
/* This function is meant to unify the headers passed to to mail()
- * This means, use PCRE to transform single occurences of \n or \r in \r\n
- * As a second step we also eleminate all \r\n occurences which are:
+ * This means, use PCRE to transform single occurrences of \n or \r in \r\n
+ * As a second step we also eleminate all \r\n occurrences which are:
* 1) At the start of the header
* 2) At the end of the header
- * 3) Two or more occurences in the header are removed so only one is left
+ * 3) Two or more occurrences in the header are removed so only one is left
*
* Returns NULL on error, or the new char* buffer on success.
* You have to take care and efree() the buffer on your own.