This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new bcb0e5b Aligning o.a.c.servlets between 9.0.x and 8.5.x. No
functional change.
bcb0e5b is described below
commit bcb0e5b1f356958a7cc377e6eaaa918288a030fb
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Jun 24 10:32:45 2019 +0100
Aligning o.a.c.servlets between 9.0.x and 8.5.x. No functional change.
---
java/org/apache/catalina/servlets/CGIServlet.java | 6 ++--
.../apache/catalina/servlets/DefaultServlet.java | 24 +++++++--------
.../catalina/servlets/LocalStrings.properties | 5 ++-
.../catalina/servlets/LocalStrings_es.properties | 10 ++++++
.../catalina/servlets/LocalStrings_fr.properties | 36 +++++++++++++++++++++-
.../catalina/servlets/LocalStrings_ja.properties | 32 +++++++++++++++++++
.../apache/catalina/servlets/WebdavServlet.java | 28 +++++++----------
7 files changed, 107 insertions(+), 34 deletions(-)
diff --git a/java/org/apache/catalina/servlets/CGIServlet.java
b/java/org/apache/catalina/servlets/CGIServlet.java
index 5d0de11..b519497 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -1611,9 +1611,9 @@ public final class CGIServlet extends HttpServlet {
log.debug("envp: [" + env + "], command: [" + command + "]");
}
- if ((command.indexOf(File.separator + "." + File.separator) >= 0)
- || (command.indexOf(File.separator + "..") >= 0)
- || (command.indexOf(".." + File.separator) >= 0)) {
+ if ((command.contains(File.separator + "." + File.separator))
+ || (command.contains(File.separator + ".."))
+ || (command.contains(".." + File.separator))) {
throw new IOException(this.getClass().getName()
+ "Illegal Character in CGI command "
+ "path ('.' or '..') detected. Not "
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 9aa9950..e38723d 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -266,7 +266,7 @@ public class DefaultServlet extends HttpServlet {
/**
* The sorting manager for sorting files and directories.
*/
- protected SortManager sortManager;
+ protected transient SortManager sortManager;
// --------------------------------------------------------- Public Methods
@@ -333,7 +333,7 @@ public class DefaultServlet extends HttpServlet {
Globals.RESOURCES_ATTR);
if (resources == null) {
- throw new UnavailableException("No resources");
+ throw new
UnavailableException(sm.getString("defaultServlet.noResources"));
}
if (getServletConfig().getInitParameter("showServerInfo") != null) {
@@ -1328,7 +1328,7 @@ public class DefaultServlet extends HttpServlet {
rangeHeader = rangeHeader.substring(6);
- // Vector which will contain all the ranges which are successfully
+ // Collection which will contain all the ranges which are successfully
// parsed.
ArrayList<Range> result = new ArrayList<>();
StringTokenizer commaTokenizer = new StringTokenizer(rangeHeader, ",");
@@ -1633,7 +1633,7 @@ public class DefaultServlet extends HttpServlet {
osWriter.flush();
return new ByteArrayInputStream(stream.toByteArray());
} catch (TransformerException e) {
- throw new ServletException("XSL transformer error", e);
+ throw new
ServletException(sm.getString("defaultServlet.xslError"), e);
} finally {
if (Globals.IS_SECURITY_ENABLED) {
PrivilegedSetTccl pa = new PrivilegedSetTccl(original);
@@ -1922,7 +1922,7 @@ public class DefaultServlet extends HttpServlet {
}
copyRange(reader, new PrintWriter(buffer));
} catch (IOException e) {
- log("Failure to close reader", e);
+ log(sm.getString("defaultServlet.readerCloseFailed"), e);
} finally {
if (reader != null) {
try {
@@ -2866,14 +2866,14 @@ public class DefaultServlet extends HttpServlet {
this.ascending = ascending;
}
- public static Order NAME = new Order('N', false);
- public static Order NAME_ASC = new Order('N', true);
- public static Order SIZE = new Order('S', false);
- public static Order SIZE_ASC = new Order('S', true);
- public static Order LAST_MODIFIED = new Order('M', false);
- public static Order LAST_MODIFIED_ASC = new Order('M', true);
+ public static final Order NAME = new Order('N', false);
+ public static final Order NAME_ASC = new Order('N', true);
+ public static final Order SIZE = new Order('S', false);
+ public static final Order SIZE_ASC = new Order('S', true);
+ public static final Order LAST_MODIFIED = new Order('M', false);
+ public static final Order LAST_MODIFIED_ASC = new Order('M', true);
- public static Order DEFAULT = NAME;
+ public static final Order DEFAULT = NAME;
}
}
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties
b/java/org/apache/catalina/servlets/LocalStrings.properties
index f25349d..34611aa 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -39,8 +39,11 @@ defaultServlet.blockExternalEntity=Blocked access to
external entity with public
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.missingResource=The requested resource [{0}] is not available
+defaultServlet.noResources=No static resources were found
+defaultServlet.readerCloseFailed=Failed to close reader
+defaultServlet.xslError=XSL transformer error
-defaultservlet.skipfail=Only skipped [{0}] bytes when [{1}] were requested
+defaultservlet.skipfail=Read failed because only [{0}] bytes were available
but needed to skip [{1}] bytes to reach the start of the requested range
directory.filename=Filename
directory.lastModified=Last Modified
diff --git a/java/org/apache/catalina/servlets/LocalStrings_es.properties
b/java/org/apache/catalina/servlets/LocalStrings_es.properties
index 729abe6..1d6b7d7 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_es.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_es.properties
@@ -13,6 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+cgiServlet.expandFail=Fallo al expandir el script [{0}] en [{1}]\n
+cgiServlet.expandOk=Expandiendo script en el path [{0}] hacia [{1}]\n
+cgiServlet.find.location=Buscando archivo en [{0}]\n
+cgiServlet.runHeaderReaderFail=Problemas de I/O cerrando la cabecera del
lector
+cgiServlet.runInvalidStatus=Estado inválido [{0}]
+cgiServlet.runOutputStreamFail=Errores I/O cerrando el flujo de salida
+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.missingResource=El recurso requerido [{0}] no se encuentra
disponible
defaultservlet.skipfail=Sólo se han saltado [{0}] cuando se requirieron [{1}]
diff --git a/java/org/apache/catalina/servlets/LocalStrings_fr.properties
b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
index 08973f7..cb1428c 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
@@ -13,10 +13,44 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+cgiServlet.emptyEnvVarName=la nom de variable d'environnement est vide dans le
paramètre d'initialisation [environment-variable-]
+cgiServlet.expandCloseFail=Impossible de fermer le flux d''entrée du script
avec le chemin [{0}]
+cgiServlet.expandCreateDirFail=Echec de la création du répertoire de
destination [{0}] pour la décompression du script
+cgiServlet.expandDeleteFail=Impossible d''effacer le fichier [{0}] suite à une
IOException pendant la décompression
+cgiServlet.expandFail=Impossible de faire l''expansion du script au chemin
[{0}] vers [{1}]
+cgiServlet.expandNotFound=Impossible de décompresser [{0}] car il n''a pas été
trouvé
+cgiServlet.expandOk=Extrait le script du chemin [{0}] vers [{1}]
+cgiServlet.find.found=Trouvé le CGI: nom [{0}], chemin [{1}], nom de script
[{2}] et nom du CGI [{3}]
+cgiServlet.find.location=Recherche d''un fichier en [{0}]
+cgiServlet.find.path=Script CGI demandé au chemin [{0}] relatif au CGI à [{1}]
+cgiServlet.invalidArgumentDecoded=Les paramètres de ligne de commande décodés
[{0}] ne correspondent pas au modèle cmdLineArgumentsDecoded configuré [{1}]
+cgiServlet.invalidArgumentEncoded=Les paramètres de ligne de commande encodés
[{0}] ne correspondent pas au modèle cmdLineArgumentsEncoded configuré [{1}]
+cgiServlet.runBadHeader=Mauvaise ligne d''en-tête [{0}]
+cgiServlet.runFail=Problèmes d'IO lors de l'exécution du CGI
+cgiServlet.runHeaderReaderFail=Problème d'E/S lors de la fermeture du lecteur
de headers
+cgiServlet.runInvalidStatus=Statut invalide [{0}]
+cgiServlet.runOutputStreamFail=Problème d'E/S à la fermeture du flux de sortie
+cgiServlet.runReaderInterrupt=Interrompu pendant l'attente du thread de
lecture de la sortie d'erreur (stderr reader thread)
+cgiServlet.runStdErr=ligne stderr: [{0}]
+cgiServlet.runStdErrCount=Reçues [{0}] lignes sur le stderr
+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.missingResource=La ressource demandée [{0}] n''est pas
disponible
+defaultServlet.noResources=Pas de ressources statiques
+defaultServlet.readerCloseFailed=Impossible de fermer le lecteur
+defaultServlet.xslError=Erreur de transformation XSL
+
+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
+
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.jaxpfailed=Erreur d''initialisation de JAXP
+webdavservlet.enternalEntityIgnored=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 b382c6f..f7fd655 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
@@ -13,10 +13,42 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+cgiServlet.emptyEnvVarName=初期化パラメータの空の環境変数名[環境変数]
+cgiServlet.expandCloseFail=パス[{0}]のスクリプトの入力ストリームを閉じることができませんでした。
+cgiServlet.expandCreateDirFail=スクリプトの展開先ディレクトリ[{0}]の作成に失敗しました。
+cgiServlet.expandDeleteFail=拡張中にIOExceptionの後に[{0}]でファイルを削除できませんでした
+cgiServlet.expandFail=パス[{0}]のスクリプトを[{1}]に展開できませんでした
+cgiServlet.expandNotFound=見つけることが出来なかったので[{0}]を展開できませんでした。
+cgiServlet.expandOk=パス[{0}]の[{1}]に展開されたスクリプト
+cgiServlet.find.found=見つかったCGI：名前[{0}]、パス[{1}]、スクリプト名[{2}]、CGI名[{3}]
+cgiServlet.find.location=ファイル [{0}] を探しています。
+cgiServlet.find.path=パス[{0}]でCGIロケーション[{1}]に対して相対的に要求されたCGIスクリプト
+cgiServlet.runBadHeader=悪いヘッダライン [{0}]
+cgiServlet.runFail=CGI処理中のIO問題
+cgiServlet.runHeaderReaderFail=ヘッダーリーダーを閉じる時のI / O問題
+cgiServlet.runInvalidStatus=不正なステータス [{0}]
+cgiServlet.runOutputStreamFail=出力ストリームを切断するとき入出力エラーが発生しました。
+cgiServlet.runReaderInterrupt=標準エラー出力の読み取りスレッドは割り込みを待機しています。
+cgiServlet.runStdErr=標準エラー 行：[{0}]
+cgiServlet.runStdErrCount=stderrの[{0}]行を受信しました。
+cgiServlet.runStdErrFail=stderrでI/O問題
+
+defaultServlet.blockExternalEntity=publicId [{0}]およびsystemId
[{0}]を持つ外部エンティティへのブロックされたアクセス
+defaultServlet.blockExternalEntity2=外部エンティティへのアクセスを抑止しました。エンティティ名
[{0}]、publicId [{1}]、ベースURI [{2}]、systemId [{3}]
+defaultServlet.blockExternalSubset=名前[{0}]およびベースURI
[{1}]を持つ外部サブセットへのブロックされたアクセス
+defaultServlet.missingResource=要求されたリソース [{0}] は利用できません。
+defaultServlet.noResources=静的リソースが見つかりません。
+defaultServlet.readerCloseFailed=readerのクローズに失敗しました
+defaultServlet.xslError=XSL変換エラー
+
+defaultservlet.skipfail=[{0}]バイトしか利用できなかったため、[{1}]バイトをスキップして要求された範囲の先頭に到達する必要があったため、読み取りに失敗しました。
+
directory.filename=ファイル名
directory.lastModified=最終更新
directory.parent=[{0}] に移動
directory.size=サイズ
directory.title=[{0}] のディレクトリの一覧
+webdavservlet.enternalEntityIgnored=PublicID [{0}]およびSystemID
[{1}]を持つ外部エンティティへの参照を含むリクエストが無視されました
+webdavservlet.inputstreamclosefail=入力ストリーム [{0}] を切断できません。
webdavservlet.jaxpfailed=JAXPの初期化に失敗しました
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 32f9854..0428c72 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1308,7 +1308,7 @@ public class WebdavServlet extends DefaultServlet {
tokenList = toRenew.tokens.elements();
while (tokenList.hasMoreElements()) {
String token = tokenList.nextElement();
- if (ifHeader.indexOf(token) != -1) {
+ if (ifHeader.contains(token)) {
toRenew.expiresAt = lock.expiresAt;
lock = toRenew;
}
@@ -1326,7 +1326,7 @@ public class WebdavServlet extends DefaultServlet {
tokenList = toRenew.tokens.elements();
while (tokenList.hasMoreElements()) {
String token = tokenList.nextElement();
- if (ifHeader.indexOf(token) != -1) {
+ if (ifHeader.contains(token)) {
toRenew.expiresAt = lock.expiresAt;
lock = toRenew;
}
@@ -1397,7 +1397,7 @@ public class WebdavServlet extends DefaultServlet {
tokenList = lock.tokens.elements();
while (tokenList.hasMoreElements()) {
String token = tokenList.nextElement();
- if (lockTokenHeader.indexOf(token) != -1) {
+ if (lockTokenHeader.contains(token)) {
lock.tokens.removeElement(token);
}
}
@@ -1420,7 +1420,7 @@ public class WebdavServlet extends DefaultServlet {
tokenList = lock.tokens.elements();
while (tokenList.hasMoreElements()) {
String token = tokenList.nextElement();
- if (lockTokenHeader.indexOf(token) != -1) {
+ if (lockTokenHeader.contains(token)) {
lock.tokens.removeElement(token);
break;
}
@@ -1493,7 +1493,7 @@ public class WebdavServlet extends DefaultServlet {
boolean tokenMatch = false;
while (tokenList.hasMoreElements()) {
String token = tokenList.nextElement();
- if (ifHeader.indexOf(token) != -1) {
+ if (ifHeader.contains(token)) {
tokenMatch = true;
break;
}
@@ -1516,7 +1516,7 @@ public class WebdavServlet extends DefaultServlet {
boolean tokenMatch = false;
while (tokenList.hasMoreElements()) {
String token = tokenList.nextElement();
- if (ifHeader.indexOf(token) != -1) {
+ if (ifHeader.contains(token)) {
tokenMatch = true;
break;
}
@@ -1742,18 +1742,15 @@ public class WebdavServlet extends DefaultServlet {
}
}
try (InputStream is = sourceResource.getInputStream()) {
- if (!resources.write(dest, is,
- false)) {
- errorList.put(source,
-
Integer.valueOf(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
+ if (!resources.write(dest, is, false)) {
+ errorList.put(source,
Integer.valueOf(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
return false;
}
} catch (IOException e) {
log(sm.getString("webdavservlet.inputstreamclosefail",
source), e);
}
} else {
- errorList.put(source,
- Integer.valueOf(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
+ errorList.put(source,
Integer.valueOf(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
return false;
}
return true;
@@ -2319,6 +2316,7 @@ public class WebdavServlet extends DefaultServlet {
/**
* Determines the methods normally allowed for the resource.
+ *
* @param req The Servlet request
* @return a string builder with the allowed HTTP methods
*/
@@ -2352,8 +2350,8 @@ public class WebdavServlet extends DefaultServlet {
return methodsAllowed;
}
- // -------------------------------------------------- LockInfo Inner Class
+ // -------------------------------------------------- LockInfo Inner Class
/**
* Holds a lock information.
@@ -2376,7 +2374,6 @@ public class WebdavServlet extends DefaultServlet {
// ----------------------------------------------------- Public Methods
-
/**
* Get a String representation of this lock token.
*/
@@ -2465,10 +2462,7 @@ public class WebdavServlet extends DefaultServlet {
generatedXML.writeElement("D", "locktoken", XMLWriter.CLOSING);
generatedXML.writeElement("D", "activelock", XMLWriter.CLOSING);
-
}
-
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
