Author: markt
Date: Mon Oct 22 22:48:38 2012
New Revision: 1401114
URL: http://svn.apache.org/viewvc?rev=1401114&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54010
Remove some unnecessary code (duplicate calls to configure the scheme as https
for AJP requests originally received over HTTPS).
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1401114&r1=1401113&r2=1401114&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Mon Oct
22 22:48:38 2012
@@ -768,20 +768,17 @@ public abstract class AbstractAjpProcess
break;
case Constants.SC_A_SSL_CERT :
- request.scheme().setString("https");
// SSL certificate extraction is lazy, moved to JkCoyoteHandler
requestHeaderMessage.getBytes(certificates);
break;
case Constants.SC_A_SSL_CIPHER :
- request.scheme().setString("https");
requestHeaderMessage.getBytes(tmpMB);
request.setAttribute(SSLSupport.CIPHER_SUITE_KEY,
tmpMB.toString());
break;
case Constants.SC_A_SSL_SESSION :
- request.scheme().setString("https");
requestHeaderMessage.getBytes(tmpMB);
request.setAttribute(SSLSupport.SESSION_ID_KEY,
tmpMB.toString());
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1401114&r1=1401113&r2=1401114&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Oct 22 22:48:38 2012
@@ -105,6 +105,11 @@
default value will never go above 2 regardless of available processors.
(fhanik)
</scode>
+ <fix>
+ <bug>54010</bug>: Remove some unnecessary code (duplicate calls to
+ configure the scheme as https for AJP requests originally received over
+ HTTPS). (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
