Better checking for invalid 8bit data

horde · May 27, 2014 · a55b82f · a55b82f
1 parent c291d10
commit a55b82f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/framework/Smtp/lib/Horde/Smtp.php b/framework/Smtp/lib/Horde/Smtp.php
@@ -505,6 +505,12 @@ public function send($from, $to, $data, array $opts = array())
 
         // RFC 6152[3]
         if (!empty($opts['8bit'])) {
+            if (!$this->data_8bit) {
+                throw new InvalidArgumentException(
+                    'Server does not support sending 8-bit data.'
+                );
+            }
+
             $mailcmd .= ' BODY=8BITMIME';
         } elseif ($this->_debug->active && $this->data_8bit) {
             /* Only output extended 7bit command if debug is active (it is