Author: markt
Date: Sat Jan 20 15:45:24 2007
New Revision: 498213
URL: http://svn.apache.org/viewvc?view=rev&rev=498213
Log:
Fix bug 40367. Add requirement for workers.properties to auto configuration
documentation.
Modified:
tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified: tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml?view=diff&rev=498213&r1=498212&r2=498213
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml Sat Jan 20
15:45:24 2007
@@ -254,8 +254,10 @@
</p>
<p>
-This will tell Apache to use directives in the <b>mod_jk.conf-auto</b> file in
the Apache configuration.
-This file is created by enabling the Apache auto-configuration by adding the
listener to the Engine
+This will tell Apache to use directives in the <b>mod_jk.conf-auto</b> file in
+the Apache configuration. This file is created by enabling the Apache
+auto-configuration by creating your workers.properties file at
+$TOMCAT_HOME/conf/jk/workers.properties and adding the listener to the Engine
element in the server.xml file as per the following example.
<b>Please note that this example is specific to Tomcat 5.x, unlike other
sections of this document
which also apply to previous Tomcat branches.</b>
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=498213&r1=498212&r2=498213
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Jan 20 15:45:24 2007
@@ -96,12 +96,21 @@
David Gagon. (markt)
</fix>
<fix>
+ <bug>40367</bug>: Update JK auto configuration documentation to clarify
+ that workers.properties must also exist. (markt)
+ </fix>
+ <fix>
<bug>40524</bug>: HttpServletRequest.getAuthType() now returns
CLIENT_CERT rather than CLIENT-CERT for certificate authentication
as per the spec. Note that web.xml continues to use CLIENT-CERT to
specify the certificate authentication should be used. (markt)
</fix>
<fix>
+ <bug>40526</bug>: Add support for JPDA_OPTS to catalina.bat and add a
+ JPDA_SUSPEND environment variable to both startup scripts. Patch
+ provided by Kurt Roy. (markt)
+ </fix>
+ <fix>
<bug>40528</bug>: Add missing message localisations as provided by
Ben Clifford. (markt)
</fix>
@@ -164,11 +173,6 @@
<bug>41217</bug>: Set secure attribute on SSO cookie when cookie is
created during a secure request. Patch provided by Chris Halstead.
(markt)
- </fix>
- <fix>
- <bug>40526</bug>: Add support for JPDA_OPTS to catalina.bat and add a
- JPDA_SUSPEND environment variable to both startup scripts. Patch
- provided by Kurt Roy. (markt)
</fix>
<fix>
Ensure Accept-Language headers conform to RFC 2616. Ignore them if
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
