You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/07/12 04:39:20 UTC
svn commit: r555468 - in /mina:
branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
trunk/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
Author: trustin
Date: Wed Jul 11 19:39:19 2007
New Revision: 555468
URL: http://svn.apache.org/viewvc?view=rev&rev=555468
Log:
Related issue: DIRMINA-385 (SSLFilter starts writing to session before filter chain is complete)
* Clarified the behavior of SSLFilter in JavaDoc
Modified:
mina/branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
mina/branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
Modified: mina/branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
URL: http://svn.apache.org/viewvc/mina/branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java?view=diff&rev=555468&r1=555467&r2=555468
==============================================================================
--- mina/branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java (original)
+++ mina/branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java Wed Jul 11 19:39:19 2007
@@ -40,6 +40,11 @@
/**
* An SSL filter that encrypts and decrypts the data exchanged in the session.
+ * Adding this filter triggers SSL handshake procedure immediately by sending
+ * a SSL 'hello' message, so you don't need to call
+ * {@link #startSSL(IoSession)} manually unless you are implementing StartTLS
+ * (see below).
+ * <p>
* This filter uses an {@link SSLEngine} which was introduced in Java 5, so
* Java version 5 or above is mandatory to use this filter. And please note that
* this filter only works for TCP/IP connections.
Modified: mina/branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java?view=diff&rev=555468&r1=555467&r2=555468
==============================================================================
--- mina/branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java (original)
+++ mina/branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java Wed Jul 11 19:39:19 2007
@@ -40,6 +40,11 @@
/**
* An SSL filter that encrypts and decrypts the data exchanged in the session.
+ * Adding this filter triggers SSL handshake procedure immediately by sending
+ * a SSL 'hello' message, so you don't need to call
+ * {@link #startSSL(IoSession)} manually unless you are implementing StartTLS
+ * (see below).
+ * <p>
* This filter uses an {@link SSLEngine} which was introduced in Java 5, so
* Java version 5 or above is mandatory to use this filter. And please note that
* this filter only works for TCP/IP connections.
Modified: mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java?view=diff&rev=555468&r1=555467&r2=555468
==============================================================================
--- mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java (original)
+++ mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java Wed Jul 11 19:39:19 2007
@@ -28,7 +28,6 @@
import javax.net.ssl.SSLSession;
import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.DefaultWriteRequest;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoFuture;
@@ -44,6 +43,11 @@
/**
* An SSL filter that encrypts and decrypts the data exchanged in the session.
+ * Adding this filter triggers SSL handshake procedure immediately by sending
+ * a SSL 'hello' message, so you don't need to call
+ * {@link #startSSL(IoSession)} manually unless you are implementing StartTLS
+ * (see below).
+ * <p>
* This filter uses an {@link SSLEngine} which was introduced in Java 5, so
* Java version 5 or above is mandatory to use this filter. And please note that
* this filter only works for TCP/IP connections.