remm 2005/07/07 15:54:14
Modified: http11/src/java/org/apache/coyote/http11
Http11AprProtocol.java Http11AprProcessor.java
Log:
- Fix if block for replay data.
- The SSL code there is still a placeholder.
Revision Changes Path
1.14 +0 -1
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java
Index: Http11AprProtocol.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Http11AprProtocol.java 7 Jul 2005 14:08:40 -0000 1.13
+++ Http11AprProtocol.java 7 Jul 2005 22:54:13 -0000 1.14
@@ -187,7 +187,6 @@
protected AprEndpoint ep=new AprEndpoint();
protected boolean secure;
- // socket factory attriubtes ( XXX replace with normal setters )
protected Hashtable attributes = new Hashtable();
private int maxKeepAliveRequests=100; // as in Apache HTTPD server
1.22 +36 -34
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
Index: Http11AprProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Http11AprProcessor.java 3 Jul 2005 10:12:51 -0000 1.21
+++ Http11AprProcessor.java 7 Jul 2005 22:54:13 -0000 1.22
@@ -993,31 +993,6 @@
started = false;
- } else if (actionCode == ActionCode.ACTION_REQ_SSL_ATTRIBUTE ) {
-
- try {
- if (sslSupport != null) {
- Object sslO = sslSupport.getCipherSuite();
- if (sslO != null)
- request.setAttribute
- (SSLSupport.CIPHER_SUITE_KEY, sslO);
- sslO = sslSupport.getPeerCertificateChain(false);
- if (sslO != null)
- request.setAttribute
- (SSLSupport.CERTIFICATE_KEY, sslO);
- sslO = sslSupport.getKeySize();
- if (sslO != null)
- request.setAttribute
- (SSLSupport.KEY_SIZE_KEY, sslO);
- sslO = sslSupport.getSessionId();
- if (sslO != null)
- request.setAttribute
- (SSLSupport.SESSION_ID_KEY, sslO);
- }
- } catch (Exception e) {
- log.warn("Exception getting SSL attributes " ,e);
- }
-
} else if (actionCode == ActionCode.ACTION_REQ_HOST_ADDR_ATTRIBUTE) {
// Get remote host address
@@ -1106,7 +1081,33 @@
}
request.setLocalPort(localPort);
+ } else if (actionCode == ActionCode.ACTION_REQ_SSL_ATTRIBUTE ) {
+
+ try {
+ if (sslSupport != null) {
+ Object sslO = sslSupport.getCipherSuite();
+ if (sslO != null)
+ request.setAttribute
+ (SSLSupport.CIPHER_SUITE_KEY, sslO);
+ sslO = sslSupport.getPeerCertificateChain(false);
+ if (sslO != null)
+ request.setAttribute
+ (SSLSupport.CERTIFICATE_KEY, sslO);
+ sslO = sslSupport.getKeySize();
+ if (sslO != null)
+ request.setAttribute
+ (SSLSupport.KEY_SIZE_KEY, sslO);
+ sslO = sslSupport.getSessionId();
+ if (sslO != null)
+ request.setAttribute
+ (SSLSupport.SESSION_ID_KEY, sslO);
+ }
+ } catch (Exception e) {
+ log.warn("Exception getting SSL attributes " ,e);
+ }
+
} else if (actionCode == ActionCode.ACTION_REQ_SSL_CERTIFICATE) {
+
if( sslSupport != null) {
/*
* Consume and buffer the request body, so that it does not
@@ -1126,16 +1127,17 @@
} catch (Exception e) {
log.warn("Exception getting SSL Cert", e);
}
- } else if (actionCode == ActionCode.ACTION_REQ_SET_BODY_REPLAY) {
- ByteChunk body = (ByteChunk) param;
-
- InputFilter savedBody = new SavedRequestInputFilter(body);
- savedBody.setRequest(request);
-
- InternalInputBuffer internalBuffer = (InternalInputBuffer)
- request.getInputBuffer();
- internalBuffer.addActiveFilter(savedBody);
}
+
+ } else if (actionCode == ActionCode.ACTION_REQ_SET_BODY_REPLAY) {
+ ByteChunk body = (ByteChunk) param;
+
+ InputFilter savedBody = new SavedRequestInputFilter(body);
+ savedBody.setRequest(request);
+
+ InternalInputBuffer internalBuffer = (InternalInputBuffer)
+ request.getInputBuffer();
+ internalBuffer.addActiveFilter(savedBody);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
