Author: markt Date: Tue Dec 1 20:32:15 2015 New Revision: 1717515 URL: http://svn.apache.org/viewvc?rev=1717515&view=rev Log: Review comments from kkolinko for useRelativeRedirects implementation
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml tomcat/trunk/webapps/docs/config/context.xml tomcat/trunk/webapps/docs/config/systemprops.xml Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1717515&r1=1717514&r2=1717515&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Dec 1 20:32:15 2015 @@ -821,7 +821,7 @@ public class StandardContext extends Con private boolean mapperDirectoryRedirectEnabled = false; - private boolean useRelativeRedirects = true; + private boolean useRelativeRedirects = !Globals.STRICT_SERVLET_COMPLIANCE; // ----------------------------------------------------- Context Properties Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1717515&r1=1717514&r2=1717515&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Tue Dec 1 20:32:15 2015 @@ -339,6 +339,10 @@ is="true" type="boolean"/> + <attribute name="useRelativeRedirects" + description="When generating location headers for 302 responses, should a relative URI be used?" + type="boolean"/> + <attribute name="webappVersion" description="The version of this web application - used in parallel deployment to differentiate different versions of the same web application" type="java.lang.String" Modified: tomcat/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1717515&r1=1717514&r2=1717515&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/context.xml (original) +++ tomcat/trunk/webapps/docs/config/context.xml Tue Dec 1 20:32:15 2015 @@ -562,7 +562,11 @@ creates. Absolute redirects should work with reverse proxies that change the context path but may cause issues with the <code>org.apache.catalina.filters.RemoteIpFilter</code> if the filter is - changing the scheme and/or port. Defaults to <code>true</code>. + changing the scheme and/or port. If the + <code>org.apache.catalina.STRICT_SERVLET_COMPLIANCE</code> + <a href="systemprops.html">system property</a> is set to + <code>true</code>, the default value of this attribute will be + <code>false</code>, else the default value will be <code>true</code>. </p> </attribute> Modified: tomcat/trunk/webapps/docs/config/systemprops.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1717515&r1=1717514&r2=1717515&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/systemprops.xml (original) +++ tomcat/trunk/webapps/docs/config/systemprops.xml Tue Dec 1 20:32:15 2015 @@ -287,6 +287,8 @@ <a href="context.html">Context</a> element.</li> <li>The <code>tldValidation</code> attribute of any <a href="context.html">Context</a> element.</li> + <li>The <code>useRelativeRedirects</code> attribute of any + <a href="context.html">Context</a> element.</li> <li>The <code>xmlNamespaceAware</code> attribute of any <a href="context.html">Context</a> element.</li> <li>The <code>xmlValidation</code> attribute of any --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org