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

Removing unused code and making sure headers are send when called from imap_mail()

Browse source
This commit is contained in:
Frank M. Kromann 2002-12-06 22:56:57 +00:00
parent 0d812352be
commit ac2f1624d7
2 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

29
win32/sendmail.c
View file

@ -536,12 +536,14 @@ int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char *mailB
which would look like "\r\n\r\n". */
memcpy(stripped_header + (pos1 - headers - 4), pos2 + 2, strlen(pos2) - 2);
}
} else {
/* Simplify the code that we create a copy of stripped_header no matter if
we actually strip something or not. So we've a single efree() later. */
if (NULL == (stripped_header = estrndup(headers, strlen(headers)))) {
return OUT_OF_MEMORY;
}
}
}
/* Simplify the code that we create a copy of stripped_header no matter if
we actually strip something or not. So we've a single efree() later. */
if (headers && !stripped_header) {
if (NULL == (stripped_header = estrndup(headers, strlen(headers)))) {
return OUT_OF_MEMORY;
}
}
@ -555,12 +557,11 @@ int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char *mailB
return (res);
}
/* send message header */
if (Subject == NULL) {
res = PostHeader(RPath, "No Subject", mailTo, stripped_header, NULL);
res = PostHeader(RPath, "No Subject", mailTo, stripped_header);
} else {
res = PostHeader(RPath, Subject, mailTo, stripped_header, NULL);
res = PostHeader(RPath, Subject, mailTo, stripped_header);
}
if (stripped_header) {
efree(stripped_header);
@ -569,7 +570,6 @@ int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char *mailB
return (res);
}
/* send message contents in 1024 chunks */
if (strlen(data) <= 1024) {
if ((res = Post(data)) != SUCCESS)
@ -620,13 +620,12 @@ int addToHeader(char **header_buffer, const char *specifier, char *string) {
// 2) Subject
// 3) destination address
// 4) headers
// 5) cc destination address
// Output: Error code or Success
// Description:
// Author/Date: jcar 20/9/96
// History:
//********************************************************************/
int PostHeader(char *RPath, char *Subject, char *mailTo, char *xheaders, char *mailCc)
int PostHeader(char *RPath, char *Subject, char *mailTo, char *xheaders)
{
/* Print message header according to RFC 822 */
@ -685,12 +684,6 @@ int PostHeader(char *RPath, char *Subject, char *mailTo, char *xheaders, char *m
goto PostHeader_outofmem;
}
}
if (mailCc && *mailCc) {
if (!addToHeader(&header_buffer, "Cc: %s\r\n", mailCc)) {
goto PostHeader_outofmem;
}
}
if(xheaders){
if (!addToHeader(&header_buffer, "%s\r\n", xheaders)) {
goto PostHeader_outofmem;

2
win32/sendmail.h
View file

@ -41,7 +41,7 @@ int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char *mailB
char *GetSMErrorText(int index);
int MailConnect();
int PostHeader(char *, char *, char *, char *, char *);
int PostHeader(char *, char *, char *, char *);
int Post(LPCSTR);
int Ack(char **server_response);
unsigned long GetAddr(LPSTR szHost);