diff options
Diffstat (limited to 'java/openjdk6/files/icedtea/security/20130618/8012375-javadoc_framing.patch')
| -rw-r--r-- | java/openjdk6/files/icedtea/security/20130618/8012375-javadoc_framing.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/java/openjdk6/files/icedtea/security/20130618/8012375-javadoc_framing.patch b/java/openjdk6/files/icedtea/security/20130618/8012375-javadoc_framing.patch deleted file mode 100644 index e1ba1e070fc2..000000000000 --- a/java/openjdk6/files/icedtea/security/20130618/8012375-javadoc_framing.patch +++ /dev/null @@ -1,61 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1371731018 18000 -# Node ID b4954380fa25058f1a6cfb9cb96f78d90cf0fc5c -# Parent 445134ee98c84b6d139fab0f9a9d8718c686c63b -8012375: Improve Javadoc framing -Reviewed-by: mduigou, jlaskey - -diff --git a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java ---- langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java -+++ langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -309,8 +309,41 @@ - String scriptCode = DocletConstants.NL + " targetPage = \"\" + window.location.search;" + DocletConstants.NL + - " if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL + - " targetPage = targetPage.substring(1);" + DocletConstants.NL + -- " if (targetPage.indexOf(\":\") != -1)" + DocletConstants.NL + -+ " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL + - " targetPage = \"undefined\";" + DocletConstants.NL + -+ " function validURL(url) {" + DocletConstants.NL + -+ " if (!(url.indexOf(\".html\") == url.length - 5))" + DocletConstants.NL + -+ " return false;" + DocletConstants.NL + -+ " var allowNumber = false;" + DocletConstants.NL + -+ " var allowSep = false;" + DocletConstants.NL + -+ " var seenDot = false;" + DocletConstants.NL + -+ " for (var i = 0; i < url.length - 5; i++) {" + DocletConstants.NL + -+ " var ch = url.charAt(i);" + DocletConstants.NL + -+ " if ('a' <= ch && ch <= 'z' ||" + DocletConstants.NL + -+ " 'A' <= ch && ch <= 'Z' ||" + DocletConstants.NL + -+ " ch == '$' ||" + DocletConstants.NL + -+ " ch == '_') {" + DocletConstants.NL + -+ " allowNumber = true;" + DocletConstants.NL + -+ " allowSep = true;" + DocletConstants.NL + -+ " } else if ('0' <= ch && ch <= '9'" + DocletConstants.NL + -+ " || ch == '-') {" + DocletConstants.NL + -+ " if (!allowNumber)" + DocletConstants.NL + -+ " return false;" + DocletConstants.NL + -+ " } else if (ch == '/' || ch == '.') {" + DocletConstants.NL + -+ " if (!allowSep)" + DocletConstants.NL + -+ " return false;" + DocletConstants.NL + -+ " allowNumber = false;" + DocletConstants.NL + -+ " allowSep = false;" + DocletConstants.NL + -+ " if (ch == '.')" + DocletConstants.NL + -+ " seenDot = true;" + DocletConstants.NL + -+ " if (ch == '/' && seenDot)" + DocletConstants.NL + -+ " return false;" + DocletConstants.NL + -+ " } else {" + DocletConstants.NL + -+ " return false;"+ DocletConstants.NL + -+ " }" + DocletConstants.NL + -+ " }" + DocletConstants.NL + -+ " return true;" + DocletConstants.NL + -+ " }" + DocletConstants.NL + - " function loadFrames() {" + DocletConstants.NL + - " if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL + - " top.classFrame.location = top.targetPage;" + DocletConstants.NL + |