Author: kkolinko
Date: Sun Oct 26 14:47:11 2014
New Revision: 1634342
URL: http://svn.apache.org/r1634342
Log:
Remove patch-javadoc macros.
It is not used, because another solution has been applier: all javadoc is
generated with Java 7 JDK.
Java 7.0.25+ is not vulnerable to CVE-2013-1571 that is fixed by this patch
macro.
Modified:
tomcat/tc7.0.x/trunk/build.xml
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1634342&r1=1634341&r2=1634342&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Sun Oct 26 14:47:11 2014
@@ -1931,74 +1931,6 @@ Apache Tomcat ${version} native binaries
</javadoc>
</target>
- <!--
- Patch frame injection bugs in javadoc generated files - see CVE-2013-1571,
- http://www.kb.cert.org/vuls/id/225657
-
- This macro works together with the javadoc task on Ant and should be
invoked
- directly after its execution to patch broken javadocs, e.g.:
- <patch-javadoc dir="..." docencoding="UTF-8"/>
- Please make sure that the docencoding parameter uses the same charset as
- javadoc's docencoding. Default is the platform default encoding (like the
- javadoc task).
- The specified dir is the destination directory of the javadoc task.
- -->
- <macrodef name="patch-javadoc">
- <attribute name="dir"/>
- <attribute name="docencoding" default="${file.encoding}"/>
- <sequential>
- <replace encoding="@{docencoding}" summary="true"
taskname="patch-javadoc">
- <restrict>
- <fileset dir="@{dir}" casesensitive="false"
- includes="**/index.html,**/index.htm,**/toc.html,**/toc.htm"/>
- <!-- TODO: add encoding="@{docencoding}" to contains check, when we
- are on ANT 1.9.0: -->
- <not>
- <contains text="function validURL(url) {" casesensitive="true" />
- </not>
- </restrict>
- <replacetoken><![CDATA[function loadFrames() {]]></replacetoken>
- <replacevalue expandProperties="false"><![CDATA[if (targetPage != ""
&& !validURL(targetPage))
- targetPage = "undefined";
- function validURL(url) {
- var pos = url.indexOf(".html");
- if (pos == -1 || pos != url.length - 5)
- return false;
- var allowNumber = false;
- var allowSep = false;
- var seenDot = false;
- for (var i = 0; i < url.length - 5; i++) {
- var ch = url.charAt(i);
- if ('a' <= ch && ch <= 'z' ||
- 'A' <= ch && ch <= 'Z' ||
- ch == '$' ||
- ch == '_') {
- allowNumber = true;
- allowSep = true;
- } else if ('0' <= ch && ch <= '9'
- || ch == '-') {
- if (!allowNumber)
- return false;
- } else if (ch == '/' || ch == '.') {
- if (!allowSep)
- return false;
- allowNumber = false;
- allowSep = false;
- if (ch == '.')
- seenDot = true;
- if (ch == '/' && seenDot)
- return false;
- } else {
- return false;
- }
- }
- return true;
- }
- function loadFrames() {]]></replacevalue>
- </replace>
- </sequential>
- </macrodef>
-
<target name="dist-deployer" depends="dist-prepare,deploy"
description="Create the Tomcat deployer binary">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
