hirokawa Fri Nov 4 11:13:45 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/mbstring mbstring.c
Log:
removed mail.force_extra_parameters which is unsuppoted in php4.
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.142.2.47.2.1&r2=1.142.2.47.2.2&ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.47.2.1
php-src/ext/mbstring/mbstring.c:1.142.2.47.2.2
--- php-src/ext/mbstring/mbstring.c:1.142.2.47.2.1 Wed Sep 21 09:19:19 2005
+++ php-src/ext/mbstring/mbstring.c Fri Nov 4 11:13:44 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.142.2.47.2.1 2005/09/21 13:19:19 iliaa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.47.2.2 2005/11/04 16:13:44 hirokawa Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -3474,7 +3474,6 @@
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 */
@@ -3596,9 +3595,7 @@
extra_cmd = Z_STRVAL_PP(argv[4]);
}
- if (force_extra_parameters) {
- extra_cmd = estrdup(force_extra_parameters);
- } else if (extra_cmd) {
+ if (extra_cmd) {
extra_cmd = php_escape_shell_cmd(extra_cmd);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
