diff options
| author | Rui Hirokawa <hirokawa@php.net> | 2005-11-04 16:13:44 +0000 |
|---|---|---|
| committer | Rui Hirokawa <hirokawa@php.net> | 2005-11-04 16:13:44 +0000 |
| commit | 6fb699c41702eaaa22c6c4725f12f23a7b876137 (patch) | |
| tree | cac8752272e51d377d594c42c9e602942961128d | |
| parent | 3d26a25fe965a5cf9b4a3655f5184378c788ae61 (diff) | |
| download | php-git-6fb699c41702eaaa22c6c4725f12f23a7b876137.tar.gz | |
removed mail.force_extra_parameters which is unsuppoted in php4.
| -rw-r--r-- | ext/mbstring/mbstring.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 89adfb9c66..f5231ea51a 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -3474,7 +3474,6 @@ PHP_FUNCTION(mb_send_mail) 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 @@ PHP_FUNCTION(mb_send_mail) 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); } |