You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2009/10/20 10:19:58 UTC

svn commit: r826994 - /james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/ReceivedDataLineFilter.java

Author: norman
Date: Tue Oct 20 08:19:57 2009
New Revision: 826994

URL: http://svn.apache.org/viewvc?rev=826994&view=rev
Log:
Add \r\n in the headers..

Modified:
    james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/ReceivedDataLineFilter.java

Modified: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/ReceivedDataLineFilter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/ReceivedDataLineFilter.java?rev=826994&r1=826993&r2=826994&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/ReceivedDataLineFilter.java (original)
+++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/core/ReceivedDataLineFilter.java Tue Oct 20 08:19:57 2009
@@ -54,8 +54,8 @@
         
         headerLineBuffer.append(" ([")
                         .append(session.getRemoteIPAddress())
-                        .append("])");
-        
+                        .append("])")
+        				.append("\r\n");
         next.onLine(session,headerLineBuffer.toString().getBytes());
         headerLineBuffer.delete(0, headerLineBuffer.length());
         
@@ -88,14 +88,15 @@
             // Only indicate a recipient if they're the only recipient
             // (prevents email address harvesting and large headers in
             //  bulk email)
-            
+        	headerLineBuffer.append("\r\n");
             next.onLine(session,headerLineBuffer.toString().getBytes());
             headerLineBuffer.delete(0, headerLineBuffer.length());
             
             headerLineBuffer.delete(0, headerLineBuffer.length());
             headerLineBuffer.append("          for <")
                             .append(((List) session.getState().get(SMTPSession.RCPT_LIST)).get(0).toString())
-                            .append(">;");            
+                            .append(">;")
+                            .append("\r\n");
             
             next.onLine(session,headerLineBuffer.toString().getBytes());
             headerLineBuffer.delete(0, headerLineBuffer.length());
@@ -104,11 +105,11 @@
         } else {
             // Put the ; on the end of the 'by' line
             headerLineBuffer.append(";");
-            
+            headerLineBuffer.append("\r\n");
             next.onLine(session,headerLineBuffer.toString().getBytes());
             headerLineBuffer.delete(0, headerLineBuffer.length());
         }
         headerLineBuffer = null;
-        next.onLine(session,("          " + rfc822DateFormat.format(new Date())).getBytes());
+        next.onLine(session,("          " + rfc822DateFormat.format(new Date()) + "\r\n").getBytes());
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org