- correct epoch

[packages/php.git] / php-mail.patch

diff --git a/php-mail.patch b/php-mail.patch
index 4ba0422823106ae7d7b2840a3ac698eec2a7ff61..272b2f9f29fb8fb8e0c21b4c4071aa73324e4f0d 100644 (file)
--- a/php-mail.patch
+++ b/php-mail.patch
@@ -1,5 +1,5 @@
---- php-4.3.0/ext/standard/mail.c.orig Fri Nov 29 12:15:43 2002
-+++ php-4.3.0/ext/standard/mail.c      Thu Jan  2 12:37:54 2003
+--- php-5.2.0/ext/standard/mail.c      2006-12-01 14:20:27.881416250 +0100
++++ php-5.2.4/ext/standard/mail.c      2007-08-31 19:25:50.777713042 +0300
 @@ -21,6 +21,8 @@
  #include <stdlib.h>
  #include <ctype.h>
@@ -9,17 +9,35 @@
  #include "php.h"
  #include "ext/standard/info.h"
  
-@@ -36,6 +38,9 @@
+@@ -35,6 +37,8 @@
+ #include "php_ini.h"
  #include "safe_mode.h"
  #include "exec.h"
- 
 +#include "zend_operators.h"
 +#include "zend_globals.h"
-+
- #if HAVE_SENDMAIL
+ 
  #ifdef PHP_WIN32
  #include "win32/sendmail.h"
-@@ -196,8 +201,42 @@
+@@ -107,6 +111,18 @@
+               return;
+       }
+ 
++    /* search for To: and Subject: headers which should be specified in proper mail() parameters, not in additional headers */
++    if (headers != NULL) {
++        if (strncasecmp(headers, "to:", sizeof("to:") - 1) == 0 || strcasestr(headers, "\nto:")) {
++            php_error_docref(NULL TSRMLS_CC, E_WARNING, "To: headers aren't allowed in the additional_headers parameter. Use $to parameter for that. Mail not sent.");
++            RETURN_FALSE;
++        }
++        if (strncasecmp(headers, "subject:", sizeof("subject:") - 1) == 0 || strcasestr(headers, "\nsubject:")) {
++            php_error_docref(NULL TSRMLS_CC, E_WARNING, "Subject: headers aren't allowed in the additional_headers parameter. Use $subject parameter for that. Mail not sent.");
++            RETURN_FALSE;
++        }
++    }
++
+       if (to_len > 0) {
+               to_r = estrndup(to, to_len);
+               for (; to_len; to_len--) {
+@@ -231,8 +247,42 @@
                        return 0;
                }
  #endif
@@ -49,7 +67,7 @@
 +                                      convert_to_string_ex(server_port);
 +                                      fprintf(sendmail, ":%s", Z_STRVAL_PP(server_port));
 +                              }       
-+                              if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SCRIPT_NAME", sizeof("SCRIPT_NAME"), (void **) &scrip_name)==SUCCESS) {
++                              if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SCRIPT_NAME", sizeof("SCRIPT_NAME"), (void **) &script_name)==SUCCESS) {
 +                                      convert_to_string_ex(script_name);
 +                                      fprintf(sendmail, "%s", Z_STRVAL_PP(script_name));
 +                              }
@@ -61,6 +79,6 @@
 +                      }
 +              }
 +
-               if (headers != NULL) {
-                       fprintf(sendmail, "%s\n", headers);
+               if (hdr != NULL) {
+                       fprintf(sendmail, "%s\n", hdr);
                }