@- 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().

1 files changed, 3 insertions, 2 deletions

diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index 6e3fd4a277..ac1c807678 100644
--- 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;