billbarker 2003/03/23 01:04:06
Modified: coyote/src/java/org/apache/coyote Tag: coyote_10
Request.java
coyote/src/java/org/apache/coyote/tomcat4 Tag: coyote_10
CoyoteAdapter.java
Log:
Port Patch from main branch.
Revision Changes Path
No revision
No revision
1.15.2.1 +1 -1
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.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- Request.java 19 Sep 2002 06:39:43 -0000 1.15
+++ Request.java 23 Mar 2003 09:04:06 -0000 1.15.2.1
@@ -481,7 +481,7 @@
//remoteHostMB.recycle();
// XXX Do we need such defaults ?
- schemeMB.setString("http");
+ schemeMB.recycle();
methodMB.setString("GET");
uriMB.setString("/");
queryMB.setString("");
No revision
No revision
1.13.2.4 +16 -5
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
Index: CoyoteAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -u -r1.13.2.3 -r1.13.2.4
--- CoyoteAdapter.java 16 Mar 2003 01:56:27 -0000 1.13.2.3
+++ CoyoteAdapter.java 23 Mar 2003 09:04:06 -0000 1.13.2.4
@@ -248,7 +248,18 @@
throws IOException {
// XXX the processor needs to set a correct scheme and port prior to this
point,
// in ajp13 protocols dont make sense to get the port from the connector..
- request.setSecure(req.scheme().equals("https"));
+ // XXX the processor may have set a correct scheme and port prior to this
point,
+ // in ajp13 protocols dont make sense to get the port from the connector...
+ // otherwise, use connector configuration
+ if (! req.scheme().isNull()) {
+ // use processor specified scheme to determine secure state
+ request.setSecure(req.scheme().equals("https"));
+ } else {
+ // use connector scheme and secure configuration, (defaults to
+ // "http" and false respectively)
+ req.scheme().setString(connector.getScheme());
+ request.setSecure(connector.getSecure());
+ }
request.setAuthorization
(req.getHeader(Constants.AUTHORIZATION_HEADER));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
