SOURCES: php-mail.patch - still allow CC and BCC in additional hea...

[glen]

Author: glen                         Date: Mon Jun 19 09:58:56 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- still allow CC and BCC in additional headers

---- Files affected:
SOURCES:
   php-mail.patch (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SOURCES/php-mail.patch
diff -u SOURCES/php-mail.patch:1.12 SOURCES/php-mail.patch:1.13
--- SOURCES/php-mail.patch:1.12	Sat Jun 10 22:05:45 2006
+++ SOURCES/php-mail.patch	Mon Jun 19 11:58:51 2006
@@ -19,7 +19,7 @@
  #if HAVE_SENDMAIL
  #ifdef PHP_WIN32
  #include "win32/sendmail.h"
-@@ -104,6 +109,35 @@
+@@ -104,6 +109,25 @@
  		return;
  	}
  
@@ -40,22 +40,12 @@
 +            zend_error(E_WARNING, "To: headers aren't allowed in the additional_headers parameter. Mail not sent.");
 +            RETURN_FALSE;
 +        }
-+
-+        if (strncasecmp(headers, "cc:", sizeof("cc:") - 1) == 0 || strcasestr(headers, "\ncc:")) {
-+            zend_error(E_WARNING, "CC: headers aren't allowed in the additional_headers parameter. Mail not sent.");
-+            RETURN_FALSE;
-+        }
-+
-+        if (strncasecmp(headers, "bcc:", sizeof("bcc:") - 1) == 0 || strcasestr(headers, "\nbcc:")) {
-+            zend_error(E_WARNING, "BCC: headers aren't allowed in the additional_headers parameter. Mail not sent.");
-+            RETURN_FALSE;
-+        }
 +    }
 +
  	if (to_len > 0) {
  		to_r = estrndup(to, to_len);
  		for (; to_len; to_len--) {
-@@ -196,8 +230,42 @@
+@@ -196,8 +220,42 @@
  			return 0;
  		}
  #endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/php-mail.patch?r1=1.12&r2=1.13&f=u