archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Revert fix for #14407. The From: header field IS different from the

Browse source 
sendmail_from field which is in fact the retturn path.
This commit is contained in:
Markus Fischer 2002-06-02 22:54:48 +00:00
parent 1ec78a1e18
commit d497ca147e
1 changed files with 7 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

37
win32/sendmail.c
View file

@ -137,7 +137,6 @@ int TSendMail(char *host, int *error, char **error_message,
strcpy(MailHost, host); strcpy(MailHost, host);
} }
/* use from address as return path (if specified in headers) */
if (headers) { if (headers) {
char *pos = NULL; char *pos = NULL;
size_t i; size_t i;
@ -150,39 +149,17 @@ int TSendMail(char *host, int *error, char **error_message,
for (i = 0; i < strlen(headers_lc); i++) { for (i = 0; i < strlen(headers_lc); i++) {
headers_lc[i] = tolower(headers_lc[i]); headers_lc[i] = tolower(headers_lc[i]);
} }
/* Try to match 'from:' only at start of the string or after following a \r\n */
if (strstr(headers_lc, "\r\nfrom:")) {
pos = strstr(headers_lc, "\r\nfrom:") + 7; /* Jump over the string "\r\nfrom:", hence the 7 */
} else if (!strncmp(headers_lc, "from:", 5)) {
pos = headers_lc + 5; /* Jump over the string "from:", hence the 5 */
}
if (pos) {
char *pos_end;
/* Let pos point to the real header string */
pos = headers + (pos - headers_lc);
/* Ignore any whitespaces */
while (pos && ((*pos == ' ' || *pos == '\t')))
pos++;
/* Match until \r\n or end of header string */
if (pos_end = strstr(pos, "\r\n")) {
RPath = estrndup(pos, pos_end - pos);
} else {
RPath = estrndup(pos, strlen(pos));
}
}
} }
/* Fall back to sendmail_from php.ini setting */ /* Fall back to sendmail_from php.ini setting */
if (!RPath) { if (INI_STR("sendmail_from")) {
if (INI_STR("sendmail_from")) { RPath = estrdup(INI_STR("sendmail_from"));
RPath = estrdup(INI_STR("sendmail_from")); } else {
} else { if (headers_lc) {
if (headers_lc) { efree(headers_lc);
efree(headers_lc);
}
*error = W32_SM_SENDMAIL_FROM_NOT_SET;
return FAILURE;
} }
*error = W32_SM_SENDMAIL_FROM_NOT_SET;
return FAILURE;
} }
/* attempt to connect with mail host */ /* attempt to connect with mail host */