Author: kkolinko
Date: Fri Feb 4 03:22:53 2011
New Revision: 1067075
URL: http://svn.apache.org/viewvc?rev=1067075&view=rev
Log:
Align server.xml installed by the Windows installer with the one bundled in
zip/tar.gz files.
Modified:
tomcat/trunk/res/confinstall/server_2.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/res/confinstall/server_2.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/confinstall/server_2.xml?rev=1067075&r1=1067074&r2=1067075&view=diff
==============================================================================
--- tomcat/trunk/res/confinstall/server_2.xml (original)
+++ tomcat/trunk/res/confinstall/server_2.xml Fri Feb 4 03:22:53 2011
@@ -40,16 +40,17 @@
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
-->
- <!-- This Realm uses the UserDatabase configured in the global JNDI
- resources under the key "UserDatabase". Any edits
- that are performed against this UserDatabase are immediately
- available for use by the Realm. -->
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- resourceName="UserDatabase"/>
+ <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+ via a brute-force attack -->
+ <Realm className="org.apache.catalina.realm.LockOutRealm">
+ <!-- This Realm uses the UserDatabase configured in the global JNDI
+ resources under the key "UserDatabase". Any edits
+ that are performed against this UserDatabase are immediately
+ available for use by the Realm. -->
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ resourceName="UserDatabase"/>
+ </Realm>
- <!-- Define the default virtual host
- Note: XML Schema validation will not work with Xerces 2.2.
- -->
<Host name="localhost" appBase="webapps"
unpackWARs="true" autoDeploy="true">
@@ -60,11 +61,11 @@
-->
<!-- Access log processes all example.
- Documentation at: /docs/config/valve.html -->
- <!--
+ Documentation at: /docs/config/valve.html
+ Note: The pattern used is equivalent to using pattern="common" -->
<Valve className="org.apache.catalina.valves.AccessLogValve"
directory="logs"
- prefix="localhost_access_log." suffix=".txt" pattern="common"
resolveHosts="false"/>
- -->
+ prefix="localhost_access_log." suffix=".txt"
+ pattern="%h %l %u %t "%r" %s %b"
resolveHosts="false"/>
</Host>
</Engine>
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1067075&r1=1067074&r2=1067075&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 4 03:22:53 2011
@@ -49,6 +49,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Align server.xml installed by the Windows installer with the one
+ bundled in zip/tar.gz files. The differences are LockOutRealm being
+ used and AccessLogValve being enabled by default. (kkolinko)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.7 (markt)">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
