buildbot failure in on tomcat-7-trunk

2020-03-30 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/1652

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch 7.0.x] da6cd8828cabd331f5834b951f4b5ca097066fe1
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Update docs as STRICT_SERVLET_COMPLIANCE no longer impacts URIEncoding

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new c240e49  Update docs as STRICT_SERVLET_COMPLIANCE no longer impacts 
URIEncoding
c240e49 is described below

commit c240e49c09fd239cdba1217c3ae353dcf1964cba
Author: Mark Thomas 
AuthorDate: Mon Mar 30 22:00:56 2020 +0100

Update docs as STRICT_SERVLET_COMPLIANCE no longer impacts URIEncoding
---
 webapps/docs/changelog.xml  | 10 ++
 webapps/docs/config/ajp.xml |  5 +
 webapps/docs/config/http.xml|  5 +
 webapps/docs/config/systemprops.xml |  3 ---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 59ed7b4..d249193 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -161,6 +161,16 @@
   
 
   
+  
+
+  
+Correct documentation web application to remove references to the
+org.apache.catalina.STRICT_SERVLET_COMPLIANCE system
+property changing the default for the URIEncoding 
attribute
+of the Connector. (markt)
+  
+
+  
   
 
   
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index f1405c5..fa8fc0f 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -245,10 +245,7 @@
 
 
   This specifies the character encoding used to decode the URI bytes,
-  after %xx decoding the URL. If not specified, UTF-8 will be used unless
-  the org.apache.catalina.STRICT_SERVLET_COMPLIANCE
-  system property is set to 
true
-  in which case ISO-8859-1 will be used.
+  after %xx decoding the URL. The default value is UTF-8.
 
 
 
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index d58c8ab..d71a5d1 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -264,10 +264,7 @@
 
 
   This specifies the character encoding used to decode the URI bytes,
-  after %xx decoding the URL. If not specified, UTF-8 will be used unless
-  the org.apache.catalina.STRICT_SERVLET_COMPLIANCE
-  system property is set to 
true
-  in which case ISO-8859-1 will be used.
+  after %xx decoding the URL. The default value is UTF-8.
 
 
 
diff --git a/webapps/docs/config/systemprops.xml 
b/webapps/docs/config/systemprops.xml
index a7cfac8..0a216b6 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -285,9 +285,6 @@
   to true instead of false for:
   
   
org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING
-  The URIEncoding attribute of any
-  HTTP connector or
-  AJP connector element.
   The alwaysAccessSession attribute of any
   Context element.
   The contextGetResourceRequiresSlash attribute of any


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 7.0.x updated: BZ 64265. Fix ETag comparison. Always use weak comparison.

2020-03-30 Thread markt
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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new da6cd88  BZ 64265. Fix ETag comparison. Always use weak comparison.
da6cd88 is described below

commit da6cd8828cabd331f5834b951f4b5ca097066fe1
Author: Mark Thomas 
AuthorDate: Mon Mar 30 21:40:17 2020 +0100

BZ 64265. Fix ETag comparison. Always use weak comparison.

https://bz.apache.org/bugzilla/show_bug.cgi?id=64265
---
 .../apache/catalina/servlets/DefaultServlet.java   |  14 ++-
 .../TestDefaultServletIfMatchRequests.java | 108 +
 webapps/docs/changelog.xml |   4 +
 3 files changed, 123 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 3b271e5..bb96786 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1910,17 +1910,25 @@ public class DefaultServlet extends HttpServlet {
 throws IOException {
 
 String eTag = resourceAttributes.getETag();
+// Default servlet uses weak matching so we strip any leading "W/" and
+// then compare using equals
+if (eTag.startsWith("W/")) {
+eTag = eTag.substring(2);
+}
 String headerValue = request.getHeader("If-Match");
 if (headerValue != null) {
 if (headerValue.indexOf('*') == -1) {
 
-StringTokenizer commaTokenizer = new StringTokenizer
-(headerValue, ",");
+StringTokenizer commaTokenizer = new 
StringTokenizer(headerValue, ",");
 boolean conditionSatisfied = false;
 
 while (!conditionSatisfied && commaTokenizer.hasMoreTokens()) {
 String currentToken = commaTokenizer.nextToken();
-if (currentToken.trim().equals(eTag))
+currentToken = currentToken.trim();
+if (currentToken.startsWith("W/")) {
+currentToken = currentToken.substring(2);
+}
+if (currentToken.equals(eTag))
 conditionSatisfied = true;
 }
 
diff --git 
a/test/org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java 
b/test/org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java
new file mode 100644
index 000..362ca8e
--- /dev/null
+++ b/test/org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.servlets;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+@RunWith(Parameterized.class)
+public class TestDefaultServletIfMatchRequests extends TomcatBaseTest {
+
+@Parameterized.Parameters(name = "{index} ifMatchHeader [{0}]")
+public static Collection parameters() {
+
+// Get the length of the file used for this test
+// It varies by platform due to line-endings
+File index = new File("test/webapp/index.html");
+String strongETag =  "\"" + index.length() + "-" + 
index.lastModified() + "\"";
+String weakETag = "W/" + strongETag;
+
+List parameterSets = new ArrayList();
+
+parameterSets.add(new Object[] { null, Integer.valueOf(200) });
+parameterSets.add(new Object[] { "*", Integer.valueOf(200) });
+parameterSets.add(new Object[] { weakETag, Integer.valueOf(200) });
+parameterSets.add(new Object[] { strongETag, 

[Bug 64265] ETag comparison does not properly implement RFC 7232, section 2.3.2

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64265

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #6 from Mark Thomas  ---
Fixed in:
- master for 10.0.0-M4 onwards
- 9.0.x for 9.0.34 onwards
- 8.5.x for 8.5.54 onwards
- 7.0.x for 7.0.104 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 9.0.x updated: Remove unnecessary trim()

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 0d8e2d1  Remove unnecessary trim()
0d8e2d1 is described below

commit 0d8e2d16ada8c9b721c608a356ffba2fac8fa72b
Author: Mark Thomas 
AuthorDate: Mon Mar 30 21:44:56 2020 +0100

Remove unnecessary trim()
---
 java/org/apache/catalina/servlets/DefaultServlet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 0168df8..c2cc664 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2246,7 +2246,7 @@ public class DefaultServlet extends HttpServlet {
 if (currentToken.startsWith("W/")) {
 currentToken = currentToken.substring(2);
 }
-if (currentToken.trim().equals(eTag))
+if (currentToken.equals(eTag))
 conditionSatisfied = true;
 }
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 8.5.x updated: Remove unnecessary trim()

2020-03-30 Thread markt
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 9a567f2  Remove unnecessary trim()
9a567f2 is described below

commit 9a567f200bd4724ed84a1353d9499d09ff029040
Author: Mark Thomas 
AuthorDate: Mon Mar 30 21:44:56 2020 +0100

Remove unnecessary trim()
---
 java/org/apache/catalina/servlets/DefaultServlet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index e2857f1..b1c019f 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2325,7 +2325,7 @@ public class DefaultServlet extends HttpServlet {
 if (currentToken.startsWith("W/")) {
 currentToken = currentToken.substring(2);
 }
-if (currentToken.trim().equals(eTag))
+if (currentToken.equals(eTag))
 conditionSatisfied = true;
 }
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Remove unnecessary trim()

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 13b12ee  Remove unnecessary trim()
13b12ee is described below

commit 13b12ee040f1c0e65913de78a0ca741c044c5ea6
Author: Mark Thomas 
AuthorDate: Mon Mar 30 21:44:56 2020 +0100

Remove unnecessary trim()
---
 java/org/apache/catalina/servlets/DefaultServlet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 1cf343a..06794ac 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2179,7 +2179,7 @@ public class DefaultServlet extends HttpServlet {
 if (currentToken.startsWith("W/")) {
 currentToken = currentToken.substring(2);
 }
-if (currentToken.trim().equals(eTag))
+if (currentToken.equals(eTag))
 conditionSatisfied = true;
 }
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 8.5.x updated: BZ 64265. Fix ETag comparison. Always use weak comparison.

2020-03-30 Thread markt
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 b2da849  BZ 64265. Fix ETag comparison. Always use weak comparison.
b2da849 is described below

commit b2da849aca54930c338c0ac31e2d0447647d5580
Author: Mark Thomas 
AuthorDate: Mon Mar 30 21:40:17 2020 +0100

BZ 64265. Fix ETag comparison. Always use weak comparison.

https://bz.apache.org/bugzilla/show_bug.cgi?id=64265
---
 .../apache/catalina/servlets/DefaultServlet.java   |  12 ++-
 .../TestDefaultServletIfMatchRequests.java | 108 +
 webapps/docs/changelog.xml |   4 +
 3 files changed, 122 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index a5d2360..e2857f1 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2307,16 +2307,24 @@ public class DefaultServlet extends HttpServlet {
 throws IOException {
 
 String eTag = resource.getETag();
+// Default servlet uses weak matching so we strip any leading "W/" and
+// then compare using equals
+if (eTag.startsWith("W/")) {
+eTag = eTag.substring(2);
+}
 String headerValue = request.getHeader("If-Match");
 if (headerValue != null) {
 if (headerValue.indexOf('*') == -1) {
 
-StringTokenizer commaTokenizer = new StringTokenizer
-(headerValue, ",");
+StringTokenizer commaTokenizer = new 
StringTokenizer(headerValue, ",");
 boolean conditionSatisfied = false;
 
 while (!conditionSatisfied && commaTokenizer.hasMoreTokens()) {
 String currentToken = commaTokenizer.nextToken();
+currentToken = currentToken.trim();
+if (currentToken.startsWith("W/")) {
+currentToken = currentToken.substring(2);
+}
 if (currentToken.trim().equals(eTag))
 conditionSatisfied = true;
 }
diff --git 
a/test/org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java 
b/test/org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java
new file mode 100644
index 000..ffd3e92
--- /dev/null
+++ b/test/org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.servlets;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+@RunWith(Parameterized.class)
+public class TestDefaultServletIfMatchRequests extends TomcatBaseTest {
+
+@Parameterized.Parameters(name = "{index} ifMatchHeader [{0}]")
+public static Collection parameters() {
+
+// Get the length of the file used for this test
+// It varies by platform due to line-endings
+File index = new File("test/webapp/index.html");
+String strongETag =  "\"" + index.length() + "-" + 
index.lastModified() + "\"";
+String weakETag = "W/" + strongETag;
+
+List parameterSets = new ArrayList<>();
+
+parameterSets.add(new Object[] { null, Integer.valueOf(200) });
+parameterSets.add(new Object[] { "*", Integer.valueOf(200) });
+parameterSets.add(new Object[] { weakETag, Integer.valueOf(200) });
+parameterSets.add(new Object[] { strongETag, Integer.valueOf(200) });
+parameterSets.add(new Object[] { weakETag + 

[tomcat] branch 9.0.x updated: BZ 64265. Fix ETag comparison. Always use weak comparison.

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new e7774ab  BZ 64265. Fix ETag comparison. Always use weak comparison.
e7774ab is described below

commit e7774ab6c1ebb4735bc56777f194361bb213a6de
Author: Mark Thomas 
AuthorDate: Mon Mar 30 21:40:17 2020 +0100

BZ 64265. Fix ETag comparison. Always use weak comparison.

https://bz.apache.org/bugzilla/show_bug.cgi?id=64265
---
 .../apache/catalina/servlets/DefaultServlet.java   |  12 ++-
 .../TestDefaultServletIfMatchRequests.java | 108 +
 webapps/docs/changelog.xml |   4 +
 3 files changed, 122 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index b24df8d..0168df8 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2228,16 +2228,24 @@ public class DefaultServlet extends HttpServlet {
 throws IOException {
 
 String eTag = resource.getETag();
+// Default servlet uses weak matching so we strip any leading "W/" and
+// then compare using equals
+if (eTag.startsWith("W/")) {
+eTag = eTag.substring(2);
+}
 String headerValue = request.getHeader("If-Match");
 if (headerValue != null) {
 if (headerValue.indexOf('*') == -1) {
 
-StringTokenizer commaTokenizer = new StringTokenizer
-(headerValue, ",");
+StringTokenizer commaTokenizer = new 
StringTokenizer(headerValue, ",");
 boolean conditionSatisfied = false;
 
 while (!conditionSatisfied && commaTokenizer.hasMoreTokens()) {
 String currentToken = commaTokenizer.nextToken();
+currentToken = currentToken.trim();
+if (currentToken.startsWith("W/")) {
+currentToken = currentToken.substring(2);
+}
 if (currentToken.trim().equals(eTag))
 conditionSatisfied = true;
 }
diff --git 
a/test/org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java 
b/test/org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java
new file mode 100644
index 000..ffd3e92
--- /dev/null
+++ b/test/org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.servlets;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+@RunWith(Parameterized.class)
+public class TestDefaultServletIfMatchRequests extends TomcatBaseTest {
+
+@Parameterized.Parameters(name = "{index} ifMatchHeader [{0}]")
+public static Collection parameters() {
+
+// Get the length of the file used for this test
+// It varies by platform due to line-endings
+File index = new File("test/webapp/index.html");
+String strongETag =  "\"" + index.length() + "-" + 
index.lastModified() + "\"";
+String weakETag = "W/" + strongETag;
+
+List parameterSets = new ArrayList<>();
+
+parameterSets.add(new Object[] { null, Integer.valueOf(200) });
+parameterSets.add(new Object[] { "*", Integer.valueOf(200) });
+parameterSets.add(new Object[] { weakETag, Integer.valueOf(200) });
+parameterSets.add(new Object[] { strongETag, Integer.valueOf(200) });
+parameterSets.add(new Object[] { weakETag + 

[tomcat] branch master updated: BZ 64265. Fix ETag comparison. Always use weak comparison.

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new b26ad77  BZ 64265. Fix ETag comparison. Always use weak comparison.
b26ad77 is described below

commit b26ad77f659de34d49dda5a248566a38383cec0e
Author: Mark Thomas 
AuthorDate: Mon Mar 30 21:40:17 2020 +0100

BZ 64265. Fix ETag comparison. Always use weak comparison.

https://bz.apache.org/bugzilla/show_bug.cgi?id=64265
---
 .../apache/catalina/servlets/DefaultServlet.java   |  12 ++-
 .../TestDefaultServletIfMatchRequests.java | 108 +
 webapps/docs/changelog.xml |   4 +
 3 files changed, 122 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 396b91b..1cf343a 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -2161,16 +2161,24 @@ public class DefaultServlet extends HttpServlet {
 throws IOException {
 
 String eTag = resource.getETag();
+// Default servlet uses weak matching so we strip any leading "W/" and
+// then compare using equals
+if (eTag.startsWith("W/")) {
+eTag = eTag.substring(2);
+}
 String headerValue = request.getHeader("If-Match");
 if (headerValue != null) {
 if (headerValue.indexOf('*') == -1) {
 
-StringTokenizer commaTokenizer = new StringTokenizer
-(headerValue, ",");
+StringTokenizer commaTokenizer = new 
StringTokenizer(headerValue, ",");
 boolean conditionSatisfied = false;
 
 while (!conditionSatisfied && commaTokenizer.hasMoreTokens()) {
 String currentToken = commaTokenizer.nextToken();
+currentToken = currentToken.trim();
+if (currentToken.startsWith("W/")) {
+currentToken = currentToken.substring(2);
+}
 if (currentToken.trim().equals(eTag))
 conditionSatisfied = true;
 }
diff --git 
a/test/org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java 
b/test/org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java
new file mode 100644
index 000..ffd3e92
--- /dev/null
+++ b/test/org/apache/catalina/servlets/TestDefaultServletIfMatchRequests.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.servlets;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+@RunWith(Parameterized.class)
+public class TestDefaultServletIfMatchRequests extends TomcatBaseTest {
+
+@Parameterized.Parameters(name = "{index} ifMatchHeader [{0}]")
+public static Collection parameters() {
+
+// Get the length of the file used for this test
+// It varies by platform due to line-endings
+File index = new File("test/webapp/index.html");
+String strongETag =  "\"" + index.length() + "-" + 
index.lastModified() + "\"";
+String weakETag = "W/" + strongETag;
+
+List parameterSets = new ArrayList<>();
+
+parameterSets.add(new Object[] { null, Integer.valueOf(200) });
+parameterSets.add(new Object[] { "*", Integer.valueOf(200) });
+parameterSets.add(new Object[] { weakETag, Integer.valueOf(200) });
+parameterSets.add(new Object[] { strongETag, Integer.valueOf(200) });
+parameterSets.add(new Object[] { weakETag + 

Re: Remaining Tomcat 10 items

2020-03-30 Thread Mark Thomas
On 30/03/2020 20:27, Christopher Schultz wrote:
> Mark,
> 
> On 3/27/20 13:12, Mark Thomas wrote:
>> Spec - STRICT_SERVLET_COMPLIANCE Is a useful short-cut - Move the
>> remaining ones to the Context or related object where possible (I
>> haven't checked how easy that would be)
> 
> Would it be possible to have this available as a  option? It
> would basically just change all the default options for that one
> . How much spec-compliance behavior is maintained at levels
> higher than ?

At a quick glance, only the URIEncoding on the Connector.

Hang on. Servlet 4 (12.1) changed the default to UTF-8. We need to clean
up the code / docs in light of that. Once that is done it looks like
this might be moveable to the Context.

Mark


> I agree it IS a useful short-cut. But having it
> as a system property is quite ugly.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Remaining Tomcat 10 items

2020-03-30 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 3/27/20 13:12, Mark Thomas wrote:
> Spec - STRICT_SERVLET_COMPLIANCE Is a useful short-cut - Move the
> remaining ones to the Context or related object where possible (I
> haven't checked how easy that would be)

Would it be possible to have this available as a  option? It
would basically just change all the default options for that one
. How much spec-compliance behavior is maintained at levels
higher than ? I agree it IS a useful short-cut. But having it
as a system property is quite ugly.

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl6CSDIACgkQHPApP6U8
pFiy3hAAgzJrDBBQvH3yLkKRMheDKsfQLqTfz0v38g2IMdD3p40NolL3NFjrRx+Q
SZtuzPPozo6vBgcncnjuxwe7mYPLQWm56j/fbcftppIIhfGVgA0pbD3u2iFDu1TE
zAYQBw0ZomCmB+YN/5OCM1li4Y9/aVMKfSm0SoT8jh1boSQ1TT/mWkMx8cATnMr0
nhSV4ALwB/5jkPSl78rCsSBqnBPNJig1zaNNwbkS6uW4bQcDHvGEIx0mfT/bcM0t
QTkClBy0zE+LeanigPPz0bKrA0Yo6VqhNA88hZYX1x7dNaY1872Mv9TLJZ7/g/z/
fxxM/KU+MUsW7l0XsaPvWYjmkqPRTpdyKhcroEAHmv/ZEcPGvomxLLLoculoYOmY
IARFR7w+XXJ4f0FGNV0/OZmCLqJZG/wZyweKOyTjfnPV7HtzNJNPnnJa8k19934H
bIwlziyk/Y5fUAoz8pPtMvsl5+lRSSTgqOZnQITioMdEhAve1SG8kaKDrQ29cKGk
dFFgcfcC8Z9+74yQ5nCnP9JOprI/N9A695zQzo4mcu3VgxaigrqoU23m+yZRCCY5
GZr6OOCIH96/XjAivdbtwa79ga01FDPxsiF4RQD2W+f2tR1Otkn7FQ6vaDjLok4s
4ZmGiISBwrNFiULmHnOZqdvqCeWgkxkUtYoJguDSUykz3/b0M9E=
=ULKX
-END PGP SIGNATURE-

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64265] ETag comparison does not properly implement RFC 7232, section 2.3.2

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64265

--- Comment #5 from Mark Thomas  ---
The DefaultServlet defers to the WebResources implementation to generate ETags.

The WebResource implementation provided by Tomcat is hard-coded to only provide
weak ETags. It would be a fair amount of work for a custom implementation to
override that (and none has ever asked us to make that easier).

Given the above, I think it makes sense for now for the DefaultServlet to
perform the weak comparison. If the resource implementation changes, there
could be an argument for the DefaultServlet to do something else.

I'll work on a patch (and test cases) for DefaultServlet.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64222] Getting User from SSO using SPNEGO returns Tomcat Linux user instead of Windows user above Tomcat9.0.8 - Update documentation

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64222

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|REOPENED|RESOLVED

--- Comment #7 from Mark Thomas  ---
I've replaced the reference to spnego.sf.net with one to
http://tomcatspnegoad.sourceforge.net/

The requirement to specify SPNEGO as the login config is already documented.

The requirement to limit authentication to a sub-set of JSPs is an application
specific issue, not a generic SPNEGO auth configuration issue.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64290] Regression: The commit from December 06 2019 on FileUploadBase introduced an incompatible API change

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64290

--- Comment #10 from Mark Thomas  ---
There isn't a clear dividing line between what is and is not part of the public
API.

The only absolute guarantees are what is in the release notes. Those are
deliberately minimal. Everything else we try not to change but there are times
when we do make changes.

We might make changes to add new features, fix a security issue, update a
dependency sometimes. We try to keep changes backwards compatible but sometimes
we decide the complexity to maintain backwards compatibility isn't justified.
Generally, the deeper you go into the Tomcat internals, the more likely you
will, at some point, get tripped up by one of these changes.

There is a lot of judgement involved and it is inevitable we won't always get
it right. The safety net is that we do monthly releases so if an issue is
identified we can correct it fairly swiftly. Related to that, each release
normally has a voting Window of at least 72 hours. If users test those release
candidates and find issues we can fix them and restart the release process if
necessary.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



buildbot success in on tomcat-7-trunk

2020-03-30 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/1650

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch 7.0.x] a71124863f32517f0ecfc962c5224a5b950bf6b7
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



buildbot success in on tomcat-9-trunk

2020-03-30 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-9-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9-trunk/builds/133

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] 6b15b94e0f5f2bed7a331f075190a952df220574
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 7.0.x updated: Replace reference to "SPNEGO" with "SPNEGO AD"

2020-03-30 Thread markt
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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new d3d0be6  Replace reference to "SPNEGO" with "SPNEGO AD"
d3d0be6 is described below

commit d3d0be6653863bc43c2582006b644d0d06d6119f
Author: Mark Thomas 
AuthorDate: Mon Mar 30 17:27:03 2020 +0100

Replace reference to "SPNEGO" with "SPNEGO AD"
---
 webapps/docs/windows-auth-howto.xml | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/webapps/docs/windows-auth-howto.xml 
b/webapps/docs/windows-auth-howto.xml
index 2d4e2fd..068d9ca 100644
--- a/webapps/docs/windows-auth-howto.xml
+++ b/webapps/docs/windows-auth-howto.xml
@@ -266,23 +266,24 @@ com.sun.security.jgss.krb5.accept {
   
   
 
-  
+  
   Full details of this solution can be found through the
-  http://spnego.sourceforge.net/index.html/;  rel="nofollow">project
-  site. The key features are:
+  http://www.ioplex.com/; rel="nofollow">project web site. The key
+  features are:
   
-  Uses Kerberos
   Pure Java solution
+  Advanced Active Directory integration
   
   
 
-  
+  
   Full details of this solution can be found through the
-  http://www.ioplex.com/; rel="nofollow">project web site. The key
-  features are:
+  http://tomcatspnegoad.sourceforge.net/;  rel="nofollow">project
+  site. The key features are:
   
   Pure Java solution
-  Advanced Active Directory integration
+  SPNEGO/Kerberos Authenticator
+  Active Directory Realm
   
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 8.5.x updated: Replace reference to "SPNEGO" with "SPNEGO AD"

2020-03-30 Thread markt
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 4f5d8e3  Replace reference to "SPNEGO" with "SPNEGO AD"
4f5d8e3 is described below

commit 4f5d8e30e97f588d469f2fa41630b0b272d64869
Author: Mark Thomas 
AuthorDate: Mon Mar 30 17:27:03 2020 +0100

Replace reference to "SPNEGO" with "SPNEGO AD"
---
 webapps/docs/windows-auth-howto.xml | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/webapps/docs/windows-auth-howto.xml 
b/webapps/docs/windows-auth-howto.xml
index ae6ec82..1104225 100644
--- a/webapps/docs/windows-auth-howto.xml
+++ b/webapps/docs/windows-auth-howto.xml
@@ -268,23 +268,24 @@ com.sun.security.jgss.krb5.accept {
   
   
 
-  
+  
   Full details of this solution can be found through the
-  http://spnego.sourceforge.net/index.html/;  rel="nofollow">project
-  site. The key features are:
+  http://www.ioplex.com/; rel="nofollow">project web site. The key
+  features are:
   
-  Uses Kerberos
   Pure Java solution
+  Advanced Active Directory integration
   
   
 
-  
+  
   Full details of this solution can be found through the
-  http://www.ioplex.com/; rel="nofollow">project web site. The key
-  features are:
+  http://tomcatspnegoad.sourceforge.net/;  rel="nofollow">project
+  site. The key features are:
   
   Pure Java solution
-  Advanced Active Directory integration
+  SPNEGO/Kerberos Authenticator
+  Active Directory Realm
   
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 9.0.x updated: Replace reference to "SPNEGO" with "SPNEGO AD"

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 9a21b74  Replace reference to "SPNEGO" with "SPNEGO AD"
9a21b74 is described below

commit 9a21b74c3c183aa3fb729895bdcb94e1ca1083d4
Author: Mark Thomas 
AuthorDate: Mon Mar 30 17:27:03 2020 +0100

Replace reference to "SPNEGO" with "SPNEGO AD"
---
 webapps/docs/windows-auth-howto.xml | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/webapps/docs/windows-auth-howto.xml 
b/webapps/docs/windows-auth-howto.xml
index 72867ba..200eb18 100644
--- a/webapps/docs/windows-auth-howto.xml
+++ b/webapps/docs/windows-auth-howto.xml
@@ -272,23 +272,24 @@ com.sun.security.jgss.krb5.accept {
   
   
 
-  
+  
   Full details of this solution can be found through the
-  http://spnego.sourceforge.net/index.html/;  rel="nofollow">project
-  site. The key features are:
+  http://www.ioplex.com/; rel="nofollow">project web site. The key
+  features are:
   
-  Uses Kerberos
   Pure Java solution
+  Advanced Active Directory integration
   
   
 
-  
+  
   Full details of this solution can be found through the
-  http://www.ioplex.com/; rel="nofollow">project web site. The key
-  features are:
+  http://tomcatspnegoad.sourceforge.net/;  rel="nofollow">project
+  site. The key features are:
   
   Pure Java solution
-  Advanced Active Directory integration
+  SPNEGO/Kerberos Authenticator
+  Active Directory Realm
   
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Replace reference to "SPNEGO" with "SPNEGO AD"

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 8d66375  Replace reference to "SPNEGO" with "SPNEGO AD"
8d66375 is described below

commit 8d66375ad8551a78743e24fe3347574d45706d38
Author: Mark Thomas 
AuthorDate: Mon Mar 30 17:27:03 2020 +0100

Replace reference to "SPNEGO" with "SPNEGO AD"
---
 webapps/docs/windows-auth-howto.xml | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/webapps/docs/windows-auth-howto.xml 
b/webapps/docs/windows-auth-howto.xml
index 72867ba..200eb18 100644
--- a/webapps/docs/windows-auth-howto.xml
+++ b/webapps/docs/windows-auth-howto.xml
@@ -272,23 +272,24 @@ com.sun.security.jgss.krb5.accept {
   
   
 
-  
+  
   Full details of this solution can be found through the
-  http://spnego.sourceforge.net/index.html/;  rel="nofollow">project
-  site. The key features are:
+  http://www.ioplex.com/; rel="nofollow">project web site. The key
+  features are:
   
-  Uses Kerberos
   Pure Java solution
+  Advanced Active Directory integration
   
   
 
-  
+  
   Full details of this solution can be found through the
-  http://www.ioplex.com/; rel="nofollow">project web site. The key
-  features are:
+  http://tomcatspnegoad.sourceforge.net/;  rel="nofollow">project
+  site. The key features are:
   
   Pure Java solution
-  Advanced Active Directory integration
+  SPNEGO/Kerberos Authenticator
+  Active Directory Realm
   
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64225] An exception occurred while parse the given input as an HTTP Host header value

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64225

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |WONTFIX
 Status|NEW |RESOLVED

--- Comment #2 from Mark Thomas  ---
Noting that RFC 3986 states that:


URI producers should use names that conform to the DNS syntax, even when use of
DNS is not immediately apparent


and that Tomcat is designed to use DNS;

and that there has been no response for 2 weeks I am closing this as WONTFIX
but feel free to re-open if there is a use where Tomcat is used with a name
resolution service that does not conform to the DNS syntax.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64290] Regression: The commit from December 06 2019 on FileUploadBase introduced an incompatible API change

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64290

--- Comment #9 from Markus Schlegel  ---
I will change our code. Thank you guys for digging into this!
I'll also check if we used some other inofficial classes. When I got you right,
we should not use the tomcat classes at all but rather the apache-commons ones,
correct? That's somewhat sad because behavior between tomcat built-in code and
our addons might differ because of the different versions used.

Also, I'm somewhat confused about what parts of tomcat-api are official or not.

>From the release-notes I take, that only javax.** and org.apache.catalina.*
(without subpackages) are considered stable. From the comments of you guys I
take, that you assume that only these classes make up the official API (which
is not necessary the case).

But: 
1. If "release-notes" is right, what about using classes from org.apache.juli
as stated in https://tomcat.apache.org/tomcat-8.5-doc/logging.html ? Do people
following your documentation have to use inoffical API's ?
2. Why do you provide an official javadocs page which provides Javadocs for
internal, non-official packages which should not be used outside of tomcat ?
Wouldn't it be clearer if you would provide API-Doc only for official API's?
3. Are javadoc-comments like "This package contains various IO related utility
classes or methods, which are basically reusable and not necessarily restricted
to the scope of a file upload." (from
org.apache.tomcat.util.http.fileupload.util) wrong?

Thanks for clearing this.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 7.0.x updated: BZ 45995 / BZ 64237. Make MIME mappings case insensitive

2020-03-30 Thread markt
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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new a711248  BZ 45995 / BZ 64237. Make MIME mappings case insensitive
a711248 is described below

commit a71124863f32517f0ecfc962c5224a5b950bf6b7
Author: Mark Thomas 
AuthorDate: Mon Mar 30 16:43:08 2020 +0100

BZ 45995 / BZ 64237. Make MIME mappings case insensitive

https://bz.apache.org/bugzilla/show_bug.cgi?id=45955
https://bz.apache.org/bugzilla/show_bug.cgi?id=64237
---
 conf/web.xml   | 1 +
 java/org/apache/catalina/core/StandardContext.java | 6 ++
 webapps/docs/changelog.xml | 5 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/conf/web.xml b/conf/web.xml
index a24d10f..aa62dde 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -620,6 +620,7 @@
   
   
   
+  
 
 
 123
diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index 0b18027..af356b2 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -3365,7 +3365,7 @@ public class StandardContext extends ContainerBase
 public void addMimeMapping(String extension, String mimeType) {
 
 synchronized (mimeMappings) {
-mimeMappings.put(extension, mimeType);
+mimeMappings.put(extension.toLowerCase(Locale.ENGLISH), mimeType);
 }
 fireContainerEvent("addMimeMapping", extension);
 
@@ -3884,9 +3884,7 @@ public class StandardContext extends ContainerBase
  */
 @Override
 public String findMimeMapping(String extension) {
-
-return (mimeMappings.get(extension));
-
+return mimeMappings.get(extension.toLowerCase(Locale.ENGLISH));
 }
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 99e9eff..1dfe291 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -62,6 +62,11 @@
 
   
 
+  
+45995, 64237: Align Tomcat with Apache httpd and
+perform MIME type mapping based on file extension in a case insensitive
+manner. (markt)
+  
   
 64226: Reset timezone after parsing a date since the date
 format is reused. Test case submitted by Gary Thomas. (remm)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64237] Mime-mapping for *.Z files is missing in default configuration of Tomcat 7.0.103

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64237

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #3 from Mark Thomas  ---
Fixed in:
- 7.0.x for 7.0.104 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64237] Mime-mapping for *.Z files is missing in default configuration of Tomcat 7.0.103

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64237

--- Comment #2 from Mark Thomas  ---
I can neither recall nor find regressions associated with the switch to case
insensitive mapping so I plan to back-port that change to 7.0.x shortly.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64290] Regression: The commit from December 06 2019 on FileUploadBase introduced an incompatible API change

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64290

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WONTFIX

--- Comment #8 from Mark Thomas  ---
There is a changelog entry:

Update the internal fork of Apache Commons FileUpload to 2317552 (2019-12-06,
2.0-SNAPSHOT). Refactoring. (markt)


It doesn't make the API change explicit but the possibility is implied.

I'd prefer not to make the change at all - hence my preference/offer to look at
this on an "as required" basis rather than just applying a general fix.

Given that you are going to change / have changed your code to account for this
I'm going to resolve this as WONTFIX but if we see more reports along these
lines we can look again at adding back those inner classes as required.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



buildbot failure in on tomcat-9-trunk

2020-03-30 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-9-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9-trunk/builds/132

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] 49c3d946dffc72d0e832f41584505c5c84226b34
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 7.0.x updated: BZ 64270. Use documented default umask of 0027 with jsvc and daemon.sh.

2020-03-30 Thread markt
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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 785fb71  BZ 64270. Use documented default umask of 0027 with jsvc and 
daemon.sh.
785fb71 is described below

commit 785fb71969051e43c489cee78d85506da70f3c69
Author: Mark Thomas 
AuthorDate: Mon Mar 30 15:49:24 2020 +0100

BZ 64270. Use documented default umask of 0027 with jsvc and daemon.sh.

https://bz.apache.org/bugzilla/show_bug.cgi?id=64270
Also Make umask configurable.
---
 bin/daemon.sh  | 9 -
 webapps/docs/changelog.xml | 6 ++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/bin/daemon.sh b/bin/daemon.sh
index b5aa0c9..a44a1ed 100755
--- a/bin/daemon.sh
+++ b/bin/daemon.sh
@@ -90,7 +90,6 @@ test ".$MAX_FD" = . && MAX_FD="maximum"
 #
 test ".$TOMCAT_USER" = . && TOMCAT_USER=tomcat
 # Set JAVA_HOME to working JDK or JRE
-# JAVA_HOME=/opt/jdk-1.6.0.22
 # If not set we'll try to guess the JAVA_HOME
 # from java binary if on the PATH
 #
@@ -183,6 +182,12 @@ if [ "$cygwin" = "false" ]; then
 fi
 fi
 
+# Set UMASK unless it has been overridden
+if [ -z "$UMASK" ]; then
+UMASK="0027"
+fi
+umask $UMASK
+
 # Java 9 no longer supports the java.endorsed.dirs
 # system property. Only try to use it if
 # JAVA_ENDORSED_DIRS was explicitly set
@@ -204,6 +209,7 @@ case "$1" in
   -java-home "\"$JAVA_HOME\"" \
   -pidfile "\"$CATALINA_PID\"" \
   -wait $SERVICE_START_WAIT_TIME \
+  -umask $UMASK \
   -nodetach \
   -outfile "\"&1\"" \
   -errfile "\"&2\"" \
@@ -223,6 +229,7 @@ case "$1" in
   -user $TOMCAT_USER \
   -pidfile "\"$CATALINA_PID\"" \
   -wait $SERVICE_START_WAIT_TIME \
+  -umask $UMASK \
   -outfile "\"$CATALINA_OUT\"" \
   -errfile "\"&1\"" \
   -classpath "\"$CLASSPATH\"" \
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 91c0acc..99e9eff 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,6 +103,12 @@
 Expand the coverage of the Chinese translations provided with Apache
 Tomcat. Contribution provided by Lee Yazhou. (markt)
   
+  
+64270: Set the documented default umask of 0027
+when using jsvc via daemon.sh and allow the umask used to
+be configured via the UMASK environment variable as it is
+when using catalina.sh. (markt)
+  
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64270] daemon.sh doesn't pass the default umask to JSVC

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64270

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Mark Thomas  ---
Fixed in:
- master for 10.0.0-M4 onwards
- 9.0.x for 9.0.34 onwards
- 8.5.x for 8.5.54 onwards
- 7.0.x for 7.0.104 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 8.5.x updated: BZ 64270. Use documented default umask of 0027 with jsvc and daemon.sh.

2020-03-30 Thread markt
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 d15991a  BZ 64270. Use documented default umask of 0027 with jsvc and 
daemon.sh.
d15991a is described below

commit d15991af725e04d1ca0fcd9702e7a4f3a050a944
Author: Mark Thomas 
AuthorDate: Mon Mar 30 15:49:24 2020 +0100

BZ 64270. Use documented default umask of 0027 with jsvc and daemon.sh.

https://bz.apache.org/bugzilla/show_bug.cgi?id=64270
Also Make umask configurable.
---
 bin/daemon.sh  | 9 -
 webapps/docs/changelog.xml | 6 ++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/bin/daemon.sh b/bin/daemon.sh
index b5aa0c9..a44a1ed 100755
--- a/bin/daemon.sh
+++ b/bin/daemon.sh
@@ -90,7 +90,6 @@ test ".$MAX_FD" = . && MAX_FD="maximum"
 #
 test ".$TOMCAT_USER" = . && TOMCAT_USER=tomcat
 # Set JAVA_HOME to working JDK or JRE
-# JAVA_HOME=/opt/jdk-1.6.0.22
 # If not set we'll try to guess the JAVA_HOME
 # from java binary if on the PATH
 #
@@ -183,6 +182,12 @@ if [ "$cygwin" = "false" ]; then
 fi
 fi
 
+# Set UMASK unless it has been overridden
+if [ -z "$UMASK" ]; then
+UMASK="0027"
+fi
+umask $UMASK
+
 # Java 9 no longer supports the java.endorsed.dirs
 # system property. Only try to use it if
 # JAVA_ENDORSED_DIRS was explicitly set
@@ -204,6 +209,7 @@ case "$1" in
   -java-home "\"$JAVA_HOME\"" \
   -pidfile "\"$CATALINA_PID\"" \
   -wait $SERVICE_START_WAIT_TIME \
+  -umask $UMASK \
   -nodetach \
   -outfile "\"&1\"" \
   -errfile "\"&2\"" \
@@ -223,6 +229,7 @@ case "$1" in
   -user $TOMCAT_USER \
   -pidfile "\"$CATALINA_PID\"" \
   -wait $SERVICE_START_WAIT_TIME \
+  -umask $UMASK \
   -outfile "\"$CATALINA_OUT\"" \
   -errfile "\"&1\"" \
   -classpath "\"$CLASSPATH\"" \
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a0d7263..f186adb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -107,6 +107,12 @@
 Expand the coverage of the Chinese translations provided with Apache
 Tomcat. Contribution provided by Lee Yazhou. (markt)
   
+  
+64270: Set the documented default umask of 0027
+when using jsvc via daemon.sh and allow the umask used to
+be configured via the UMASK environment variable as it is
+when using catalina.sh. (markt)
+  
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 9.0.x updated: BZ 64270. Use documented default umask of 0027 with jsvc and daemon.sh.

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 6b15b94  BZ 64270. Use documented default umask of 0027 with jsvc and 
daemon.sh.
6b15b94 is described below

commit 6b15b94e0f5f2bed7a331f075190a952df220574
Author: Mark Thomas 
AuthorDate: Mon Mar 30 15:49:24 2020 +0100

BZ 64270. Use documented default umask of 0027 with jsvc and daemon.sh.

https://bz.apache.org/bugzilla/show_bug.cgi?id=64270
Also Make umask configurable.
---
 bin/daemon.sh  | 9 -
 webapps/docs/changelog.xml | 6 ++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/bin/daemon.sh b/bin/daemon.sh
index b5aa0c9..a44a1ed 100755
--- a/bin/daemon.sh
+++ b/bin/daemon.sh
@@ -90,7 +90,6 @@ test ".$MAX_FD" = . && MAX_FD="maximum"
 #
 test ".$TOMCAT_USER" = . && TOMCAT_USER=tomcat
 # Set JAVA_HOME to working JDK or JRE
-# JAVA_HOME=/opt/jdk-1.6.0.22
 # If not set we'll try to guess the JAVA_HOME
 # from java binary if on the PATH
 #
@@ -183,6 +182,12 @@ if [ "$cygwin" = "false" ]; then
 fi
 fi
 
+# Set UMASK unless it has been overridden
+if [ -z "$UMASK" ]; then
+UMASK="0027"
+fi
+umask $UMASK
+
 # Java 9 no longer supports the java.endorsed.dirs
 # system property. Only try to use it if
 # JAVA_ENDORSED_DIRS was explicitly set
@@ -204,6 +209,7 @@ case "$1" in
   -java-home "\"$JAVA_HOME\"" \
   -pidfile "\"$CATALINA_PID\"" \
   -wait $SERVICE_START_WAIT_TIME \
+  -umask $UMASK \
   -nodetach \
   -outfile "\"&1\"" \
   -errfile "\"&2\"" \
@@ -223,6 +229,7 @@ case "$1" in
   -user $TOMCAT_USER \
   -pidfile "\"$CATALINA_PID\"" \
   -wait $SERVICE_START_WAIT_TIME \
+  -umask $UMASK \
   -outfile "\"$CATALINA_OUT\"" \
   -errfile "\"&1\"" \
   -classpath "\"$CLASSPATH\"" \
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f3778d8..73978e6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,12 @@
 Expand the coverage of the Chinese translations provided with Apache
 Tomcat. Contribution provided by Lee Yazhou. (markt)
   
+  
+64270: Set the documented default umask of 0027
+when using jsvc via daemon.sh and allow the umask used to
+be configured via the UMASK environment variable as it is
+when using catalina.sh. (markt)
+  
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: BZ 64270. Use documented default umask of 0027 with jsvc and daemon.sh.

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new ab83a2e  BZ 64270. Use documented default umask of 0027 with jsvc and 
daemon.sh.
ab83a2e is described below

commit ab83a2e6aff00df1c1be3ab88fa4e1ef5189727a
Author: Mark Thomas 
AuthorDate: Mon Mar 30 15:49:24 2020 +0100

BZ 64270. Use documented default umask of 0027 with jsvc and daemon.sh.

https://bz.apache.org/bugzilla/show_bug.cgi?id=64270
Also Make umask configurable.
---
 bin/daemon.sh  | 9 -
 webapps/docs/changelog.xml | 6 ++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/bin/daemon.sh b/bin/daemon.sh
index b5aa0c9..a44a1ed 100755
--- a/bin/daemon.sh
+++ b/bin/daemon.sh
@@ -90,7 +90,6 @@ test ".$MAX_FD" = . && MAX_FD="maximum"
 #
 test ".$TOMCAT_USER" = . && TOMCAT_USER=tomcat
 # Set JAVA_HOME to working JDK or JRE
-# JAVA_HOME=/opt/jdk-1.6.0.22
 # If not set we'll try to guess the JAVA_HOME
 # from java binary if on the PATH
 #
@@ -183,6 +182,12 @@ if [ "$cygwin" = "false" ]; then
 fi
 fi
 
+# Set UMASK unless it has been overridden
+if [ -z "$UMASK" ]; then
+UMASK="0027"
+fi
+umask $UMASK
+
 # Java 9 no longer supports the java.endorsed.dirs
 # system property. Only try to use it if
 # JAVA_ENDORSED_DIRS was explicitly set
@@ -204,6 +209,7 @@ case "$1" in
   -java-home "\"$JAVA_HOME\"" \
   -pidfile "\"$CATALINA_PID\"" \
   -wait $SERVICE_START_WAIT_TIME \
+  -umask $UMASK \
   -nodetach \
   -outfile "\"&1\"" \
   -errfile "\"&2\"" \
@@ -223,6 +229,7 @@ case "$1" in
   -user $TOMCAT_USER \
   -pidfile "\"$CATALINA_PID\"" \
   -wait $SERVICE_START_WAIT_TIME \
+  -umask $UMASK \
   -outfile "\"$CATALINA_OUT\"" \
   -errfile "\"&1\"" \
   -classpath "\"$CLASSPATH\"" \
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fda7893..495bcba 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -167,6 +167,12 @@
 Expand the coverage of the Chinese translations provided with Apache
 Tomcat. Contribution provided by Lee Yazhou. (markt)
   
+  
+64270: Set the documented default umask of 0027
+when using jsvc via daemon.sh and allow the umask used to
+be configured via the UMASK environment variable as it is
+when using catalina.sh. (markt)
+  
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64290] Regression: The commit from December 06 2019 on FileUploadBase introduced an incompatible API change

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64290

--- Comment #7 from Markus Schlegel  ---
(In reply to Mark Thomas from comment #5)
> Tomcat is going to continue to track HEAD for the various Apache Commons
> projects for which a local fork is maintained.
> 
> Generally, a class being public doesn't make it part of Tomcat's public API.
> Tomcat's public API is defined in the RELEASE-NOTES file at the root of both
> the source and binary distributions. That said, we try to provide a lot more
> stability than the guarantees in that file.

Ok, thanks for the hint about the RELEASE-NOTES. I did not wirte the respective
code myself. It was a collegue, which I am sure of will never have read the
RELEASE-NOTES. 
At times when we all were visiting the project's download page to get the
libraries source or binaries, such a RELEASE-NOTES might made sense.
Today, I guess 99% of the projects use some dependency-mgmt like maven or in
our case ivy, where a release-notes might not be read anymore. When a developer
decides to use some class, he will rely on the Javadoc of it.
In contrast to the releasenotes (which almost never change), the changelog is
THE SOURCE to find out if a new release fits into the project. Unfortunately,
that API change was not mentioned there.


> I can see why applications might be interested in the specific exception
> thrown. There are (ugly) ways to write code to handle both variations of
> class structure but in this instance I think it would be reasonable if we
> added back inner classes (deprecated and marked for removal in Tomcat 10) on
> an "as required" basis and have then simply extend the new classes.
> 
> Markus, I'm assuming that the only class you need is
> FileUploadBase.FileSizeLimitExceededException

Yes, that's true. But as I stated in my previous comment, if this problem is
isolated to our specific usage only and if you think that this kind of class
use is "unique", then it makes no sense to just re-add that specific
innerclass, since we are now able to fix it in our maintenance code. But if
others might have used the inner classes in a similar way, then you should
consider re-adding all of them (extending the new ones of course).

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64290] Regression: The commit from December 06 2019 on FileUploadBase introduced an incompatible API change

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64290

--- Comment #6 from Michael Osipov  ---
(In reply to Markus Schlegel from comment #3)
> "Do you
> org.apache.tomcat.util.http.fileupload.FileUploadBase.
> FileSizeLimitExceededException from #getCause()?"
> 
> We are using Tomcat Embedded and we have built a Jax-Rs resource for the
> Fileupload, which relies on the org.apache.tomcat.util.http.fileupload.*
> classes. 

Very bad, you should solely rely on Servet API

> From org.apache.tomcat.util.http.fileupload.package-info.java I can read:
> "While this package provides the generic functionality for file uploads,
> these classes are not typically used directly. Instead, normal usage
> involves one of the provided extensions of "
> 
> This 1.) does not state, that this is not part of the official API and 
> 2.) is not obvious for a developer using one of the classes/innerclasses
> inside the package.

Granted.

> The refactored new version of it makes it better, because it places
> inofficial classes inside an "impl" package, which makes that facto obvious.
> 
> After all, the changed code is what it should look like, but you should not
> do this with incompatible changes in a minor release and even worse, not
> without notice in the changelog.

Fully agree.

> If you think this kind of problem is isolated to our special usecase, then
> no further action may be required, since we can change our maintenance code
> to not rely on that classes anymore.

Please do so regardless of this issue.

At the end, if you want to be stable or use explicit exceptions, use Commons
File Upload directly.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64290] Regression: The commit from December 06 2019 on FileUploadBase introduced an incompatible API change

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64290

--- Comment #5 from Mark Thomas  ---
Tomcat is going to continue to track HEAD for the various Apache Commons
projects for which a local fork is maintained.

Generally, a class being public doesn't make it part of Tomcat's public API.
Tomcat's public API is defined in the RELEASE-NOTES file at the root of both
the source and binary distributions. That said, we try to provide a lot more
stability than the guarantees in that file.

I can see why applications might be interested in the specific exception
thrown. There are (ugly) ways to write code to handle both variations of class
structure but in this instance I think it would be reasonable if we added back
inner classes (deprecated and marked for removal in Tomcat 10) on an "as
required" basis and have then simply extend the new classes.

Markus, I'm assuming that the only class you need is
FileUploadBase.FileSizeLimitExceededException

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64290] Regression: The commit from December 06 2019 on FileUploadBase introduced an incompatible API change

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64290

--- Comment #4 from Michael Osipov  ---
(In reply to Remy Maucherat from comment #2)
> Fileupload as it is included is considered the same as if it was internal
> Tomcat code, so releases or snapshots are not relevant.

If so, we should not add them as root causes in public classes:

> $ grep -r -E -e 'org.apache.tomcat.util.http.fileupload.impl.+Exception' java
> java/org/apache/catalina/connector/Request.java:import  
> org.apache.tomcat.util.http.fileupload.impl.InvalidContentTypeException;
> java/org/apache/catalina/connector/Request.java:import 
> org.apache.tomcat.util.http.fileupload.impl.SizeException;

> } catch (InvalidContentTypeException e) {
>   parameters.setParseFailedReason(FailReason.INVALID_CONTENT_TYPE);
>   partsParseException = new ServletException(e);
> } catch (SizeException e) {
>   parameters.setParseFailedReason(FailReason.POST_TOO_LARGE);
>   checkSwallowInput();
>   partsParseException = new IllegalStateException(e);
> } catch (FileUploadException e) {
>   parameters.setParseFailedReason(FailReason.IO_ERROR);
>   partsParseException = new IOException(e);
>

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64265] ETag comparison does not properly implement RFC 7232, section 2.3.2

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64265

--- Comment #4 from Michael Osipov  ---
(In reply to mgrigorov from comment #3)
> > Please read my comments also the defined comparison functions: strong and 
> > weak in the RFC.
> 
> I just wanted to point out that the arguments of the two 'curl` commands are
> exactly the same. So receiving the same result is what I'd expect from the
> server, unless the resource is modified or deleted in the meantime.
> Maybe you have a typo in the second curl command ?!
> 
> If this RFC says that two exactly the same requests should behave
> differently then I am not sure I want to read it.

There is no typo and yes, both commands are the same. I have logically applied
to comparsion functions. From a blackbox perspective, in either case Tomcat's
implementation is wrong. Since we don't document which comparison we apply I
have to guess, try.

Read the section and you'll understand.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Another javax -> jakarta update. Clarify position on stability.

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 15b4a1a  Another javax -> jakarta update. Clarify position on 
stability.
15b4a1a is described below

commit 15b4a1a6180e4fb140346e22f7438ae47a1d1769
Author: Mark Thomas 
AuthorDate: Mon Mar 30 15:16:56 2020 +0100

Another javax -> jakarta update. Clarify position on stability.
---
 RELEASE-NOTES | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ae7072f..640401f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -45,9 +45,12 @@ Tomcat @VERSION_MAJOR_MINOR@ is designed to run on Java 
@MIN_JAVA_VERSION@ and l
 API Stability:
 ==
 
+The following notes on API stability only applies once Tomcat 10.0.x has had 
its
+first stable release.
+
 The public interfaces for the following classes are fixed and will not be
 changed at all during the remaining lifetime of the @VERSION_MAJOR@.x series:
-- All classes in the javax namespace
+- All classes in the jakarta namespace
 
 The public interfaces for the following classes may be added to in order to
 resolve bugs and/or add new features. No existing interface method will be


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64290] Regression: The commit from December 06 2019 on FileUploadBase introduced an incompatible API change

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64290

--- Comment #3 from Markus Schlegel  ---
"Do you
org.apache.tomcat.util.http.fileupload.FileUploadBase.FileSizeLimitExceededException
from #getCause()?"

We are using Tomcat Embedded and we have built a Jax-Rs resource for the
Fileupload, which relies on the org.apache.tomcat.util.http.fileupload.*
classes. 

>From org.apache.tomcat.util.http.fileupload.package-info.java I can read:
"While this package provides the generic functionality for file uploads, these
classes are not typically used directly. Instead, normal usage involves one of
the provided extensions of "

This 1.) does not state, that this is not part of the official API and 
2.) is not obvious for a developer using one of the classes/innerclasses inside
the package.

The refactored new version of it makes it better, because it places inofficial
classes inside an "impl" package, which makes that facto obvious.

After all, the changed code is what it should look like, but you should not do
this with incompatible changes in a minor release and even worse, not without
notice in the changelog.

If you think this kind of problem is isolated to our special usecase, then no
further action may be required, since we can change our maintenance code to not
rely on that classes anymore.
But if other might use these classes, they will start to get errors as soon as
they updated to a newer Tomcat version and use that functionality.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64272] Broken links on the WebSocket How-To page

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64272

--- Comment #3 from Mark Thomas  ---
The tomcat-X.Y-doc pages always reflect the most recent Tomcat release so those
pages will be updated with the next round of releases - typically around the
2nd week of the month.

The latest version is always available from the CI system which, for Tomcat 9,
can be found at:
https://ci.apache.org/projects/tomcat/tomcat9/docs/web-socket-howto.html

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64265] ETag comparison does not properly implement RFC 7232, section 2.3.2

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64265

--- Comment #3 from mgrigorov  ---
> Please read my comments also the defined comparison functions: strong and 
> weak in the RFC.

I just wanted to point out that the arguments of the two 'curl` commands are
exactly the same. So receiving the same result is what I'd expect from the
server, unless the resource is modified or deleted in the meantime.
Maybe you have a typo in the second curl command ?!

If this RFC says that two exactly the same requests should behave differently
then I am not sure I want to read it.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64272] Broken links on the WebSocket How-To page

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64272

--- Comment #2 from Jerry Lampi  ---
Mark, thank you.  This is still failing for me.  I did hard page reloads,
cleared browser cache and so on.  Even tried it from a browser I never use,
knowing that caching would not be a factor.  Do you know when the fix will be
made public?  
Also, in the mean time, could you post the updated link locations for the two
pages?

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64290] Regression: The commit from December 06 2019 on FileUploadBase introduced an incompatible API change

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64290

--- Comment #2 from Remy Maucherat  ---
Fileupload as it is included is considered the same as if it was internal
Tomcat code, so releases or snapshots are not relevant.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64265] ETag comparison does not properly implement RFC 7232, section 2.3.2

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64265

--- Comment #2 from Michael Osipov  ---
(In reply to mgrigorov from comment #1)
> Hi Michael,
> 
> I see no difference between your 
> 
> > Tomcat returns a weak etag, so try the weak function:
> >> $ curl "https://.../test/test.txt; -H 'If-None-Match: W/"6-1585143822000"' 
> >> -I
> 
> and
> 
> > If I try strong logically, the following should give me a 200:
> >> $ curl "https://.../test/test.txt; -H 'If-None-Match: W/"6-1585143822000"' 
> >> -I
> 
> The commands are the same.

Please read my comments also the defined comparison functions: strong and weak
in the RFC.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [tomcat] 02/02: Add space before and after ':' as required by French grammar

2020-03-30 Thread Mark Thomas
On 30/03/2020 14:13, Rémy Maucherat wrote:
> On Mon, Mar 30, 2020 at 2:47 PM  > wrote:
> 
> This is an automated email from the ASF dual-hosted git repository.
> 
> markt pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> 
> commit 589664c1cfc978a445710455e380507a160f75ff
> Author: Mark Thomas mailto:ma...@apache.org>>
> AuthorDate: Mon Mar 30 13:46:53 2020 +0100
> 
>     Add space before and after ':' as required by French grammar
> 
> 
> Great job :) Personally I am totally not aware of these rules.

That is reassuring. I did check a few online newspapers and the few Mr
Men books we have in French and they both followed the rule so it seemed
reasonable to add. Luckily search/replace did most of the work.

Mark


> There are
> some I intentionally break too, like accentuation and upper case. Like
> "École" (school) if it is the first word of a sentence, I will always
> write "Ecole". It's a semi new rule that I hate.
> 
> Rémy
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 7.0.x updated: Update French translations. Add spaces required by French grammar.

2020-03-30 Thread markt
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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 3b7f03f  Update French translations. Add spaces required by French 
grammar.
3b7f03f is described below

commit 3b7f03fd11752eaf120c2baa1b02cceadf0de4cb
Author: Mark Thomas 
AuthorDate: Mon Mar 30 14:17:29 2020 +0100

Update French translations. Add spaces required by French grammar.
---
 java/javax/el/LocalStrings_fr.properties   |   4 +-
 .../authenticator/LocalStrings_fr.properties   |   4 +-
 .../catalina/connector/LocalStrings_fr.properties  |   2 +-
 .../catalina/core/LocalStrings_fr.properties   |  28 ++--
 .../catalina/filters/LocalStrings_fr.properties|   8 +-
 .../catalina/ha/deploy/LocalStrings_fr.properties  |   4 +-
 .../catalina/ha/session/LocalStrings_fr.properties |  30 ++--
 .../catalina/ha/tcp/LocalStrings_fr.properties |   4 +-
 .../catalina/loader/LocalStrings_fr.properties |   6 +-
 .../catalina/manager/LocalStrings_fr.properties|  76 -
 .../manager/host/LocalStrings_fr.properties|  20 +--
 .../catalina/realm/LocalStrings_fr.properties  |   4 +-
 .../catalina/servlets/LocalStrings_fr.properties   |   4 +-
 .../catalina/session/LocalStrings_fr.properties|  28 ++--
 .../catalina/startup/LocalStrings_fr.properties|  54 +++
 .../tribes/tipis/LocalStrings_fr.properties|   4 +-
 .../catalina/util/LocalStrings_fr.properties   |   4 +-
 .../catalina/valves/LocalStrings_fr.properties |   4 +-
 .../coyote/http11/LocalStrings_fr.properties   |   4 +-
 .../jasper/resources/LocalStrings_fr.properties| 176 ++---
 .../tomcat/util/http/LocalStrings_fr.properties|   4 +-
 .../websocket/server/LocalStrings_fr.properties|   2 +-
 .../WEB-INF/classes/LocalStrings_fr.properties |  38 ++---
 23 files changed, 256 insertions(+), 256 deletions(-)

diff --git a/java/javax/el/LocalStrings_fr.properties 
b/java/javax/el/LocalStrings_fr.properties
index 3c02fcb..56b5059 100644
--- a/java/javax/el/LocalStrings_fr.properties
+++ b/java/javax/el/LocalStrings_fr.properties
@@ -24,5 +24,5 @@ propertyNotWritable=La propriété [{1}] ne peut pas être 
écrite pour le type
 propertyReadError=Erreur lors de la lecture de [{1}] sur le type [{0}]
 propertyWriteError=Erreur d''écriture [{1}] sur le type [{0}]
 
-util.method.ambiguous=Impossible de trouver une méthode non ambiguë: 
{0}.{1}({2})
-util.method.notfound=Méthode non trouvée: {0}.{1}({2})
+util.method.ambiguous=Impossible de trouver une méthode non ambiguë : 
{0}.{1}({2})
+util.method.notfound=Méthode non trouvée : {0}.{1}({2})
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
index 14993be..9375aa3 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
@@ -23,7 +23,7 @@ authenticator.formlogin=Référence directe au formulaire de 
connexion (form log
 authenticator.loginFail=Échec de connexion ("Login failed")
 authenticator.manager=Exception lors de l'initialisation des gestionnaires 
d'authentification (trust managers)
 authenticator.noAuthHeader=Aucun en-tête d'autorisation envoyé par le client
-authenticator.notContext=Erreur de configuration:  Doit être attaché à un 
contexte
+authenticator.notContext=Erreur de configuration :  Doit être attaché à un 
contexte
 authenticator.requestBodyTooBig=Le corps de la requête était trop grand pour 
être mis en cache pendant le processus d'authentification
 authenticator.sessionExpired=Le temps alloué au processus de login est échu.  
Si vous désirez continuer, veuillez soit retourner en arrière 2 fois et 
recliquer le lien demandé, soit fermer et ré-ouvrir votre navigateur
 authenticator.tomcatPrincipalLogoutFail=La déconnection avec l'instance de 
TomcatPrincipal a échoué
@@ -31,7 +31,7 @@ authenticator.unauthorized=Impossible d'authentifier avec les 
crédits fournis (
 
 basicAuthenticator.invalidCharset=Les seules valeurs permises sont null, la 
chaîne vide, ou des caractères UTF-8
 
-digestAuthenticator.cacheRemove=Une entrée valide du cache de nonce des 
clients a été enlevée pour faire de la place pour de nouvelles entrées, ce qui 
rend possible une attaque par répétition; pour éviter cela, il est possible de 
reduire nonceValidity ou d'augmenter nonceCacheSize; les avertissements de ce 
type ne se reproduiront pas avant 5 minutes
+digestAuthenticator.cacheRemove=Une entrée valide du cache de nonce des 
clients a été enlevée pour faire de la place pour de nouvelles entrées, ce qui 
rend possible une attaque par répétition ; pour éviter cela, il est possible de 
reduire nonceValidity ou d'augmenter nonceCacheSize ; les avertissements de ce 
type ne se reproduiront pas 

[tomcat] branch 8.5.x updated (86f8d8c -> e7538fc)

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 86f8d8c  Update comment for Target JRE as well
 new 624b488  Update French translations. Add spaces required by French 
grammar.
 new e7538fc  Fix an incorrect search/replace

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/javax/el/LocalStrings_fr.properties   |   6 +-
 .../authenticator/LocalStrings_fr.properties   |   4 +-
 .../catalina/connector/LocalStrings_fr.properties  |   2 +-
 .../catalina/core/LocalStrings_fr.properties   |  30 ++--
 .../catalina/filters/LocalStrings_fr.properties|   8 +-
 .../catalina/ha/context/LocalStrings_fr.properties |   4 +-
 .../catalina/ha/deploy/LocalStrings_fr.properties  |   4 +-
 .../catalina/ha/session/LocalStrings_fr.properties |  34 ++--
 .../catalina/ha/tcp/LocalStrings_fr.properties |   6 +-
 .../catalina/loader/LocalStrings_fr.properties |  10 +-
 .../catalina/manager/LocalStrings_fr.properties|  76 -
 .../manager/host/LocalStrings_fr.properties|  22 +--
 .../catalina/realm/LocalStrings_fr.properties  |   4 +-
 .../catalina/servlets/LocalStrings_fr.properties   |   4 +-
 .../catalina/session/LocalStrings_fr.properties|  30 ++--
 .../catalina/startup/LocalStrings_fr.properties|  54 +++---
 .../storeconfig/LocalStrings_fr.properties |   2 +-
 .../tribes/group/LocalStrings_fr.properties|   8 +-
 .../group/interceptors/LocalStrings_fr.properties  |  28 ++--
 .../catalina/tribes/io/LocalStrings_fr.properties  |   4 +-
 .../tribes/membership/LocalStrings_fr.properties   |  14 +-
 .../tribes/tipis/LocalStrings_fr.properties|  12 +-
 .../transport/bio/LocalStrings_fr.properties   |   6 +-
 .../transport/nio/LocalStrings_fr.properties   |  12 +-
 .../tribes/util/LocalStrings_fr.properties |   2 +-
 .../catalina/util/LocalStrings_fr.properties   |   4 +-
 .../catalina/valves/LocalStrings_fr.properties |   4 +-
 .../webresources/LocalStrings_fr.properties|   2 +-
 .../coyote/http11/LocalStrings_fr.properties   |   4 +-
 .../http11/upgrade/LocalStrings_fr.properties  |   2 +-
 .../apache/coyote/http2/LocalStrings_fr.properties |   2 +-
 .../jasper/resources/LocalStrings_fr.properties| 185 +++--
 .../util/descriptor/web/LocalStrings_fr.properties |   2 +-
 .../tomcat/util/http/LocalStrings_fr.properties|   4 +-
 .../util/http/parser/LocalStrings_fr.properties|   2 +-
 .../tomcat/util/net/LocalStrings_fr.properties |  14 +-
 .../util/net/jsse/LocalStrings_fr.properties   |   4 +-
 .../util/net/openssl/LocalStrings_fr.properties|   8 +-
 .../net/openssl/ciphers/LocalStrings_fr.properties |   2 +-
 .../websocket/server/LocalStrings_fr.properties|   2 +-
 .../WEB-INF/classes/LocalStrings_fr.properties |  38 ++---
 41 files changed, 333 insertions(+), 332 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 02/02: Fix an incorrect search/replace

2020-03-30 Thread markt
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

commit e7538fcf13f2d03e992cb50cfb30937b2eb8adf1
Author: Mark Thomas 
AuthorDate: Mon Mar 30 14:12:47 2020 +0100

Fix an incorrect search/replace
---
 java/org/apache/naming/LocalStrings_fr.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/naming/LocalStrings_fr.properties 
b/java/org/apache/naming/LocalStrings_fr.properties
index eb297c8..33dd57d 100644
--- a/java/org/apache/naming/LocalStrings_fr.properties
+++ b/java/org/apache/naming/LocalStrings_fr.properties
@@ -27,4 +27,4 @@ namingContext.readOnly=Le Contexte est en lecture seule
 
 selectorContext.methodUsingName=Appel de la méthode [{0}] avec le nom [{1}]
 selectorContext.methodUsingString=Appel de la méthode [{0}] avec la String 
[{1}]
-selectorContext.noJavaUrl=Ce Contexte doit être accédé par une URL commençant 
par 'java :'
+selectorContext.noJavaUrl=Ce Contexte doit être accédé par une URL commençant 
par 'java:'


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 9.0.x updated: Fix an incorrect search/replace

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 49c3d94  Fix an incorrect search/replace
49c3d94 is described below

commit 49c3d946dffc72d0e832f41584505c5c84226b34
Author: Mark Thomas 
AuthorDate: Mon Mar 30 14:12:47 2020 +0100

Fix an incorrect search/replace
---
 java/org/apache/naming/LocalStrings_fr.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/naming/LocalStrings_fr.properties 
b/java/org/apache/naming/LocalStrings_fr.properties
index eb297c8..33dd57d 100644
--- a/java/org/apache/naming/LocalStrings_fr.properties
+++ b/java/org/apache/naming/LocalStrings_fr.properties
@@ -27,4 +27,4 @@ namingContext.readOnly=Le Contexte est en lecture seule
 
 selectorContext.methodUsingName=Appel de la méthode [{0}] avec le nom [{1}]
 selectorContext.methodUsingString=Appel de la méthode [{0}] avec la String 
[{1}]
-selectorContext.noJavaUrl=Ce Contexte doit être accédé par une URL commençant 
par 'java :'
+selectorContext.noJavaUrl=Ce Contexte doit être accédé par une URL commençant 
par 'java:'


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Fix an incorrect search/replace

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 9b3467a  Fix an incorrect search/replace
9b3467a is described below

commit 9b3467a80a99d741d038944b15599ed3c05fb1bf
Author: Mark Thomas 
AuthorDate: Mon Mar 30 14:12:47 2020 +0100

Fix an incorrect search/replace
---
 java/org/apache/naming/LocalStrings_fr.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/naming/LocalStrings_fr.properties 
b/java/org/apache/naming/LocalStrings_fr.properties
index eb297c8..33dd57d 100644
--- a/java/org/apache/naming/LocalStrings_fr.properties
+++ b/java/org/apache/naming/LocalStrings_fr.properties
@@ -27,4 +27,4 @@ namingContext.readOnly=Le Contexte est en lecture seule
 
 selectorContext.methodUsingName=Appel de la méthode [{0}] avec le nom [{1}]
 selectorContext.methodUsingString=Appel de la méthode [{0}] avec la String 
[{1}]
-selectorContext.noJavaUrl=Ce Contexte doit être accédé par une URL commençant 
par 'java :'
+selectorContext.noJavaUrl=Ce Contexte doit être accédé par une URL commençant 
par 'java:'


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [tomcat] 02/02: Add space before and after ':' as required by French grammar

2020-03-30 Thread Rémy Maucherat
On Mon, Mar 30, 2020 at 2:47 PM  wrote:

> This is an automated email from the ASF dual-hosted git repository.
>
> markt pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
> commit 589664c1cfc978a445710455e380507a160f75ff
> Author: Mark Thomas 
> AuthorDate: Mon Mar 30 13:46:53 2020 +0100
>
> Add space before and after ':' as required by French grammar
>

Great job :) Personally I am totally not aware of these rules. There are
some I intentionally break too, like accentuation and upper case. Like
"École" (school) if it is the first word of a sentence, I will always write
"Ecole". It's a semi new rule that I hate.

Rémy


[tomcat] 01/02: Add space before ? ! and ; as required by French grammar

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 73bd7b3b0f1684560af671f962984919ae1cc46c
Author: Mark Thomas 
AuthorDate: Mon Mar 30 13:15:49 2020 +0100

Add space before ? ! and ; as required by French grammar
---
 java/org/apache/catalina/authenticator/LocalStrings_fr.properties | 2 +-
 java/org/apache/catalina/connector/LocalStrings_fr.properties | 2 +-
 java/org/apache/catalina/core/LocalStrings_fr.properties  | 2 +-
 java/org/apache/catalina/ha/deploy/LocalStrings_fr.properties | 2 +-
 java/org/apache/catalina/loader/LocalStrings_fr.properties| 8 
 java/org/apache/catalina/startup/LocalStrings_fr.properties   | 4 ++--
 java/org/apache/catalina/webresources/LocalStrings_fr.properties  | 2 +-
 java/org/apache/jasper/resources/LocalStrings_fr.properties   | 4 ++--
 .../apache/tomcat/util/descriptor/web/LocalStrings_fr.properties  | 2 +-
 java/org/apache/tomcat/util/http/LocalStrings_fr.properties   | 4 ++--
 java/org/apache/tomcat/util/net/LocalStrings_fr.properties| 2 +-
 webapps/examples/WEB-INF/classes/LocalStrings_fr.properties   | 2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
index 363be09..c74bb5e 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
@@ -34,7 +34,7 @@ authenticator.unauthorized=Impossible d'authentifier avec les 
crédits fournis (
 
 basicAuthenticator.invalidCharset=Les seules valeurs permises sont null, la 
chaîne vide, ou des caractères UTF-8
 
-digestAuthenticator.cacheRemove=Une entrée valide du cache de nonce des 
clients a été enlevée pour faire de la place pour de nouvelles entrées, ce qui 
rend possible une attaque par répétition; pour éviter cela, il est possible de 
reduire nonceValidity ou d'augmenter nonceCacheSize; les avertissements de ce 
type ne se reproduiront pas avant 5 minutes
+digestAuthenticator.cacheRemove=Une entrée valide du cache de nonce des 
clients a été enlevée pour faire de la place pour de nouvelles entrées, ce qui 
rend possible une attaque par répétition ; pour éviter cela, il est possible de 
reduire nonceValidity ou d'augmenter nonceCacheSize ; les avertissements de ce 
type ne se reproduiront pas avant 5 minutes
 
 formAuthenticator.forwardErrorFail=Erreur inattendue lors de la transmission à 
la page d'erreur
 formAuthenticator.forwardLogin=Transmission de la requête pour [{0}] faite 
avec la méthode [{1}] à la page de connection [{2}] du contexte [{3}] en 
utilisant la méthode GET
diff --git a/java/org/apache/catalina/connector/LocalStrings_fr.properties 
b/java/org/apache/catalina/connector/LocalStrings_fr.properties
index 5a678b8..3bdbe67 100644
--- a/java/org/apache/catalina/connector/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_fr.properties
@@ -44,7 +44,7 @@ coyoteRequest.alreadyAuthenticated=Cette requête a déjà été 
authentifiée
 coyoteRequest.attributeEvent=Une exception a été lancée par l'instance 
d'écoute pour l'évènement attributs (attributes)
 coyoteRequest.authenticate.ise=Impossible d'appeler authenticate() après le 
début de l'envoi de la réponse
 coyoteRequest.changeSessionId=Impossible de changer l'id de la session, il n'y 
a pas de session associée à cette requête
-coyoteRequest.chunkedPostTooLarge=Les paramètres n'ont pas été traités parce 
que la taille des données du POST étaient trop grandes; comme cette requête 
utilisait le découpage par morceaux (chunking), le traitement est arrêté; 
utiliser l'attribut maxPostSize du connecteur pour résoudre ce problème si 
l'application devrait accepter des tailles de POST plus importantes
+coyoteRequest.chunkedPostTooLarge=Les paramètres n'ont pas été traités parce 
que la taille des données du POST étaient trop grandes ; comme cette requête 
utilisait le découpage par morceaux (chunking), le traitement est arrêté ; 
utiliser l'attribut maxPostSize du connecteur pour résoudre ce problème si 
l'application devrait accepter des tailles de POST plus importantes
 coyoteRequest.filterAsyncSupportUnknown=Incapacité de déterminer si un des 
filtres ne supporte pas le mode asynchrone
 coyoteRequest.getContextPath.ise=Impossible de trouver une correspondance 
entre le chemin canonique du contexte [{0}] et l''URI envoyée par l''agent de 
l''utilisateur [{1}]
 coyoteRequest.getInputStream.ise="getReader()" a déjà été appelé pour cette 
requête
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index bfeb971..01ff869 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ 

[tomcat] branch master updated (fe41e7d -> 589664c)

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from fe41e7d  Update / expand French translations
 new 73bd7b3  Add space before ? ! and ; as required by French grammar
 new 589664c  Add space before and after ':' as required by French grammar

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/jakarta/el/LocalStrings_fr.properties |   4 +-
 .../authenticator/LocalStrings_fr.properties   |   4 +-
 .../catalina/connector/LocalStrings_fr.properties  |   2 +-
 .../catalina/core/LocalStrings_fr.properties   |  34 ++--
 .../catalina/filters/LocalStrings_fr.properties|   8 +-
 .../catalina/ha/backend/LocalStrings_fr.properties |   2 +-
 .../catalina/ha/context/LocalStrings_fr.properties |   4 +-
 .../catalina/ha/deploy/LocalStrings_fr.properties  |   4 +-
 .../catalina/ha/session/LocalStrings_fr.properties |  34 ++--
 .../catalina/ha/tcp/LocalStrings_fr.properties |   6 +-
 .../catalina/loader/LocalStrings_fr.properties |  10 +-
 .../catalina/manager/LocalStrings_fr.properties|  80 -
 .../manager/host/LocalStrings_fr.properties|  22 +--
 .../catalina/realm/LocalStrings_fr.properties  |   8 +-
 .../catalina/servlets/LocalStrings_fr.properties   |   4 +-
 .../catalina/session/LocalStrings_fr.properties|  30 ++--
 .../catalina/startup/LocalStrings_fr.properties|  60 +++
 .../storeconfig/LocalStrings_fr.properties |   2 +-
 .../tribes/group/LocalStrings_fr.properties|   8 +-
 .../group/interceptors/LocalStrings_fr.properties  |  60 +++
 .../catalina/tribes/io/LocalStrings_fr.properties  |   4 +-
 .../tribes/membership/LocalStrings_fr.properties   |  16 +-
 .../membership/cloud/LocalStrings_fr.properties|   4 +-
 .../tribes/tipis/LocalStrings_fr.properties|  12 +-
 .../transport/bio/LocalStrings_fr.properties   |   6 +-
 .../transport/nio/LocalStrings_fr.properties   |  12 +-
 .../tribes/util/LocalStrings_fr.properties |   2 +-
 .../catalina/util/LocalStrings_fr.properties   |   4 +-
 .../catalina/valves/LocalStrings_fr.properties |   4 +-
 .../webresources/LocalStrings_fr.properties|   2 +-
 .../coyote/http11/LocalStrings_fr.properties   |   2 +-
 .../http11/upgrade/LocalStrings_fr.properties  |   2 +-
 .../apache/coyote/http2/LocalStrings_fr.properties |   2 +-
 .../jasper/resources/LocalStrings_fr.properties| 184 ++---
 java/org/apache/naming/LocalStrings_fr.properties  |   2 +-
 .../util/descriptor/web/LocalStrings_fr.properties |   2 +-
 .../util/digester/LocalStrings_fr.properties   |   2 +-
 .../tomcat/util/http/LocalStrings_fr.properties|   4 +-
 .../util/http/parser/LocalStrings_fr.properties|   2 +-
 .../tomcat/util/net/LocalStrings_fr.properties |  14 +-
 .../util/net/jsse/LocalStrings_fr.properties   |   4 +-
 .../util/net/openssl/LocalStrings_fr.properties|   8 +-
 .../net/openssl/ciphers/LocalStrings_fr.properties |   2 +-
 .../websocket/server/LocalStrings_fr.properties|   2 +-
 .../WEB-INF/classes/LocalStrings_fr.properties |  38 ++---
 45 files changed, 361 insertions(+), 361 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64290] Regression: The commit from December 06 2019 on FileUploadBase introduced an incompatible API change

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64290

Michael Osipov  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Michael Osipov  ---
(In reply to Markus Schlegel from comment #0)
> The commit 218ea934fc71a0948c1b2e313e9cf20dede2cc23 from December 6, 2019
> moved some Innerclasses from
> org.apache.tomcat.util.http.fileupload.FileUploadBase to the package
> org.apache.tomcat.util.http.fileupload.impl .
> 
> Since some of those classes were public in FileUploadBase, they might have
> been used somewhere in other projects. Our Application for example uses
> org.apache.tomcat.util.http.fileupload.FileUploadBase.
> FileSizeLimitExceededException .
> 
> This now ends in the fact, that compiled code will not run with newer 8.5.x
> Versions of Tomcat. As long as such projects or libraries are not fixed,
> customers cannot upgrade to newest Tomcat versions which will eventually end
> up in tomcat installations with known security issues.

That's a conceptual flaw I highly dislike:

> commit 218ea934fc71a0948c1b2e313e9cf20dede2cc23
> Author: Mark Thomas 
> Date:   2019-12-06 16:30:48 +0100
> 
> Merge in FileUpload changes to 2317552 (2019-12-06, 2.0-SNAPSHOT)

Relying on snapshots for GA versions is a no-go.

The other problem you see actually is that there is not enough abstraction
here. You rely on reshaded classes (exceptions) which should not be public (at
all). All should be hidden behind the Servlet API. Which is in Tomcat.

Do you
org.apache.tomcat.util.http.fileupload.FileUploadBase.FileSizeLimitExceededException
from #getCause()?

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 01/02: Fix order

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 415a7380b448d6d0f1f16d542a243ed7b28501ba
Author: Mark Thomas 
AuthorDate: Mon Mar 30 12:47:26 2020 +0100

Fix order
---
 java/org/apache/coyote/ajp/LocalStrings_fr.properties| 2 +-
 java/org/apache/coyote/ajp/LocalStrings_ko.properties| 2 +-
 java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/coyote/ajp/LocalStrings_fr.properties 
b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
index 5acecf3..c741323 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
@@ -28,6 +28,6 @@ ajpprocessor.request.prepare=Erreur lors de la préparation de 
la requête
 ajpprocessor.request.process=Erreur de traitement de la requête
 
 ajpprotocol.noSSL=SSL n''est pas supporté par AJP, la configuration de l''hôte 
SSL pour [{0}] a été ignorée
+ajpprotocol.noSecret=Le connecteur AJP est configuré avec 
secretRequired="true" mais l'attribut secret est soit null soit "", cette 
combinaison n'est pas valide
 ajpprotocol.noUpgrade=L''upgrade n''est pas supporté par AJP.  La 
configuration UpgradeProtocol pour [{0}] a été ignorée
 ajpprotocol.noUpgradeHandler=AJP ne supporte pas la mise à niveau (upgrade) de 
HTTP/1.1, le HttpUpgradeHandler [{0}] ne peut pas être utilisé
-ajpprotocol.noSecret=Le connecteur AJP est configuré avec 
secretRequired="true" mais l'attribut secret est soit null soit "", cette 
combinaison n'est pas valide
diff --git a/java/org/apache/coyote/ajp/LocalStrings_ko.properties 
b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
index b896c47..b8927d8 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
@@ -28,6 +28,6 @@ ajpprocessor.request.prepare=요청을 준비하는 중 오류 발생
 ajpprocessor.request.process=요청 처리 중 오류 발생
 
 ajpprotocol.noSSL=AJP와 함께 SSL은 지원되지 않습니다. [{0}]을(를) 위한 SSL 호스트 설정은 무시되었습니다.
+ajpprotocol.noSecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다. 
이 조합은 유효하지 않습니다.
 ajpprotocol.noUpgrade=AJP에서 프로토콜 업그레이드는 지원되지 않습니다. [{0}]을(를) 위한 
UpgradeProtocol 설정은 무시됩니다.
 ajpprotocol.noUpgradeHandler=AJP를 사용할 때, 업그레이드는 지원되지 않습니다. HttpUpgradeHandler 
[{0}]은(는) 처리될 수 없습니다.
-ajpprotocol.noSecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다. 
이 조합은 유효하지 않습니다.
diff --git a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties 
b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
index 244c366..a3b791e 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
@@ -23,5 +23,5 @@ ajpprocessor.readtimeout=从Socket读取数据超时
 ajpprocessor.request.prepare=准备请求错误
 ajpprocessor.request.process=处理请求错误
 
-ajpprotocol.noUpgrade=AJP 不支持升级。[{0}] 的升级协议配置被忽略。
 
ajpprotocol.noSecret=AJP连接器配置secretRequired="true",但是属性secret确实空或者空字符串,这样的组合是无效的。
+ajpprotocol.noUpgrade=AJP 不支持升级。[{0}] 的升级协议配置被忽略。


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated (1b41fc7 -> fe41e7d)

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 1b41fc7  Add Java 14 and 15 support to JSP compilation when supported 
by the ECJ
 new 415a738  Fix order
 new fe41e7d  Update / expand French translations

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/connector/LocalStrings_fr.properties | 1 +
 java/org/apache/coyote/ajp/LocalStrings_fr.properties | 2 +-
 java/org/apache/coyote/ajp/LocalStrings_ko.properties | 2 +-
 java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties  | 2 +-
 java/org/apache/coyote/http11/LocalStrings_fr.properties  | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] 02/02: Update / expand French translations

2020-03-30 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit fe41e7db715591c0b6bdbace8cf8bade59e7d07f
Author: Mark Thomas 
AuthorDate: Mon Mar 30 12:48:07 2020 +0100

Update / expand French translations
---
 java/org/apache/catalina/connector/LocalStrings_fr.properties | 1 +
 java/org/apache/coyote/http11/LocalStrings_fr.properties  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/LocalStrings_fr.properties 
b/java/org/apache/catalina/connector/LocalStrings_fr.properties
index 0ef0325..5a678b8 100644
--- a/java/org/apache/catalina/connector/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_fr.properties
@@ -24,6 +24,7 @@ coyoteAdapter.nullRequest=Un dispatch asynchrone peut 
seulement se produire sur
 
 coyoteConnector.invalidEncoding=L''encodage [{0}] n''est pas reconnu par la 
JRE. Le connecteur (Connector) continuera à utiliser [{1}]
 coyoteConnector.invalidPort=Le connecteur ne peut pas démarrer, parce que la 
valeur spécifiée du port [{0}] n''est pas valide
+coyoteConnector.notAsciiSuperset=L''encodage [{0}] n''inclut pas l''ASCII 
comme requis par la RFC 7230, le connecteur va continuer à utiliser [{1}]
 coyoteConnector.parseBodyMethodNoTrace=La méthode "TRACE" NE PEUT PAS contenir 
une entité (voir RFC 2616 Section 9.6)
 coyoteConnector.protocolHandlerDestroyFailed=La destruction du gestionnaire de 
protocole a échoué
 coyoteConnector.protocolHandlerInitializationFailed=L'initialisation du 
gestionnaire de protocole a échoué
diff --git a/java/org/apache/coyote/http11/LocalStrings_fr.properties 
b/java/org/apache/coyote/http11/LocalStrings_fr.properties
index 93a1da8..631af94 100644
--- a/java/org/apache/coyote/http11/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_fr.properties
@@ -23,7 +23,7 @@ http11processor.request.finish=Erreur en terminant la requête
 http11processor.request.inconsistentHosts=L'hôte spécifié dans la ligne de 
requête ne correspond pas à celui de l'en-tête hôte
 http11processor.request.invalidScheme=La requête HTTP contenait une URi 
absolue avec un schéma invalide
 http11processor.request.invalidTransferEncoding=La requête HTTP contenait un 
en-tête Trasfer-Encoding invalide
-http11processor.request.invalidUri=La requête HTTP contenait un URI invalide
+http11processor.request.invalidUri=La requête HTTP contenait un URI non valide
 http11processor.request.invalidUserInfo=La requête HTTP contenait un URI 
absolu avec un composant "userinfo" invalide
 http11processor.request.multipleContentLength=La requête contenait plusieurs 
en-têtes content-length
 http11processor.request.multipleHosts=La requête contenait plusieurs en-têtes 
hôtes


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64265] ETag comparison does not properly implement RFC 7232, section 2.3.2

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64265

--- Comment #1 from mgrigorov  ---
Hi Michael,

I see no difference between your 

> Tomcat returns a weak etag, so try the weak function:
>> $ curl "https://.../test/test.txt; -H 'If-None-Match: W/"6-1585143822000"' -I

and

> If I try strong logically, the following should give me a 200:
>> $ curl "https://.../test/test.txt; -H 'If-None-Match: W/"6-1585143822000"' -I

The commands are the same.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64290] New: Regression: The commit from December 06 2019 on FileUploadBase introduced an incompatible API change

2020-03-30 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64290

Bug ID: 64290
   Summary: Regression: The commit from December 06 2019 on
FileUploadBase introduced an incompatible API change
   Product: Tomcat 8
   Version: 8.5.x-trunk
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Util
  Assignee: dev@tomcat.apache.org
  Reporter: sch...@gmail.com
  Target Milestone: 

The commit 218ea934fc71a0948c1b2e313e9cf20dede2cc23 from December 6, 2019 moved
some Innerclasses from org.apache.tomcat.util.http.fileupload.FileUploadBase to
the package org.apache.tomcat.util.http.fileupload.impl .

Since some of those classes were public in FileUploadBase, they might have been
used somewhere in other projects. Our Application for example uses
org.apache.tomcat.util.http.fileupload.FileUploadBase.FileSizeLimitExceededException
.

This now ends in the fact, that compiled code will not run with newer 8.5.x
Versions of Tomcat. As long as such projects or libraries are not fixed,
customers cannot upgrade to newest Tomcat versions which will eventually end up
in tomcat installations with known security issues.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[GitHub] [tomcat-native] michael-o commented on issue #7: BZ 64260: Clean up install target

2020-03-30 Thread GitBox
michael-o commented on issue #7: BZ 64260: Clean up install target
URL: https://github.com/apache/tomcat-native/pull/7#issuecomment-605878034
 
 
   @martin-g Thanks. I will wait a couple of days for the other to look over 
eventually and will merge in April.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[GitHub] [tomcat-native] martin-g commented on issue #7: BZ 64260: Clean up install target

2020-03-30 Thread GitBox
martin-g commented on issue #7: BZ 64260: Clean up install target
URL: https://github.com/apache/tomcat-native/pull/7#issuecomment-605859387
 
 
   Everything works fine on my Ubuntu 18.04.4 ARM64!
   The changes also look good to me but I am not an expert in this area.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org