mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed bug #28976 (use From: from headers if sendmail_from is empty)

Browse Source
This commit is contained in:
foobar 2005-01-19 17:38:20 +00:00
parent 6faa433d58
commit 9feb47d70e
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
win32/sendmail.c
View File

@ -225,6 +225,7 @@ PHPAPI int TSendMail(char *host, int *error, char **error_message,
int ret;
char *RPath = NULL;
char *headers_lc = NULL; /* headers_lc is only created if we've a header at all */
char *pos1 = NULL, *pos2 = NULL;
TSRMLS_FETCH();
#ifndef NETWARE
@ -266,9 +267,21 @@ PHPAPI int TSendMail(char *host, int *error, char **error_message,
/* Fall back to sendmail_from php.ini setting */
if (mailRPath && *mailRPath) {
RPath = estrdup(mailRPath);
}
else if (INI_STR("sendmail_from")) {
} else if (INI_STR("sendmail_from")) {
RPath = estrdup(INI_STR("sendmail_from"));
} else if ( headers_lc &&
(pos1 = strstr(headers_lc, "from:")) &&
((pos1 == headers_lc) || (*(pos1-1) == '\n'))
) {
/* Real offset is memaddress from the original headers + difference of
* string found in the lowercase headrs + 5 characters to jump over
* the from: */
pos1 = headers + (pos1 - headers_lc) + 5;
if (NULL == (pos2 = strstr(pos1, "\r\n"))) {
RPath = estrndup(pos1, strlen(pos1));
} else {
RPath = estrndup(pos1, pos2-pos1);
}
} else {
if (headers) {
efree(headers);