summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Fischer <mfischer@php.net>2002-05-14 15:32:15 +0000
committerMarkus Fischer <mfischer@php.net>2002-05-14 15:32:15 +0000
commite3974c36ba984f6ba67a42230927bcd480b9245e (patch)
tree63eb4c986ac29d57ac958d93fc8818882ba8080d
parent0815b55950df34aa1dfd63fad56edbf1940752c3 (diff)
downloadphp-git-e3974c36ba984f6ba67a42230927bcd480b9245e.tar.gz
- Convert unix to dos line endings.
# This is *really* annoying ... can only be an advantage for windows users imho.
-rw-r--r--win32/sendmail.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/win32/sendmail.c b/win32/sendmail.c
index 481b603012..f6bcb715a4 100644
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -89,6 +89,7 @@ static char *ErrorMessages[] =
{"Bad Mail Host"},
{"Bad Message File"},
{"\"sendmail_from\" not set in php.ini"},
+
{"Mailserver rejected our \"sendmail_from\" setting"} /* 20 */
};
@@ -207,10 +208,13 @@ void TSMClose()
char *GetSMErrorText(int index)
{
+
if (MIN_ERROR_INDEX <= index && index < MAX_ERROR_INDEX) {
return (ErrorMessages[index]);
+
} else {
return (ErrorMessages[UNKNOWN_ERROR]);
+
}
}
@@ -285,9 +289,12 @@ int SendText(char *RPath, char *Subject, char *mailTo, char *data, char *headers
efree(tempMailTo);
if (headers && (pos1 = strstr(headers, "Cc:"))) {
if (NULL == (pos2 = strstr(pos1, "\r\n"))) {
+
tempMailTo = estrndup(pos1, strlen(pos1));
+
} else {
tempMailTo = estrndup(pos1, pos2-pos1);
+
}
token = strtok(tempMailTo, ",");