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

Revert the sendmail.c patch - it uses 4 different variables that aren't defined, and breaks

Browse Source 
the Win32 build
This commit is contained in:
Zeev Suraski 2000-06-27 18:41:44 +00:00
parent eaa2a158c8
commit 130b9e7ef2
1 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
win32/sendmail.c
View File

@ -214,7 +214,7 @@ int SendText(char *RPath, char *Subject, char *mailTo, char *data, char *headers
if (strchr(mailTo, '@') == NULL)
return (BAD_MSG_DESTINATION);
sprintf(Buffer, "HELO %s\r\n", LocalHost);
sprintf(Buffer, "HELO %s\n", LocalHost);
/* in the beggining of the dialog */
/* attempt reconnect if the first Post fail */
@ -226,38 +226,20 @@ int SendText(char *RPath, char *Subject, char *mailTo, char *data, char *headers
if ((res = Ack()) != SUCCESS)
return (res);
// Send mail to all rcpt's
token = strtok(tempMailTo, ",");
while(token != NULL)
{
sprintf(Buffer, "RCPT TO:<%s>\r\n", token);
if ((res = Post(Buffer)) != SUCCESS)
return (res);
if ((res = Ack()) != SUCCESS)
return (res);
token = strtok(NULL, ",");
}
sprintf(Buffer, "MAIL FROM:<%s>\n", RPath);
if ((res = Post(Buffer)) != SUCCESS)
return (res);
if ((res = Ack()) != SUCCESS)
return (res);
// Send mail to all Cc rcpt's
efree(tempMailTo);
if (headers && pos1 = strstr(headers, "Cc:")) {
pos2 = strstr(pos1, "\r\n");
tempMailTo = estrndup(pos1, pos2-pos1);
token = strtok(tempMailTo, ",");
while(token != NULL)
{
sprintf(Buffer, "RCPT TO:<%s>\r\n", token);
if ((res = Post(Buffer)) != SUCCESS)
return (res);
if ((res = Ack()) != SUCCESS)
return (res);
token = strtok(NULL, ",");
}
efree(tempMailTo);
}
sprintf(Buffer, "RCPT TO:<%s>\n", mailTo);
if ((res = Post(Buffer)) != SUCCESS)
return (res);
if ((res = Ack()) != SUCCESS)
return (res);
if ((res = Post("DATA\r\n")) != SUCCESS)
if ((res = Post("DATA\n")) != SUCCESS)
return (res);
if ((res = Ack()) != SUCCESS)
return (res);