bobh 2002/09/18 09:44:35
Modified: . gump.xml
coyote/src/java/org/apache/coyote Request.java
http11/src/java/org/apache/coyote/http11
Http11Processor.java
Log:
- This associates the socket with the Request. This is so the
CertificatesValve.verify() can tell where (which socket) the Request
is comeing from. Without this association, CertificatesValve.verify()
returns with no SSL Handshake.
- this change is in part based on feed back from; Vivek N. Yingxian
Wang (JSSE), Craig M., Qingqing Ouyang
Revision Changes Path
1.8 +1 -0 jakarta-tomcat-connectors/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/gump.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gump.xml 7 Sep 2002 15:17:19 -0000 1.7
+++ gump.xml 18 Sep 2002 16:44:35 -0000 1.8
@@ -55,6 +55,7 @@
<ant basedir="coyote">
<property name="catalina.home" reference="home"
project="jakarta-tomcat-catalina"/>
+ <property name="tomcat33.home" value=""/>
</ant>
<depend project="jakarta-ant"/>
1.14 +16 -0
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Request.java
Index: Request.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Request.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Request.java 9 Apr 2002 18:19:27 -0000 1.13
+++ Request.java 18 Sep 2002 16:44:35 -0000 1.14
@@ -73,6 +73,8 @@
import org.apache.tomcat.util.http.ContentType;
import org.apache.tomcat.util.http.Cookies;
+import java.net.Socket;
+
/**
* This is a low-level, efficient representation of a server request. Most
* fields are GC-free, expensive operations are delayed until the user code
@@ -184,6 +186,9 @@
private Response response;
private ActionHook hook;
+
+ private Socket socket;
+
// ------------------------------------------------------------- Properties
@@ -203,10 +208,21 @@
return headers;
}
+ /* Used to associate this Request with a socket. Used later to do
+ SSL related stuff. */
+ public Socket getSocket() {
+ return this.socket;
+ }
+
+ public void setSocket(Socket socket) {
+ this.socket = socket;
+ }
+
public UDecoder getURLDecoder() {
return urlDecoder;
}
+
// -------------------- Request data --------------------
1.35 +3 -1
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
Index: Http11Processor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Http11Processor.java 8 Jul 2002 16:50:46 -0000 1.34
+++ Http11Processor.java 18 Sep 2002 16:44:35 -0000 1.35
@@ -602,8 +602,10 @@
http11 = true;
http09 = false;
contentDelimitation = false;
- if (sslSupport != null)
+ if (sslSupport != null) {
request.scheme().setString("https");
+ request.setSocket( socket );
+ }
MessageBytes protocolMB = request.protocol();
if (protocolMB.equals(Constants.HTTP_11)) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
