Author: kkolinko
Date: Tue Sep 13 00:37:44 2011
New Revision: 1169987
URL: http://svn.apache.org/viewvc?rev=1169987&view=rev
Log:
* security-7.xml:
The history of the fix for CVE-2011-2481 was a bit more complicated. Add
missed revision number.
* tomcat-site.xsl:
Add new tag <revlink> as a more simple markup for links to svn revisions.
See security-7.xml for an example.
Modified:
tomcat/site/trunk/docs/security-7.html
tomcat/site/trunk/xdocs/security-7.xml
tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
Modified: tomcat/site/trunk/docs/security-7.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1169987&r1=1169986&r2=1169987&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-7.html (original)
+++ tomcat/site/trunk/docs/security-7.html Tue Sep 13 00:37:44 2011
@@ -537,11 +537,10 @@
view and/or alter the web.xml, context.xml and tld files of other web
applications deployed on the Tomcat instance.</p>
- <p>This was fixed in
- <a href="http://svn.apache.org/viewvc?rev=1137753&view=rev";>
- revision 1137753</a> and
- <a href="http://svn.apache.org/viewvc?rev=1138788&view=rev";>
- revision 1138788</a> and .</p>
+ <p>This was first fixed in
+ <a
href="http://svn.apache.org/viewvc?view=rev&rev=1137753";>revision
1137753</a>,
+ but reverted in <a
href="http://svn.apache.org/viewvc?view=rev&rev=1138776";>revision
1138776</a> and
+ finally fixed in <a
href="http://svn.apache.org/viewvc?view=rev&rev=1138788";>revision
1138788</a>.</p>
<p>This was identified by the Tomcat security team on 20 June 2011 and
made public on 12 August 2011.</p>
Modified: tomcat/site/trunk/xdocs/security-7.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-7.xml?rev=1169987&r1=1169986&r2=1169987&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/security-7.xml (original)
+++ tomcat/site/trunk/xdocs/security-7.xml Tue Sep 13 00:37:44 2011
@@ -190,11 +190,10 @@
view and/or alter the web.xml, context.xml and tld files of other web
applications deployed on the Tomcat instance.</p>
- <p>This was fixed in
- <a href="http://svn.apache.org/viewvc?rev=1137753&view=rev";>
- revision 1137753</a> and
- <a href="http://svn.apache.org/viewvc?rev=1138788&view=rev";>
- revision 1138788</a> and .</p>
+ <p>This was first fixed in
+ <revlink rev="1137753">revision 1137753</revlink>,
+ but reverted in <revlink rev="1138776">revision 1138776</revlink> and
+ finally fixed in <revlink rev="1138788">revision 1138788</revlink>.</p>
<p>This was identified by the Tomcat security team on 20 June 2011 and
made public on 12 August 2011.</p>
Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=1169987&r1=1169986&r2=1169987&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Tue Sep 13 00:37:44 2011
@@ -17,6 +17,7 @@
<!-- Defined parameters (overrideable) -->
<xsl:param name="relative-path" select="'.'"/>
+ <xsl:param name="revlink"
select="'http://svn.apache.org/viewvc?view=rev&rev='"/>
<!-- Defined variables (non-overrideable) -->
<xsl:variable name="body-bg" select="'#ffffff'"/>
@@ -333,6 +334,13 @@
</div>
</xsl:template>
+ <!-- Link to a SVN revision report -->
+ <!-- It is similar to <rev> tag in tomcat-docs.xsl, but allows arbitrary
text inside -->
+ <xsl:template match="revlink">
+ <xsl:variable name="link"><xsl:value-of select="$revlink"/><xsl:value-of
select="@rev"/></xsl:variable>
+ <a href="{$link}"><xsl:apply-templates/></a>
+ </xsl:template>
+
<!-- specially process td tags ala site.vsl -->
<xsl:template match="table[@class='detail-table']/tr/td">
<td bgcolor="{$table-td-bg}" valign="top" align="left">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
