Author: markt
Date: Fri Dec 12 14:52:05 2014
New Revision: 1644910
URL: http://svn.apache.org/r1644910
Log:
Re-write comment to remove XXX marker
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1644910&r1=1644909&r2=1644910&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Fri Dec
12 14:52:05 2014
@@ -555,9 +555,9 @@ public class CoyoteAdapter implements Ad
Response response)
throws Exception {
- // 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 the processor has set the scheme (AJP will do this) use this to
+ // set the secure flag as well. If the processor hasn't set it, use the
+ // settings from the connector
if (! req.scheme().isNull()) {
// use processor specified scheme to determine secure state
request.setSecure(req.scheme().equals("https"));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
