svn commit: r669631 - /geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java

[ri...@apache.org]

Author: rickmcguire
Date: Thu Jun 19 11:29:12 2008
New Revision: 669631

URL: http://svn.apache.org/viewvc?rev=669631&view=rev
Log:
GERONIMO-4138 The SMTPTransport should be adding the BODY=8BITMIME when using 8-bit encodings for the body. 


Modified:
    geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java

Modified: geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java?rev=669631&r1=669630&r2=669631&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java (original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.4/geronimo-javamail_1.4_provider/src/main/java/org/apache/geronimo/javamail/transport/smtp/SMTPTransport.java Thu Jun 19 11:29:12 2008
@@ -479,6 +479,8 @@
         Address[] unsent = null;
         Address[] invalid = null;
         
+        boolean sendAs8bit = false; 
+        
         // If the server supports the 8BITMIME extension, we might need to change the 
         // transfer encoding for the content to allow for direct transmission of the 
         // 8-bit codes. 
@@ -486,6 +488,8 @@
             // we only do this if the capability was enabled via a property option or 
             // by explicitly setting the property on the message object. 
             if (use8bit || (message instanceof SMTPMessage && ((SMTPMessage)message).getAllow8bitMIME())) {
+                // make sure we add the BODY= option to the FROM message. 
+                sendAs8bit = true; 
                 // go check the content and see if the can convert the transfer encoding to 
                 // allow direct 8-bit transmission. 
                 if (convertTransferEncoding((MimeMessage)message)) {
@@ -500,7 +504,7 @@
             // send sender first. If this failed, send a failure notice of the
             // event, using the full list of
             // addresses as the unsent, and nothing for the rest.
-            if (!sendMailFrom(message)) {
+            if (!sendMailFrom(message, sendAs8bit)) {
                 unsent = addresses;
                 sent = new Address[0];
                 invalid = new Address[0];
@@ -1557,13 +1561,17 @@
 
     /**
      * Set the sender for this mail.
-     *
+     * 
      * @param message
-     *            The message we're sending.
-     *
+     *                   The message we're sending.
+     * @param sendAs8bit Indicates we're going to transmit the message body
+     *                   as 8BITMIME, so add the BODY= option to the FROM
+     *                   message.
+     * 
+     * @return True if the command was accepted, false otherwise. 
      * @exception MessagingException
      */
-    protected boolean sendMailFrom(Message message) throws MessagingException {
+    protected boolean sendMailFrom(Message message, boolean sendAs8bit) throws MessagingException {
 
         // need to sort the from value out from a variety of sources.
         String from = null;
@@ -1606,8 +1614,13 @@
         StringBuffer command = new StringBuffer();
 
         // start building up the command
+        if (sendAs8bit) {
+        }
         command.append("MAIL FROM: ");
         command.append(fixEmailAddress(from));
+        if (sendAs8bit) {
+            command.append(" BODY=8BITMIME"); 
+        }
 
         // does this server support Delivery Status Notification? Then we may
         // need to add some extra to the command.