cvs: php4 /win32 sendmail.c
| From: | Sara Golemon | Date: | Sat, 28 Dec 2002 19:32:46 +0000 |
| Subject: | cvs: php4 /win32 sendmail.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-17447@lists.php.net to get a copy of this message | ||
pollita Sat Dec 28 14:32:46 2002 EDT
Modified files:
/php4/win32 sendmail.c
Log:
When scanning for cc: headers, make sure the header is JUST cc: and not bcc: or original-cc: or
<anything-printable>cc:
See Bugs # 21036 and # 20707
Index: php4/win32/sendmail.c
diff -u php4/win32/sendmail.c:1.49 php4/win32/sendmail.c:1.50
--- php4/win32/sendmail.c:1.49 Fri Dec 6 17:56:57 2002
+++ php4/win32/sendmail.c Sat Dec 28 14:32:45 2002
@@ -17,7 +17,7 @@
*
*/
-/* $Id: sendmail.c,v 1.49 2002/12/06 22:56:57 fmk Exp $ */
+/* $Id: sendmail.c,v 1.50 2002/12/28 19:32:45 pollita Exp $ */
#include "php.h" /*php specific */
#include <stdio.h>
@@ -435,7 +435,7 @@
efree(tempMailTo);
}
/* Send mail to all Cc rcpt's */
- else if (headers && (pos1 = strstr(headers_lc, "cc:"))) {
+ else if (headers && (pos1 = strstr(headers_lc, "cc:")) && ((pos1 ==
headers_lc) || !iscntrl(*(pos1-1)))) {
/* Real offset is memaddress from the original headers + difference of
* string found in the lowercase headrs + 3 characters to jump over
* the cc: */