summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include/rcube_smtp.php
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-10-07 08:43:07 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-10-07 08:43:07 +0000
commit63cd762cda61fd1efb95e0fce88d3df116b22a17 (patch)
treec1ac0e89471be27249274d24ba5edccd9382de38 /roundcubemail/program/include/rcube_smtp.php
parent291f893df68c3fbf5388c71dcc08bf973480e235 (diff)
- 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
Diffstat (limited to 'roundcubemail/program/include/rcube_smtp.php')
-rw-r--r--roundcubemail/program/include/rcube_smtp.php10
1 files changed, 3 insertions, 7 deletions
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