This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 098834facf BZ 69370: DefaultServlet's HTML listing uses incorrect
labels
098834facf is described below
commit 098834facf88904ee4c727f9f25b809d3cfd4ddd
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sat Oct 5 14:01:18 2024 +0200
BZ 69370: DefaultServlet's HTML listing uses incorrect labels
---
.../org/apache/catalina/servlets/DefaultServlet.java | 20 ++++++++++----------
.../apache/catalina/servlets/LocalStrings.properties | 11 +++++------
.../catalina/servlets/LocalStrings_de.properties | 2 --
.../catalina/servlets/LocalStrings_es.properties | 11 +++++------
.../catalina/servlets/LocalStrings_fr.properties | 11 +++++------
.../catalina/servlets/LocalStrings_ja.properties | 11 +++++------
.../catalina/servlets/LocalStrings_ko.properties | 11 +++++------
.../catalina/servlets/LocalStrings_zh_CN.properties | 10 +++++-----
webapps/docs/changelog.xml | 4 ++++
9 files changed, 44 insertions(+), 47 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 385ba14af9..08151a2bf0 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1692,7 +1692,7 @@ public class DefaultServlet extends HttpServlet {
*/
sb.append("<head>\r\n");
sb.append("<title>");
- sb.append(sm.getString("directory.title", directoryWebappPath));
+ sb.append(sm.getString("defaultServlet.directory.title",
directoryWebappPath));
sb.append("</title>\r\n");
sb.append("<style>");
sb.append(org.apache.catalina.util.TomcatCSS.TOMCAT_CSS);
@@ -1700,7 +1700,7 @@ public class DefaultServlet extends HttpServlet {
sb.append("</head>\r\n");
sb.append("<body>\r\n");
sb.append("<h1>");
- sb.append(sm.getString("directory.title", directoryWebappPath));
+ sb.append(sm.getString("defaultServlet.directory.title",
directoryWebappPath));
// Render the link to our parent (if required)
String parentDirectory = directoryWebappPath;
@@ -1710,7 +1710,7 @@ public class DefaultServlet extends HttpServlet {
int slash = parentDirectory.lastIndexOf('/');
if (slash >= 0) {
String parent = directoryWebappPath.substring(0, slash);
- sb.append(" - <a href=\"");
+ sb.append(" \u2013 <a href=\"");
sb.append(rewrittenContextPath);
if (parent.equals("")) {
parent = "/";
@@ -1721,7 +1721,7 @@ public class DefaultServlet extends HttpServlet {
}
sb.append("\">");
sb.append("<b>");
- sb.append(sm.getString("directory.parent", parent));
+ sb.append(sm.getString("defaultServlet.directory.parent", parent));
sb.append("</b>");
sb.append("</a>");
}
@@ -1745,10 +1745,10 @@ public class DefaultServlet extends HttpServlet {
sb.append("<a href=\"?C=N;O=");
sb.append(getOrderChar(order, 'N'));
sb.append("\">");
- sb.append(sm.getString("directory.filename"));
+ sb.append(sm.getString("defaultServlet.resource.name"));
sb.append("</a>");
} else {
- sb.append(sm.getString("directory.filename"));
+ sb.append(sm.getString("defaultServlet.resource.name"));
}
sb.append("</strong></font></th>\r\n");
sb.append("<th align=\"center\"><font size=\"+1\"><strong>");
@@ -1756,10 +1756,10 @@ public class DefaultServlet extends HttpServlet {
sb.append("<a href=\"?C=S;O=");
sb.append(getOrderChar(order, 'S'));
sb.append("\">");
- sb.append(sm.getString("directory.size"));
+ sb.append(sm.getString("defaultServlet.resource.size"));
sb.append("</a>");
} else {
- sb.append(sm.getString("directory.size"));
+ sb.append(sm.getString("defaultServlet.resource.size"));
}
sb.append("</strong></font></th>\r\n");
sb.append("<th align=\"right\"><font size=\"+1\"><strong>");
@@ -1767,10 +1767,10 @@ public class DefaultServlet extends HttpServlet {
sb.append("<a href=\"?C=M;O=");
sb.append(getOrderChar(order, 'M'));
sb.append("\">");
- sb.append(sm.getString("directory.lastModified"));
+ sb.append(sm.getString("defaultServlet.resource.lastModified"));
sb.append("</a>");
} else {
- sb.append(sm.getString("directory.lastModified"));
+ sb.append(sm.getString("defaultServlet.resource.lastModified"));
}
sb.append("</strong></font></th>\r\n");
sb.append("</tr>\r\n");
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties
b/java/org/apache/catalina/servlets/LocalStrings.properties
index c1e51f3d43..f96475f545 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -43,19 +43,18 @@ cgiServlet.runStdErrFail=I/O problems with stderr
defaultServlet.blockExternalEntity=Blocked access to external entity with
publicId [{0}] and systemId [{0}]
defaultServlet.blockExternalEntity2=Blocked access to external entity with
name [{0}], publicId [{1}], baseURI [{2}] and systemId [{3}]
defaultServlet.blockExternalSubset=Blocked access to external subset with name
[{0}] and baseURI [{1}]
+defaultServlet.directory.parent=Up To [{0}]
+defaultServlet.directory.title=Directory Listing For [{0}]
defaultServlet.missingResource=The requested resource [{0}] is not available
defaultServlet.noResources=No static resources were found
defaultServlet.readerCloseFailed=Failed to close reader
+defaultServlet.resource.lastModified=Last Modified
+defaultServlet.resource.name=Name
+defaultServlet.resource.size=Size
defaultServlet.skipfail=Read failed because only [{0}] bytes were available
but needed to skip [{1}] bytes to reach the start of the requested range
defaultServlet.unknownBomConfig=Unrecognised value of [{0}] provided for
useBomIfPresent initialization parameter
defaultServlet.xslError=XSL transformer error
-directory.filename=Filename
-directory.lastModified=Last Modified
-directory.parent=Up To [{0}]
-directory.size=Size
-directory.title=Directory Listing For [{0}]
-
webdavservlet.externalEntityIgnored=The request included a reference to an
external entity with PublicID [{0}] and SystemID [{1}] which was ignored
webdavservlet.inputstreamclosefail=Failed to close the inputStream of [{0}]
webdavservlet.jaxpfailed=JAXP initialization failed
diff --git a/java/org/apache/catalina/servlets/LocalStrings_de.properties
b/java/org/apache/catalina/servlets/LocalStrings_de.properties
index 2c76ccd1ad..7823a582c5 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_de.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_de.properties
@@ -23,5 +23,3 @@ cgiServlet.runInvalidStatus=Ungültiger Status [{0}]
cgiServlet.runOutputStreamFail=I/O Probleme beim Schließen des Ausgabestroms
cgiServlet.runReaderInterrupt=Das Warten auf den STDERR Lesethread wurde
unterbrochen
cgiServlet.runStdErrFail=I/O Probleme mit stderr
-
-directory.filename=Dateiname
diff --git a/java/org/apache/catalina/servlets/LocalStrings_es.properties
b/java/org/apache/catalina/servlets/LocalStrings_es.properties
index d936cde12f..1b7f392c7d 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_es.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_es.properties
@@ -26,14 +26,13 @@ cgiServlet.runReaderInterrupt=Detenido esperando por el
hilo lector stderr
cgiServlet.runStdErrFail=Problemas de I/O con stderr
defaultServlet.blockExternalSubset=Se bloqueó el acceso al subconjunt externo
con nombre [{0}] y URI base [{1}]\n
+defaultServlet.directory.parent=Atrás A [{0}]
+defaultServlet.directory.title=Listado de Directorio Para [{0}]
defaultServlet.missingResource=El recurso requerido [{0}] no se encuentra
disponible
+defaultServlet.resource.lastModified=Última Modificación
+defaultServlet.resource.name=Nombre
+defaultServlet.resource.size=Medida
defaultServlet.skipfail=Sólo se han saltado [{0}] cuando se requirieron [{1}]
-directory.filename=Nombre de Fichero:
-directory.lastModified=Última Modificación
-directory.parent=Atrás A [{0}]
-directory.size=Medida
-directory.title=Listado de Directorio Para [{0}]
-
webdavservlet.externalEntityIgnored=El requerimiento incluía una referencia a
una entidad externa con PublicID [{0}] y SystemID [{1}] que fue ignorada
webdavservlet.jaxpfailed=Falló la inicialización de JAXP
diff --git a/java/org/apache/catalina/servlets/LocalStrings_fr.properties
b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
index 177bf8c3a2..7f7813826d 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
@@ -43,19 +43,18 @@ cgiServlet.runStdErrFail=Problème d'entrée sortie pour le
stderr
defaultServlet.blockExternalEntity=L''accès aux entités externes avec le
publicId [{0}] et le systemId [{1}] est bloqué
defaultServlet.blockExternalEntity2=L''accès à l''entité externe nommée [{0}],
publicId [{1}], baseURI [{2}], systemId [{3}] a été bloqué
defaultServlet.blockExternalSubset=L''accès au sous-ensemble externe de nom
[{0}] et de baseURI [{1}] a été bloqué
+defaultServlet.directory.parent=Jusqu''à [{0}]
+defaultServlet.directory.title=Liste du répertoire pour [{0}]
defaultServlet.missingResource=La ressource demandée [{0}] n''est pas
disponible
defaultServlet.noResources=Pas de ressources statiques
defaultServlet.readerCloseFailed=Impossible de fermer le lecteur
+defaultServlet.resource.lastModified=Dernière modification
+defaultServlet.resource.name=Nom
+defaultServlet.resource.size=Taille
defaultServlet.skipfail=La lecture a échouée parce que seuls [{0}] octets
étaient disponibles alors qu''il était nécessaire d''en sauter [{1}] pour
atteindre le début de la plage demandée
defaultServlet.unknownBomConfig=La valeur [{0}] inconnue a été donnée pour le
paramètre d’initialisation useBomIfPresent
defaultServlet.xslError=Erreur de transformation XSL
-directory.filename=Nom de fichier
-directory.lastModified=Dernière modification
-directory.parent=Jusqu''à [{0}]
-directory.size=Taille
-directory.title=Liste du répertoire pour [{0}]
-
webdavservlet.externalEntityIgnored=La requête a inclus une référence à une
entité externe avec publicId [{0}] et systemId [{1}] qui a été ignorée
webdavservlet.inputstreamclosefail=Impossible de fermer le flux d''entrée pour
[{0}]
webdavservlet.jaxpfailed=Erreur d'initialisation de JAXP
diff --git a/java/org/apache/catalina/servlets/LocalStrings_ja.properties
b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
index bb53d5976a..c09960d5d1 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
@@ -43,19 +43,18 @@ cgiServlet.runStdErrFail=stderrでI/O問題
defaultServlet.blockExternalEntity=publicId [{0}]およびsystemId
[{0}]を持つ外部エンティティへのアクセスがブロックされました
defaultServlet.blockExternalEntity2=エンティティ名 [{0}]、publicId [{1}]、baseURI [{2}]
および systemId [{3}] を持つ外部エンティティへのアクセスがブロックされました
defaultServlet.blockExternalSubset=名前[{0}]およびベースURI
[{1}]を持つ外部サブセットへのアクセスがブロックされました
+defaultServlet.directory.parent=[{0}] に移動
+defaultServlet.directory.title=[{0}] のディレクトリの一覧
defaultServlet.missingResource=要求されたリソース [{0}] は利用できません。
defaultServlet.noResources=静的リソースが見つかりません。
defaultServlet.readerCloseFailed=readerのクローズに失敗しました
+defaultServlet.resource.lastModified=最終更新
+defaultServlet.resource.name=名前
+defaultServlet.resource.size=サイズ
defaultServlet.skipfail=[{1}]バイトをスキップして要求された範囲の先頭に到達する必要がありましたが、[{0}]バイトしか利用できなかったため読み取りに失敗しました。
defaultServlet.unknownBomConfig=useBomIfPresentの初期化パラメーターに提供された認識されない値 [{0}]
defaultServlet.xslError=XSL変換エラー
-directory.filename=ファイル名
-directory.lastModified=最終更新
-directory.parent=[{0}] に移動
-directory.size=サイズ
-directory.title=[{0}] のディレクトリの一覧
-
webdavservlet.externalEntityIgnored=PublicID [{0}]およびSystemID
[{1}]を持つ外部エンティティへの参照を含むリクエストが無視されました
webdavservlet.inputstreamclosefail=入力ストリーム [{0}] を切断できません。
webdavservlet.jaxpfailed=JAXPの初期化に失敗しました
diff --git a/java/org/apache/catalina/servlets/LocalStrings_ko.properties
b/java/org/apache/catalina/servlets/LocalStrings_ko.properties
index 4b22250a3d..aeb3d720d6 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_ko.properties
@@ -41,19 +41,18 @@ cgiServlet.runStdErrFail=stderr에서 I/O 문제 발생
defaultServlet.blockExternalEntity=PublicId가 [{0}](이)고 systemId가 [{0}]인 외부
엔티티에 대한 접근을 차단했습니다.
defaultServlet.blockExternalEntity2=이름이 [{0}], publicId가 [{1}], baseURI가
[{2}]이며 systemId가 [{3}]인, 외부 엔티티에 대한 접근을 차단했습니다.
defaultServlet.blockExternalSubset=이름이 [{0}](이)고 baseURI가 [{1}]인 외부 하위 집합에 대한
접근이 차단되었습니다.
+defaultServlet.directory.parent=상위로: [{0}]
+defaultServlet.directory.title=[{0}]을(를) 위한 디렉토리 목록 표시
defaultServlet.missingResource=요청된 리소스 [{0}]은(는) 가용하지 않습니다.
defaultServlet.noResources=정적 리소스들을 찾을 수 없었습니다.
defaultServlet.readerCloseFailed=Reader를 닫지 못했습니다.
+defaultServlet.resource.lastModified=최종변경시간
+defaultServlet.resource.name=이름
+defaultServlet.resource.size=크기
defaultServlet.skipfail=단지 [{0}] 바이트들만이 가용하기 때문에, 읽기가 실패했습니다. 요청된 범위의 시작 위치에
도달하기 위하여, [{1}] 바이트들을 건너뛰어야 했습니다.
defaultServlet.unknownBomConfig=useBomIfPresent 초기화 파라미터로 인식할 수 없는 값이 제공되었습니다:
[{0}]
defaultServlet.xslError=XSL Transformer 오류
-directory.filename=파일명
-directory.lastModified=최종변경시간
-directory.parent=상위로: [{0}]
-directory.size=크기
-directory.title=[{0}]을(를) 위한 디렉토리 목록 표시
-
webdavservlet.externalEntityIgnored=요청이, PublicID가 [{0}]이고 SystemID가 [{1}]인 외부
엔티티에 대한 참조를 포함했는데, 이는 무시되었습니다.
webdavservlet.inputstreamclosefail=[{0}]의 입력 스트림을 닫지 못했습니다.
webdavservlet.jaxpfailed=JAXP의 초기화가 실패했습니다.
diff --git a/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
index 23ce043732..7a0bbbc6b6 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
@@ -41,18 +41,18 @@ cgiServlet.runStdErrFail=I/O标准错误问题
defaultServlet.blockExternalEntity=阻止访问publicId[{0}]和systemId[{0}]的外部实体。
defaultServlet.blockExternalEntity2=阻止访问名为[{0}]、publicId[{1}]、baseURI[{2}]和systemId[{3}]的外部实体。
defaultServlet.blockExternalSubset=用名称[{0}]和baseURI[{1}]阻止对外部子集的访问
+defaultServlet.directory.parent=最多[{0}]
+defaultServlet.directory.title=[{0}]的目录列表
defaultServlet.missingResource=请求的资源[{0}]不可用
defaultServlet.noResources=找不到静态资源
defaultServlet.readerCloseFailed=无法关闭读卡器
+defaultServlet.resource.lastModified=上次修改时间。
+defaultServlet.resource.name=姓名
+defaultServlet.resource.size=大小
defaultServlet.skipfail=读取失败，因为只有[{0}]个字节可用，但需要跳过[{1}]个字节才能到达请求范围的开始
defaultServlet.unknownBomConfig=为useBomIfPresent初始化参数提供的[{0}]值无法识别
defaultServlet.xslError=XSL转换器错误
-directory.filename=文件名
-directory.lastModified=上次修改时间。
-directory.parent=最多[{0}]
-directory.size=大小
-directory.title=[{0}]的目录列表
webdavservlet.externalEntityIgnored=请求包含对PublicID[{0}]和SystemID[{1}]的外部实体的引用，该引用被忽略。
webdavservlet.inputstreamclosefail=无法关闭[{0}]的输入流
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 509fb8e832..41002c87f2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -123,6 +123,10 @@
the base class. The primary advantage for doing this is less code to
process <code>init-param</code> values. (markt)
</scode>
+ <update>
+ <bug>69370</bug>: <code>DefaultServlet</code>'s HTML listing
+ uses incorrect labels. (michaelo)
+ </update>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
