X-Git-Url: http://git.pld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=php-mail.patch;h=c394bacbd53d21dc078f7a5928251e0f70b30eb0;hp=c2dad1e83069f5fae0f2af432b7952471fd88f68;hb=365df16;hpb=edf77de892ccf89c1a5b4494ba731607e1e46416

diff --git a/php-mail.patch b/php-mail.patch
index c2dad1e..c394bac 100644
--- a/php-mail.patch
+++ b/php-mail.patch
@@ -1,6 +1,5 @@
-diff -urN php-4.2.3.org/ext/standard/mail.c php-4.2.3/ext/standard/mail.c
---- php-4.2.3.org/ext/standard/mail.c	Tue Oct 29 21:35:04 2002
-+++ php-4.2.3/ext/standard/mail.c	Tue Oct 29 21:33:03 2002
+--- 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,22 +8,39 @@ diff -urN php-4.2.3.org/ext/standard/mail.c php-4.2.3/ext/standard/mail.c
 +#include <string.h>
  #include "php.h"
  #include "ext/standard/info.h"
- #if !defined(PHP_WIN32)
-@@ -37,6 +39,10 @@
+ 
+@@ -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"
-@@ -166,8 +172,42 @@
- 		efree (sendmail_cmd);
+@@ -107,6 +111,18 @@
+ 		return;
+ 	}
  
- 	if (sendmail) {
++    /* 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
 -		fprintf(sendmail, "To: %s\n", to);
 -		fprintf(sendmail, "Subject: %s\n", subject);
 +		TSRMLS_FETCH();
@@ -35,10 +51,10 @@ diff -urN php-4.2.3.org/ext/standard/mail.c php-4.2.3/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,
-+				**request_uri, **http_user_agent;
++				**script_name, **http_user_agent;
 +			
 +			if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **) &remote_addr)==SUCCESS) {
 +				convert_to_string_ex(remote_addr);
@@ -51,9 +67,9 @@ diff -urN php-4.2.3.org/ext/standard/mail.c php-4.2.3/ext/standard/mail.c
 +					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, "REQUEST_URI", sizeof("REQUEST_URI"), (void **) &request_uri)==SUCCESS) {
-+					convert_to_string_ex(request_uri);
-+					fprintf(sendmail, "%s", Z_STRVAL_PP(request_uri));
++				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));
 +				}
 +				fprintf(sendmail, "\n");
 +			}