@- Use escape_shell_cmd() to allow multiple extra parameters to the

@  invocation of the mailer as used in the fifth parameter to mail(). (Derick)
- Use escape_shell_cmd() to allow multiple extra parameters to the invocation
  of the mailer as used in the fifth parameter to mail().

diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index 6e3fd4a2774a1a8006ca0497a29f51f33796015b..ac1c807678d1235f8b219154afe736973bf791cb 100644 (file)
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -111,8 +111,9 @@ PHP_FUNCTION(mail)
                }
        }
 
-       if(extra_cmd)
-               extra_cmd = php_escape_shell_arg(extra_cmd);
+       if (extra_cmd) {
+               extra_cmd = php_escape_shell_cmd(extra_cmd);
+       }
        
        if (php_mail(to, subject, message, headers, extra_cmd TSRMLS_CC)) {
                RETVAL_TRUE;