nacho 2002/09/29 10:07:44 Modified: coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java Log: Bug#12998 HTTPS gets changed to HTTP://servername:443 Reported by marcus.kellermann at bentley.com The processor (HTTP11 or ajp13) should set the scheme and port prior to this point, in an ajp13 connection doesnt make sense to get the secure flag from the connector secure flag. Revision Changes Path 1.10 +9 -14 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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- CoyoteAdapter.java 9 Sep 2002 07:56:22 -0000 1.9 +++ CoyoteAdapter.java 29 Sep 2002 17:07:44 -0000 1.10 @@ -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]>
