You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2011/04/06 00:06:08 UTC
svn commit: r1089264 - in /commons/proper/net/trunk/src: changes/
main/java/org/apache/commons/net/imap/ main/java/org/apache/commons/net/nntp/
main/java/org/apache/commons/net/pop3/ main/java/org/apache/commons/net/smtp/
Author: sebb
Date: Tue Apr 5 22:06:07 2011
New Revision: 1089264
URL: http://svn.apache.org/viewvc?rev=1089264&view=rev
Log:
NET-402 IMAP, NNTP, POP3 and SMTP classes uses BufferedReader for control channel, which does not follow the standard.
Changed reader to CRLFLineReader.
Modified:
commons/proper/net/trunk/src/changes/changes.xml
commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAPSClient.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NNTP.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3.java
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTP.java
Modified: commons/proper/net/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1089264&r1=1089263&r2=1089264&view=diff
==============================================================================
--- commons/proper/net/trunk/src/changes/changes.xml (original)
+++ commons/proper/net/trunk/src/changes/changes.xml Tue Apr 5 22:06:07 2011
@@ -67,6 +67,10 @@ This release is binary-compatible with 2
- ftp.FTPSClient ctors no longer throw NoSuchAlgorithmException
All users are recommended to upgrade.
">
+ <action issue="NET-402" dev="sebb" type="fix">
+ IMAP, NNTP, POP3 and SMTP classes uses BufferedReader for control channel, which does not follow the standard.
+ Changed reader to CRLFLineReader.
+ </action>
<action issue="NET-401" dev="sebb" type="fix">
FTP class uses BufferedReader for control channel, which does not follow the standard.
Changed reader to CRLFLineReader.
Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAPSClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAPSClient.java?rev=1089264&r1=1089263&r2=1089264&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAPSClient.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/imap/IMAPSClient.java Tue Apr 5 22:06:07 2011
@@ -31,6 +31,7 @@ import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
+import org.apache.commons.net.io.CRLFLineReader;
import org.apache.commons.net.util.SSLContextUtils;
/**
@@ -198,7 +199,7 @@ public class IMAPSClient extends IMAPCli
_input_ = socket.getInputStream();
_output_ = socket.getOutputStream();
_reader =
- new BufferedReader(new InputStreamReader(_input_,
+ new CRLFLineReader(new InputStreamReader(_input_,
__DEFAULT_ENCODING));
__writer =
new BufferedWriter(new OutputStreamWriter(_output_,
Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NNTP.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NNTP.java?rev=1089264&r1=1089263&r2=1089264&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NNTP.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/nntp/NNTP.java Tue Apr 5 22:06:07 2011
@@ -26,6 +26,7 @@ import java.io.OutputStreamWriter;
import org.apache.commons.net.MalformedServerReplyException;
import org.apache.commons.net.ProtocolCommandSupport;
import org.apache.commons.net.SocketClient;
+import org.apache.commons.net.io.CRLFLineReader;
/***
* The NNTP class is not meant to be used by itself and is provided
@@ -169,7 +170,7 @@ public class NNTP extends SocketClient
{
super._connectAction_();
_reader_ =
- new BufferedReader(new InputStreamReader(_input_,
+ new CRLFLineReader(new InputStreamReader(_input_,
__DEFAULT_ENCODING));
_writer_ =
new BufferedWriter(new OutputStreamWriter(_output_,
Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3.java?rev=1089264&r1=1089263&r2=1089264&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/pop3/POP3.java Tue Apr 5 22:06:07 2011
@@ -29,6 +29,7 @@ import java.util.List;
import org.apache.commons.net.MalformedServerReplyException;
import org.apache.commons.net.ProtocolCommandSupport;
import org.apache.commons.net.SocketClient;
+import org.apache.commons.net.io.CRLFLineReader;
/***
* The POP3 class is not meant to be used by itself and is provided
@@ -142,7 +143,7 @@ public class POP3 extends SocketClient
{
super._connectAction_();
_reader =
- new BufferedReader(new InputStreamReader(_input_,
+ new CRLFLineReader(new InputStreamReader(_input_,
__DEFAULT_ENCODING));
__writer =
new BufferedWriter(new OutputStreamWriter(_output_,
Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTP.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTP.java?rev=1089264&r1=1089263&r2=1089264&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTP.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTP.java Tue Apr 5 22:06:07 2011
@@ -27,6 +27,7 @@ import java.util.ArrayList;
import org.apache.commons.net.MalformedServerReplyException;
import org.apache.commons.net.ProtocolCommandSupport;
import org.apache.commons.net.SocketClient;
+import org.apache.commons.net.io.CRLFLineReader;
/***
* SMTP provides the basic the functionality necessary to implement your
@@ -250,7 +251,7 @@ public class SMTP extends SocketClient
{
super._connectAction_();
_reader =
- new BufferedReader(new InputStreamReader(_input_,
+ new CRLFLineReader(new InputStreamReader(_input_,
encoding));
_writer =
new BufferedWriter(new OutputStreamWriter(_output_,