Author: jim
Date: Wed Mar 5 08:25:46 2008
New Revision: 633914
URL: http://svn.apache.org/viewvc?rev=633914&view=rev
Log:
Merge r616896 from trunk:
The NIO connector is hard-coded to use the JSSE SSL implementation so just use
it directly. This patch allows the JSSE dependency in the SSL abstraction to be
removed (this will be in a later patch).
Submitted by: markt
Reviewed by: jim
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=633914&r1=633913&r2=633914&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar 5 08:25:46 2008
@@ -28,15 +28,6 @@
PATCHES ACCEPTED TO BACKPORT:
[ start all new proposals below, under PATCHES PROPOSED. ]
-* Modify NIo connector to use JSSE SSL implementation directly
- http://svn.apache.org/viewvc?rev=616896&view=rev
- +1: markt, fhanik
- +1: remm: ok
- (markt) This is not an API change. It is preparation for an API
- change which will now be in a future release. The method
- that needs to be removed will now be marked as deprecated
- in 6.0.x (see patch below).
-
* Add tests for the cookie parsing and use package
org.apache.catalina.tomcat.util.http
http://people.apache.org/~jfclere/patches/test_cookies.patch2
+1: jfclere, fhanik, markt
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=633914&r1=633913&r2=633914&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Wed Mar 5 08:25:46 2008
@@ -39,7 +39,7 @@
import org.apache.tomcat.util.net.NioChannel;
import org.apache.tomcat.util.net.NioEndpoint;
import org.apache.tomcat.util.net.NioEndpoint.Handler;
-import org.apache.tomcat.util.net.SSLImplementation;
+import org.apache.tomcat.util.net.jsse.JSSEImplementation;
import org.apache.tomcat.util.net.SecureNioChannel;
import org.apache.tomcat.util.net.SocketStatus;
import org.apache.tomcat.util.res.StringManager;
@@ -56,7 +56,7 @@
*/
public class Http11NioProtocol implements ProtocolHandler, MBeanRegistration
{
- protected SSLImplementation sslImplementation = null;
+ protected JSSEImplementation sslImplementation = null;
public Http11NioProtocol() {
cHandler = new Http11ConnectionHandler( this );
@@ -134,7 +134,7 @@
try {
ep.init();
- sslImplementation =
SSLImplementation.getInstance("org.apache.tomcat.util.net.jsse.JSSEImplementation");
+ sslImplementation = new JSSEImplementation();
} catch (Exception ex) {
log.error(sm.getString("http11protocol.endpoint.initerror"), ex);
throw ex;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
