nacho 2002/10/04 12:27:09
Modified: coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
Log:
Porting Fixes done for Tomcat 4
Revision Changes Path
1.3 +9 -14
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CoyoteAdapter.java 2 Oct 2002 05:30:50 -0000 1.2
+++ CoyoteAdapter.java 4 Oct 2002 19:27:09 -0000 1.3
@@ -246,19 +246,14 @@
protected void postParseRequest(Request req, CoyoteRequest request,
Response res, CoyoteResponse response)
throws IOException {
-
- request.setSecure(connector.getSecure());
- req.scheme().setString(connector.getScheme());
+ // 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"));
request.setAuthorization
(req.getHeader(Constants.AUTHORIZATION_HEADER));
-
- // Replace the default port if we are in secure mode
- if (req.getServerPort() == 80
- && connector.getScheme().equals("https")) {
- req.setServerPort(443);
- }
-
+ // FIXME: the code below doesnt belongs to here, this is only have sense
+ // in Http11, not in ajp13..
// At this point the Host header has been processed.
// Override if the proxyPort/proxyHost are set
String proxyName = connector.getProxyName();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
