Author: kkolinko
Date: Thu Sep 22 20:08:41 2011
New Revision: 1174362
URL: http://svn.apache.org/viewvc?rev=1174362&view=rev
Log:
Rephrase, like I already did for 5.5 and 6.0.
Modified:
tomcat/site/trunk/docs/security-7.html
tomcat/site/trunk/xdocs/security-7.xml
Modified: tomcat/site/trunk/docs/security-7.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1174362&r1=1174361&r2=1174362&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-7.html (original)
+++ tomcat/site/trunk/docs/security-7.html Thu Sep 22 20:08:41 2011
@@ -359,12 +359,20 @@
<li>Upgrade to Tomcat 7.0.21</li>
<li>Apply the appropriate <a
href="http://svn.apache.org/viewvc?view=rev&rev=1162958";>patch</a>
</li>
- <li>Configure both Tomcat and the reverse proxy to use a shared secret
- ("requiredSecret" attribute in
- <a href="/tomcat-7.0-doc/config/ajp.html"><Connector></a>;
- "worker.<i>workername</i>.secret" directive for
- <a href="/connectors-doc/reference/workers.html">mod_jk</a>;
- mod_proxy_ajp currently does not support shared secrets)</li>
+ <li>Configure both Tomcat and the reverse proxy to use a shared
secret.<br/>
+ (It is "<code>requiredSecret</code>" attribute in AJP <Connector>,
+ "<code>worker.<i>workername</i>.secret</code>" directive for mod_jk.
+ The mod_proxy_ajp module currently does not support shared
secrets).</li>
+ </ul>
+
+ <p>References:</p>
+ <ul>
+ <li>
+<a href="/tomcat-7.0-doc/config/ajp.html">AJP Connector documentation (Tomcat
7.0)</a>
+</li>
+ <li>
+<a href="/connectors-doc/reference/workers.html">workers.properties
configuration (mod_jk)</a>
+</li>
</ul>
</blockquote>
</p>
Modified: tomcat/site/trunk/xdocs/security-7.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-7.xml?rev=1174362&r1=1174361&r2=1174362&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/security-7.xml (original)
+++ tomcat/site/trunk/xdocs/security-7.xml Thu Sep 22 20:08:41 2011
@@ -59,12 +59,16 @@
<ul>
<li>Upgrade to Tomcat 7.0.21</li>
<li>Apply the appropriate <revlink rev="1162958">patch</revlink></li>
- <li>Configure both Tomcat and the reverse proxy to use a shared secret
- ("requiredSecret" attribute in
- <a href="/tomcat-7.0-doc/config/ajp.html"><Connector></a>;
- "worker.<i>workername</i>.secret" directive for
- <a href="/connectors-doc/reference/workers.html">mod_jk</a>;
- mod_proxy_ajp currently does not support shared secrets)</li>
+ <li>Configure both Tomcat and the reverse proxy to use a shared
secret.<br />
+ (It is "<code>requiredSecret</code>" attribute in AJP <Connector>,
+ "<code>worker.<i>workername</i>.secret</code>" directive for mod_jk.
+ The mod_proxy_ajp module currently does not support shared
secrets).</li>
+ </ul>
+
+ <p>References:</p>
+ <ul>
+ <li><a href="/tomcat-7.0-doc/config/ajp.html">AJP Connector
documentation (Tomcat 7.0)</a></li>
+ <li><a href="/connectors-doc/reference/workers.html">workers.properties
configuration (mod_jk)</a></li>
</ul>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
