diff options
| author | Stefan Esser <sesser@php.net> | 2002-06-13 21:42:39 +0000 |
|---|---|---|
| committer | Stefan Esser <sesser@php.net> | 2002-06-13 21:42:39 +0000 |
| commit | c3c4c6137a506befc05bee84ce34c017eba2f9db (patch) | |
| tree | 5face35584e13a4094c538a65b6f266b6a5a7317 | |
| parent | ce379abfbdd3aae61ad8b2ff9f5e5ee9992158bc (diff) | |
| download | php-git-c3c4c6137a506befc05bee84ce34c017eba2f9db.tar.gz | |
- should fix bug#17753
| -rw-r--r-- | win32/sendmail.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/win32/sendmail.c b/win32/sendmail.c index 3ef139e7d4..f897334b22 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -589,7 +589,7 @@ int PostHeader(char *RPath, char *Subject, char *mailTo, char *xheaders, char *m time_t tNow = time(NULL); struct tm *tm = localtime(&tNow); int zoneh = abs(_timezone); - int zonem, res; + int zonem, res, len; char *header_buffer; char *headers_lc = NULL; size_t i; @@ -646,9 +646,15 @@ int PostHeader(char *RPath, char *Subject, char *mailTo, char *xheaders, char *m } } if(xheaders){ - if (!addToHeader(&header_buffer, "%s", xheaders)) { + if (!addToHeader(&header_buffer, "%s\r\n", xheaders)) { goto PostHeader_outofmem; } + +len = strlen(header_buffer); + if ((len > 4)&&(header_buffer[len-4]=='\r')) { + header_buffer[len-2]=='\0'; + } + } if (headers_lc) { |