- release 16 (by relup.sh)

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

diff --git a/php-mail.patch b/php-mail.patch
index 60d1768d1eb6c2f3ffc572028fae5827b51aa0ea..257a9c48487428679ea1ee8ce8659739a68dd3c9 100644 (file)
--- a/php-mail.patch
+++ b/php-mail.patch
@@ -1,6 +1,5 @@
-diff -ur php-5.2.0.org/ext/standard/mail.c php-5.2.0/ext/standard/mail.c
---- php-5.2.0.org/ext/standard/mail.c  2006-01-01 13:50:15.000000000 +0100
-+++ php-5.2.0/ext/standard/mail.c      2006-12-01 14:20:27.881416250 +0100
+--- 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>
@@ -10,17 +9,16 @@ diff -ur php-5.2.0.org/ext/standard/mail.c php-5.2.0/ext/standard/mail.c
  #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"
-@@ -104,6 +109,18 @@
+@@ -107,6 +111,18 @@
                return;
        }
  
@@ -39,7 +37,7 @@ diff -ur php-5.2.0.org/ext/standard/mail.c php-5.2.0/ext/standard/mail.c
        if (to_len > 0) {
                to_r = estrndup(to, to_len);
                for (; to_len; to_len--) {
-@@ -228,8 +245,42 @@
+@@ -231,8 +247,42 @@
                        return 0;
                }
  #endif
@@ -53,7 +51,7 @@ diff -ur php-5.2.0.org/ext/standard/mail.c php-5.2.0/ext/standard/mail.c
 +              if ((subject != NULL) && (strlen(subject)!=0)) {
 +                      fprintf(sendmail, "Subject: %s\n", subject);
 +              }
-+
++              zend_is_auto_global(ZEND_STRL("_SERVER") TSRMLS_CC);
 +              if (PG(http_globals)[TRACK_VARS_SERVER]) {
 +                      zval **remote_addr, **server_name, **server_port,
 +                              **script_name, **http_user_agent;
@@ -81,6 +79,6 @@ diff -ur php-5.2.0.org/ext/standard/mail.c php-5.2.0/ext/standard/mail.c
 +                      }
 +              }
 +
-               if (headers != NULL) {
-                       fprintf(sendmail, "%s\n", headers);
+               if (hdr != NULL) {
+                       fprintf(sendmail, "%s\n", hdr);
                }