]> granicus.if.org Git - php/commitdiff
removed mail.force_extra_parameters which is unsuppoted in php4.
authorRui Hirokawa <hirokawa@php.net>
Fri, 4 Nov 2005 16:13:44 +0000 (16:13 +0000)
committerRui Hirokawa <hirokawa@php.net>
Fri, 4 Nov 2005 16:13:44 +0000 (16:13 +0000)
ext/mbstring/mbstring.c

index 89adfb9c669f50572fc1076857f37775f78d972c..f5231ea51adf1bd425aac1ee56bd5f539980068f 100644 (file)
@@ -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);
        }