iliaa Wed Sep 21 09:19:20 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src NEWS
/php-src/ext/mbstring mbstring.c
Log:
MFH: Fixed bug #34565 (mb_send_mail does not fetch
mail.force_extra_parameters)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.39&r2=1.1247.2.920.2.40&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.39 php-src/NEWS:1.1247.2.920.2.40
--- php-src/NEWS:1.1247.2.920.2.39 Tue Sep 20 16:59:54 2005
+++ php-src/NEWS Wed Sep 21 09:19:17 2005
@@ -2,6 +2,8 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2005, Version 4.4.1
- Added "new_link" parameter to mssql_connect(). Bug #34369. (Frank)
+- Fixed bug #34565 (mb_send_mail does not fetch mail.force_extra_parameters).
+ (Marco, Ilia)
- Fixed bug #34456 (Possible crash inside pspell extension). (Nuno)
- Fixed bug #34311 (unserialize() crashes with chars above 191 dec). (Nuno)
- Fixed bug #34307 (on_modify handler not called to set the default value if
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.142.2.47&r2=1.142.2.47.2.1&ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.47
php-src/ext/mbstring/mbstring.c:1.142.2.47.2.1
--- php-src/ext/mbstring/mbstring.c:1.142.2.47 Mon Feb 21 03:03:47 2005
+++ php-src/ext/mbstring/mbstring.c Wed Sep 21 09:19:19 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.142.2.47 2005/02/21 08:03:47 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.47.2.1 2005/09/21 13:19:19 iliaa Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -55,6 +55,7 @@
#include "mbstring.h"
#include "ext/standard/php_string.h"
#include "ext/standard/php_mail.h"
+#include "ext/standard/exec.h"
#include "ext/standard/url.h"
#include "main/php_output.h"
#include "ext/standard/info.h"
@@ -3473,6 +3474,7 @@
body_enc; /* body transfar encoding */
mbfl_memory_device device; /* automatic allocateable buffer for
additional header */
const mbfl_language *lang;
+ char *force_extra_parameters = INI_STR("mail.force_extra_parameters");
int err = 0;
/* initialize */
@@ -3594,12 +3596,21 @@
extra_cmd = Z_STRVAL_PP(argv[4]);
}
+ if (force_extra_parameters) {
+ extra_cmd = estrdup(force_extra_parameters);
+ } else if (extra_cmd) {
+ extra_cmd = php_escape_shell_cmd(extra_cmd);
+ }
+
if (!err && php_mail(to, subject, message, headers, extra_cmd
TSRMLS_CC)) {
RETVAL_TRUE;
} else {
RETVAL_FALSE;
}
+ if (extra_cmd) {
+ efree(extra_cmd);
+ }
if (subject_buf) {
efree((void *)subject_buf);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
