You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/01/07 15:12:06 UTC
[tomcat] branch 8.5.x updated (55bfb44 -> ecac8ab)
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 55bfb44 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63966
new 4c68b27 Remove unnecessary entry (package has been removed)
new 0ab878f Review diff to 9.0.x and add missing updates
new 768d813 Align with 9.0.x. Use ReflectiveOperationException
new ecac8ab Align with 9.0.x. Fix typo.
The 4 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:
conf/catalina.policy | 3 +--
conf/web.xml | 7 ++++++-
java/javax/el/ExpressionFactory.java | 3 +--
java/javax/el/StaticFieldELResolver.java | 3 +--
java/javax/security/auth/message/config/AuthConfigFactory.java | 6 ++----
java/javax/servlet/annotation/WebServlet.java | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/04: Review diff to 9.0.x and add missing updates
Posted by ma...@apache.org.
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 0ab878f073c311f05aa15db2a1f0fd38e1a7f426
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 7 15:05:10 2020 +0000
Review diff to 9.0.x and add missing updates
---
conf/web.xml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/conf/web.xml b/conf/web.xml
index 4d207ee..1aa1799 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -104,6 +104,11 @@
<!-- showServerInfo Should server information be presented in the -->
<!-- response sent to clients when directory -->
<!-- listings is enabled? [true] -->
+ <!-- -->
+ <!-- allowPartialPut Should the server treat an HTTP PUT request -->
+ <!-- with a Range header as a partial PUT? Note -->
+ <!-- that RFC 7233 clarified that Range headers are -->
+ <!-- only valid for GET requests. [true] -->
<servlet>
<servlet-name>default</servlet-name>
@@ -365,7 +370,7 @@
<!-- enableCmdLineArguments -->
<!-- Are command line parameters generated from -->
<!-- the query string as per section 4.4 of 3875 -->
- <!-- RFC? [true] -->
+ <!-- RFC? [false] -->
<!-- -->
<!-- executable Name of the executable used to run the -->
<!-- script. [perl] -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/04: Align with 9.0.x. Use ReflectiveOperationException
Posted by ma...@apache.org.
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 768d8133cf5a7183e93a7e9e1d9826d1bb432afe
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 7 15:10:45 2020 +0000
Align with 9.0.x. Use ReflectiveOperationException
---
java/javax/el/ExpressionFactory.java | 3 +--
java/javax/el/StaticFieldELResolver.java | 3 +--
java/javax/security/auth/message/config/AuthConfigFactory.java | 6 ++----
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/java/javax/el/ExpressionFactory.java b/java/javax/el/ExpressionFactory.java
index cc80a9e..9390170 100644
--- a/java/javax/el/ExpressionFactory.java
+++ b/java/javax/el/ExpressionFactory.java
@@ -179,8 +179,7 @@ public abstract class ExpressionFactory {
Throwable cause = e.getCause();
Util.handleThrowable(cause);
throw new ELException(Util.message(null, "expressionFactory.cannotCreate", clazz.getName()), e);
- } catch (InstantiationException | IllegalAccessException | IllegalArgumentException |
- NoSuchMethodException e) {
+ } catch (ReflectiveOperationException | IllegalArgumentException e) {
throw new ELException(Util.message(null, "expressionFactory.cannotCreate", clazz.getName()), e);
}
diff --git a/java/javax/el/StaticFieldELResolver.java b/java/javax/el/StaticFieldELResolver.java
index beb20e8..d6a9027 100644
--- a/java/javax/el/StaticFieldELResolver.java
+++ b/java/javax/el/StaticFieldELResolver.java
@@ -107,8 +107,7 @@ public class StaticFieldELResolver extends ELResolver {
Throwable cause = e.getCause();
Util.handleThrowable(cause);
throw new ELException(cause);
- } catch (IllegalArgumentException | IllegalAccessException |
- InstantiationException e) {
+ } catch (ReflectiveOperationException e) {
throw new ELException(e);
}
return result;
diff --git a/java/javax/security/auth/message/config/AuthConfigFactory.java b/java/javax/security/auth/message/config/AuthConfigFactory.java
index e883433..d98b2f2 100644
--- a/java/javax/security/auth/message/config/AuthConfigFactory.java
+++ b/java/javax/security/auth/message/config/AuthConfigFactory.java
@@ -16,7 +16,6 @@
*/
package javax.security.auth.message.config;
-import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
import java.security.Permission;
import java.security.PrivilegedAction;
@@ -67,9 +66,8 @@ public abstract class AuthConfigFactory {
factory = AccessController.doPrivileged(
new PrivilegedExceptionAction<AuthConfigFactory>() {
@Override
- public AuthConfigFactory run() throws ClassNotFoundException,
- InstantiationException, IllegalAccessException, IllegalArgumentException,
- InvocationTargetException, NoSuchMethodException, SecurityException {
+ public AuthConfigFactory run() throws ReflectiveOperationException,
+ IllegalArgumentException, SecurityException {
// Load this class with the same class loader as used for
// this class. Note that the Thread context class loader
// should not be used since that would trigger a memory leak
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/04: Remove unnecessary entry (package has been removed)
Posted by ma...@apache.org.
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 4c68b27981b3fff8f623b5e6e5638dfae0ce4e7b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 7 15:04:17 2020 +0000
Remove unnecessary entry (package has been removed)
---
conf/catalina.policy | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/conf/catalina.policy b/conf/catalina.policy
index 7f91de3..e5b2e92 100644
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -185,7 +185,6 @@ grant {
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.websocket.server";
// Applications need to access these packages to use the Servlet 4.0 Preview
- permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.servlet4preview";
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.servlet4preview.http";
};
@@ -269,4 +268,4 @@ grant codeBase "file:${catalina.home}/webapps/host-manager/-" {
//
// The permissions granted to a specific JAR
// grant codeBase "war:file:${catalina.base}/webapps/examples.war*/WEB-INF/lib/foo.jar" {
-// };
\ No newline at end of file
+// };
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/04: Align with 9.0.x. Fix typo.
Posted by ma...@apache.org.
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 ecac8ab46793f8cda7efcc3207ab8685197a822c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 7 15:11:01 2020 +0000
Align with 9.0.x. Fix typo.
---
java/javax/servlet/annotation/WebServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/javax/servlet/annotation/WebServlet.java b/java/javax/servlet/annotation/WebServlet.java
index 8e518b7..29d0b32 100644
--- a/java/javax/servlet/annotation/WebServlet.java
+++ b/java/javax/servlet/annotation/WebServlet.java
@@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * This annotation is used to declare the configuration of an
+ * This annotation is used to declare the configuration of a
* {@link javax.servlet.Servlet}. <br>
*
* If the name attribute is not defined, the fully qualified name of the class
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org