summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-10-07 08:43:07 +0000
committeralecpl <alec@alec.pl>2011-10-07 08:43:07 +0000
commitfb40f3778412beefd7d5fed510cb3edb32220874 (patch)
treea83a81c91aaa0a1414cc405cf5784ce6014a7896 /program/include
parentb1f0846727331f58342e9cfdd02df03ea8f15181 (diff)
- Ignore DSN request when it isn't supported by SMTP server (#1487800)
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_smtp.php10
1 files changed, 3 insertions, 7 deletions
diff --git a/program/include/rcube_smtp.php b/program/include/rcube_smtp.php
index 73c30d227..5c2dd92d2 100644
--- a/program/include/rcube_smtp.php
+++ b/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