Author: remm
Date: Wed Nov 23 08:15:53 2005
New Revision: 348476
URL: http://svn.apache.org/viewcvs?rev=348476&view=rev
Log:
- Do the same with SSL.
Modified:
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
Modified:
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=348476&r1=348475&r2=348476&view=diff
==============================================================================
---
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
Wed Nov 23 08:15:53 2005
@@ -1090,8 +1090,8 @@
} else if (actionCode == ActionCode.ACTION_REQ_SSL_ATTRIBUTE ) {
- try {
- if (ssl) {
+ if (ssl && (socket != 0)) {
+ try {
// Cipher suite
Object sslO = SSLSocket.getInfoS(socket,
SSL.SSL_INFO_CIPHER);
if (sslO != null) {
@@ -1127,14 +1127,14 @@
request.setAttribute
(AprEndpoint.SESSION_ID_KEY, sslO);
}
+ } catch (Exception e) {
+ log.warn(sm.getString("http11processor.socket.ssl"), e);
}
- } catch (Exception e) {
- log.warn(sm.getString("http11processor.socket.ssl"), e);
}
} else if (actionCode == ActionCode.ACTION_REQ_SSL_CERTIFICATE) {
- if (ssl) {
+ if (ssl && (socket != 0)) {
// Consume and buffer the request body, so that it does not
// interfere with the client's handshake messages
InputFilter[] inputFilters = inputBuffer.getFilters();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
