cvs: php4 /win32 sendmail.c

sesser Thu Jun 13 17:42:39 2002 EDT Modified files: /php4/win32 sendmail.c Log: - should fix bug#17753 Index: php4/win32/sendmail.c diff -u php4/win32/sendmail.c:1.40 php4/win32/sendmail.c:1.41 --- php4/win32/sendmail.c:1.40 Wed Jun 5 13:08:38 2002 +++ php4/win32/sendmail.c Thu Jun 13 17:42:39 2002 @@ -17,7 +17,7 @@ * */ -/* $Id: sendmail.c,v 1.40 2002/06/05 17:08:38 mfischer Exp $ */ +/* $Id: sendmail.c,v 1.41 2002/06/13 21:42:39 sesser Exp $ */ #include "php.h" /*php specific */ #include <stdio.h> @@ -564,7 +564,7 @@ if (NULL == (*header_buffer = erealloc(*header_buffer, strlen(*header_buffer) + strlen(specifier) + strlen(string) + 1))) { return 0; } - sprintf(*header_buffer + strlen(*header_buffer), specifier, string); + sprintf(*header_buffer + strlen(*header_buffer), specifier, string); return 1; } @@ -589,7 +589,7 @@ 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,14 @@ } } 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) {