Author: kkolinko Date: Sat Mar 16 09:32:19 2013 New Revision: 1457228 URL: http://svn.apache.org/r1457228 Log: CTR: xml comment Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=22278 Add commented out sample configuration of RemoteAddrValve to Manager and Host Manager applications.
(Copying the current text from TC7. Initially introduced in r1060627 based on patch by Yann Cébron and improved later). Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/host-manager/META-INF/context.xml tomcat/tc6.0.x/trunk/webapps/manager/META-INF/context.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1457228&r1=1457227&r2=1457228&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Mar 16 09:32:19 2013 @@ -98,6 +98,11 @@ </subsection> <subsection name="Web applications"> <changelog> + <update> + <bug>22278</bug>: Add a commented out sample configuration of + <code>RemoteAddrValve</code> to <code>META-INF/context.xml</code> + files of the Manager and Host Manager applications. (kkolinko) + </update> <fix> <bug>54080</bug>: Clarify documentation for initial value of <code>internalProxies</code> attribute of <code>RemoteIpValve</code>. Modified: tomcat/tc6.0.x/trunk/webapps/host-manager/META-INF/context.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/META-INF/context.xml?rev=1457228&r1=1457227&r2=1457228&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/host-manager/META-INF/context.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/host-manager/META-INF/context.xml Sat Mar 16 09:32:19 2013 @@ -15,4 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> -<Context antiResourceLocking="false" privileged="true" useHttpOnly="true" /> +<Context antiResourceLocking="false" privileged="true" useHttpOnly="true" > + <!-- + Remove the comment markers from around the Valve below to limit access to + the host-manager application to clients connecting from localhost + --> + <!-- + <Valve className="org.apache.catalina.valves.RemoteAddrValve" + allow="127\.\d+\.\d+\.\d+|::1|0:0:0:0:0:0:0:1" /> + --> +</Context> Modified: tomcat/tc6.0.x/trunk/webapps/manager/META-INF/context.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/META-INF/context.xml?rev=1457228&r1=1457227&r2=1457228&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/manager/META-INF/context.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/manager/META-INF/context.xml Sat Mar 16 09:32:19 2013 @@ -15,4 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> -<Context antiResourceLocking="false" privileged="true" useHttpOnly="true" /> +<Context antiResourceLocking="false" privileged="true" useHttpOnly="true" > + <!-- + Remove the comment markers from around the Valve below to limit access to + the manager application to clients connecting from localhost + --> + <!-- + <Valve className="org.apache.catalina.valves.RemoteAddrValve" + allow="127\.\d+\.\d+\.\d+|::1|0:0:0:0:0:0:0:1" /> + --> +</Context> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org