Author: markt
Date: Sun Jun 5 10:03:50 2011
New Revision: 1132360
URL: http://svn.apache.org/viewvc?rev=1132360&view=rev
Log:
Removed ssl attribute from NIO and APR to align with BIO
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1132360&r1=1132359&r2=1132360&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Sun Jun
5 10:03:50 2011
@@ -79,8 +79,6 @@ public class Http11AprProcessor extends
outputBuffer = new InternalAprOutputBuffer(response, headerBufferSize);
response.setOutputBuffer(outputBuffer);
request.setResponse(response);
-
- ssl = endpoint.isSSLEnabled();
initializeFilters(maxTrailerSize);
@@ -117,12 +115,6 @@ public class Http11AprProcessor extends
/**
- * SSL enabled ?
- */
- protected boolean ssl = false;
-
-
- /**
* Socket associated with the current connection.
*/
protected SocketWrapper<Long> socket = null;
@@ -524,7 +516,7 @@ public class Http11AprProcessor extends
} else if (actionCode == ActionCode.REQ_SSL_ATTRIBUTE ) {
- if (ssl && (socketRef != 0)) {
+ if (endpoint.isSSLEnabled() && (socketRef != 0)) {
try {
// Cipher suite
Object sslO = SSLSocket.getInfoS(socketRef,
SSL.SSL_INFO_CIPHER);
@@ -573,7 +565,7 @@ public class Http11AprProcessor extends
} else if (actionCode == ActionCode.REQ_SSL_CERTIFICATE) {
- if (ssl && (socketRef != 0)) {
+ if (endpoint.isSSLEnabled() && (socketRef != 0)) {
// Consume and buffer the request body, so that it does not
// interfere with the client's handshake messages
InputFilter[] inputFilters = inputBuffer.getFilters();
@@ -653,7 +645,7 @@ public class Http11AprProcessor extends
contentDelimitation = false;
expectation = false;
sendfileData = null;
- if (ssl) {
+ if (endpoint.isSSLEnabled()) {
request.scheme().setString("https");
}
MessageBytes protocolMB = request.protocol();
@@ -865,7 +857,7 @@ public class Http11AprProcessor extends
}
if (colonPos < 0) {
- if (!ssl) {
+ if (!endpoint.isSSLEnabled()) {
// 80 - Default HTTP port
request.setServerPort(80);
} else {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1132360&r1=1132359&r2=1132360&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Sun Jun
5 10:03:50 2011
@@ -84,8 +84,6 @@ public class Http11NioProcessor extends
response.setOutputBuffer(outputBuffer);
request.setResponse(response);
- ssl = endpoint.isSSLEnabled();
-
initializeFilters(maxTrailerSize);
// Cause loading of HexUtils
@@ -125,12 +123,6 @@ public class Http11NioProcessor extends
protected boolean cometClose = false;
/**
- * SSL enabled ?
- */
- protected boolean ssl = false;
-
-
- /**
* Socket associated with the current connection.
*/
protected NioChannel socket = null;
@@ -695,7 +687,7 @@ public class Http11NioProcessor extends
contentDelimitation = false;
expectation = false;
sendfileData = null;
- if (ssl) {
+ if (endpoint.isSSLEnabled()) {
request.scheme().setString("https");
}
MessageBytes protocolMB = request.protocol();
@@ -908,7 +900,7 @@ public class Http11NioProcessor extends
}
if (colonPos < 0) {
- if (!ssl) {
+ if (!endpoint.isSSLEnabled()) {
// 80 - Default HTTP port
request.setServerPort(80);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
