From 63cd762cda61fd1efb95e0fce88d3df116b22a17 Mon Sep 17 00:00:00 2001 From: alec Date: Fri, 7 Oct 2011 08:43:07 +0000 Subject: - Ignore DSN request when it isn't supported by SMTP server (#1487800) git-svn-id: https://svn.roundcube.net/trunk@5319 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_smtp.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'roundcubemail/program/include') diff --git a/roundcubemail/program/include/rcube_smtp.php b/roundcubemail/program/include/rcube_smtp.php index 73c30d227..5c2dd92d2 100644 --- a/roundcubemail/program/include/rcube_smtp.php +++ b/roundcubemail/program/include/rcube_smtp.php @@ -214,14 +214,10 @@ class rcube_smtp if ($opts['dsn']) { $exts = $this->conn->getServiceExtensions(); - if (!isset($exts['DSN'])) { - $this->error = array('label' => 'smtpdsnerror'); - $this->response[] = "DSN not supported"; - return false; + if (isset($exts['DSN'])) { + $from_params = 'RET=HDRS'; + $recipient_params = 'NOTIFY=SUCCESS,FAILURE'; } - - $from_params = 'RET=HDRS'; - $recipient_params = 'NOTIFY=SUCCESS,FAILURE'; } // RFC2298.3: remove envelope sender address -- cgit v1.2.3