You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/07/02 13:13:28 UTC
[tomcat] branch 7.0.x updated (07b0f95 -> 0c1db41)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 07b0f95 Align with 8.5.x. Remove unused keys, update/add translations
new d2f21d5 Align with 8.5.x. Use i18n.
new 0c1db41 Fix a couple of Litmus test suite failures
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/servlets/DefaultServlet.java | 2 +-
java/org/apache/catalina/servlets/LocalStrings.properties | 1 +
java/org/apache/catalina/servlets/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/servlets/LocalStrings_ja.properties | 1 +
java/org/apache/catalina/servlets/WebdavServlet.java | 5 +++++
webapps/docs/changelog.xml | 4 ++++
6 files changed, 13 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Fix a couple of Litmus test suite failures
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0c1db4105cc577fca61d2e6f39e4d634bcaab57f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jul 2 14:12:55 2019 +0100
Fix a couple of Litmus test suite failures
---
java/org/apache/catalina/servlets/WebdavServlet.java | 5 +++++
webapps/docs/changelog.xml | 4 ++++
2 files changed, 9 insertions(+)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java b/java/org/apache/catalina/servlets/WebdavServlet.java
index bcc795d..1f477cb 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1825,6 +1825,11 @@ public class WebdavServlet extends DefaultServlet {
} else {
if (object instanceof Resource) {
+ // WebDAV Litmus test attempts to copy/move a file over a collection
+ // Need to remove trailing / from destination to enable test to pass
+ if (dest.endsWith("/") && dest.length() > 1) {
+ dest = dest.substring(0, dest.length() - 1);
+ }
try {
dirContext.bind(dest, object);
} catch (NamingException e) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0284199..46d3c79 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -135,6 +135,10 @@
<code>Allow</code> header and a method listed in the <code>Allow</code>
header will not return a 405 status code. (markt)
</fix>
+ <fix>
+ Correct two failing tests from the Litmus test suite for WebDAV when
+ copying/moving a file over a collection. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Align with 8.5.x. Use i18n.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d2f21d52a6d10f711e685aaae577c1663bd3d661
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jul 2 13:52:04 2019 +0100
Align with 8.5.x. Use i18n.
---
java/org/apache/catalina/servlets/DefaultServlet.java | 2 +-
java/org/apache/catalina/servlets/LocalStrings.properties | 1 +
java/org/apache/catalina/servlets/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/servlets/LocalStrings_ja.properties | 1 +
4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
index 6821f66..5a5eddd 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1449,7 +1449,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);
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties b/java/org/apache/catalina/servlets/LocalStrings.properties
index 22adaa8..13a9d40 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -41,6 +41,7 @@ defaultServlet.blockExternalSubset=Blocked access to external subset with name [
defaultServlet.missingResource=The requested resource [{0}] is not available
defaultServlet.noResources=No static resources were found
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.xslError=XSL transformer error
directory.filename=Filename
directory.lastModified=Last Modified
diff --git a/java/org/apache/catalina/servlets/LocalStrings_fr.properties b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
index 4ee5781..fdcb2ec 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
@@ -41,6 +41,7 @@ defaultServlet.blockExternalSubset=L''accès au sous-ensemble externe de nom [{0
defaultServlet.missingResource=La ressource demandée [{0}] n''est pas disponible
defaultServlet.noResources=Pas de ressources statiques
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.xslError=Erreur de transformation XSL
directory.filename=Nom de fichier
directory.lastModified=Dernière modification
diff --git a/java/org/apache/catalina/servlets/LocalStrings_ja.properties b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
index 7105faf..e3a35af 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
@@ -39,6 +39,7 @@ defaultServlet.blockExternalSubset=名前[{0}]およびベースURI [{1}]を持
defaultServlet.missingResource=要求されたリソース [{0}] は利用できません。
defaultServlet.noResources=静的リソースが見つかりません。
defaultServlet.skipfail=[{0}]バイトしか利用できなかったため、[{1}]バイトをスキップして要求された範囲の先頭に到達する必要があったため、読み取りに失敗しました。
+defaultServlet.xslError=XSL変換エラー
directory.filename=ファイル名
directory.lastModified=最終更新
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org