[Bug 63992] New: org.glassfish.jersey.server.ServerRuntime$Responder.writeResponse Error on Tomcat 9.0.26
https://bz.apache.org/bugzilla/show_bug.cgi?id=63992 Bug ID: 63992 Summary: org.glassfish.jersey.server.ServerRuntime$Responder.wr iteResponse Error on Tomcat 9.0.26 Product: Tomcat 9 Version: 9.0.26 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: boopala...@gmail.com Target Milestone: - Hi Team, We see below error on Catalina.out file for every minute. It doesn’t looks like application issue as all applications are working fine. Could you please help us to analyze more on the issue. Error: 06-Dec-2019 03:30:47.163 SEVERE [https-jsse-nio-50011-exec-45] org.glassfish.jersey.server.ServerRuntime$Responder.writeResponse An I/O error has occurred while writing a response message entity to the container output stream. org.glassfish.jersey.server.internal.process.MappableException: org.apache.catalina.connector.ClientAbortException: java.io.IOException: Connection reset by peer at org.glassfish.jersey.server.internal.MappableExceptionWrapperInterceptor.aroundWriteTo(MappableExceptionWrapperInterceptor.java:91) at org.glassfish.jersey.message.internal.WriterInterceptorExecutor.proceed(WriterInterceptorExecutor.java:163) at org.glassfish.jersey.message.internal.MessageBodyFactory.writeTo(MessageBodyFactory.java:1135) at org.glassfish.jersey.server.ServerRuntime$Responder.writeResponse(ServerRuntime.java:662) at org.glassfish.jersey.server.ServerRuntime$Responder.processResponse(ServerRuntime.java:395) at org.glassfish.jersey.server.ServerRuntime$Responder.process(ServerRuntime.java:385) at org.glassfish.jersey.server.ServerRuntime$1.run(ServerRuntime.java:280) at org.glassfish.jersey.internal.Errors$1.call(Errors.java:272) Regards, Boopalan M -- 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 56021] SSL connector using windows-my keystore
https://bz.apache.org/bugzilla/show_bug.cgi?id=56021 --- Comment #8 from Alexn --- I am using Apache Tomcat Version 8.5.27 on windows server 2016, but cannot get this to work. Can somebody take a look and tell me if I am missing something or this is a bug?. 1. I have the certificate in certmgr.msc (under Personal>Certificates) Issued to says --> CJISeProbApp02. I use this value as the alias. 2. 3. I am running tomcat as logged in user. An I belong to administrator group. 4. Error Log 06-Dec-2019 16:11:07.236 INFO [main] org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler ["https-openssl-nio-8443"] 06-Dec-2019 16:11:07.392 SEVERE [main] org.apache.catalina.core.StandardService.initInternal Failed to initialize connector [Connector[HTTP/1.1-8443]] org.apache.catalina.LifecycleException: Failed to initialize component [Connector[HTTP/1.1-8443]] at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:113) at org.apache.catalina.core.StandardService.initInternal(StandardService.java:549) at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:107) at org.apache.catalina.core.StandardServer.initInternal(StandardServer.java:875) at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:107) at org.apache.catalina.startup.Catalina.load(Catalina.java:621) at org.apache.catalina.startup.Catalina.load(Catalina.java:644) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at org.apache.catalina.startup.Bootstrap.load(Bootstrap.java:309) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:492) Caused by: org.apache.catalina.LifecycleException: Protocol handler initialization failed at org.apache.catalina.connector.Connector.initInternal(Connector.java:996) at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:107) ... 12 more Caused by: java.lang.IllegalArgumentException: java.io.IOException: Alias name [CJISeProbApp02] does not identify a key entry at org.apache.tomcat.util.net.AbstractJsseEndpoint.createSSLContext(AbstractJsseEndpoint.java:116) at org.apache.tomcat.util.net.AbstractJsseEndpoint.initialiseSsl(AbstractJsseEndpoint.java:87) at org.apache.tomcat.util.net.NioEndpoint.bind(NioEndpoint.java:225) at org.apache.tomcat.util.net.AbstractEndpoint.init(AbstractEndpoint.java:1086) at org.apache.tomcat.util.net.AbstractJsseEndpoint.init(AbstractJsseEndpoint.java:268) at org.apache.coyote.AbstractProtocol.init(AbstractProtocol.java:581) at org.apache.coyote.http11.AbstractHttp11Protocol.init(AbstractHttp11Protocol.java:68) at org.apache.catalina.connector.Connector.initInternal(Connector.java:993) ... 13 more Caused by: java.io.IOException: Alias name [CJISeProbApp02] does not identify a key entry at org.apache.tomcat.util.net.jsse.JSSEUtil.getKeyManagers(JSSEUtil.java:225) at org.apache.tomcat.util.net.openssl.OpenSSLUtil.getKeyManagers(OpenSSLUtil.java:79) at org.apache.tomcat.util.net.AbstractJsseEndpoint.createSSLContext(AbstractJsseEndpoint.java:114) ... 20 more 06-Dec-2019 16:11:07.392 INFO [main] org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler ["ajp-nio-8009"] -- 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 56021] SSL connector using windows-my keystore
https://bz.apache.org/bugzilla/show_bug.cgi?id=56021 Alexn changed: What|Removed |Added Resolution|FIXED |INFORMATIONPROVIDED --- Comment #7 from Alexn --- I am using Apache Tomcat Version 8.5.27 on windows server 2016, but cannot get this to work. Can somebody take a look and tell me if I am missing something or this is a bug?. 1. I have the certificate in certmgr.msc (under Personal>Certificates) Issued by CJISeProbApp02. I use this value as the alias. 2. 3. I am running tomcat as logged in user. An I belong to administrator group. 4. Error Log 06-Dec-2019 16:11:07.236 INFO [main] org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler ["https-openssl-nio-8443"] 06-Dec-2019 16:11:07.392 SEVERE [main] org.apache.catalina.core.StandardService.initInternal Failed to initialize connector [Connector[HTTP/1.1-8443]] org.apache.catalina.LifecycleException: Failed to initialize component [Connector[HTTP/1.1-8443]] at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:113) at org.apache.catalina.core.StandardService.initInternal(StandardService.java:549) at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:107) at org.apache.catalina.core.StandardServer.initInternal(StandardServer.java:875) at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:107) at org.apache.catalina.startup.Catalina.load(Catalina.java:621) at org.apache.catalina.startup.Catalina.load(Catalina.java:644) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at org.apache.catalina.startup.Bootstrap.load(Bootstrap.java:309) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:492) Caused by: org.apache.catalina.LifecycleException: Protocol handler initialization failed at org.apache.catalina.connector.Connector.initInternal(Connector.java:996) at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:107) ... 12 more Caused by: java.lang.IllegalArgumentException: java.io.IOException: Alias name [CJISeProbApp02] does not identify a key entry at org.apache.tomcat.util.net.AbstractJsseEndpoint.createSSLContext(AbstractJsseEndpoint.java:116) at org.apache.tomcat.util.net.AbstractJsseEndpoint.initialiseSsl(AbstractJsseEndpoint.java:87) at org.apache.tomcat.util.net.NioEndpoint.bind(NioEndpoint.java:225) at org.apache.tomcat.util.net.AbstractEndpoint.init(AbstractEndpoint.java:1086) at org.apache.tomcat.util.net.AbstractJsseEndpoint.init(AbstractJsseEndpoint.java:268) at org.apache.coyote.AbstractProtocol.init(AbstractProtocol.java:581) at org.apache.coyote.http11.AbstractHttp11Protocol.init(AbstractHttp11Protocol.java:68) at org.apache.catalina.connector.Connector.initInternal(Connector.java:993) ... 13 more Caused by: java.io.IOException: Alias name [CJISeProbApp02] does not identify a key entry at org.apache.tomcat.util.net.jsse.JSSEUtil.getKeyManagers(JSSEUtil.java:225) at org.apache.tomcat.util.net.openssl.OpenSSLUtil.getKeyManagers(OpenSSLUtil.java:79) at org.apache.tomcat.util.net.AbstractJsseEndpoint.createSSLContext(AbstractJsseEndpoint.java:114) ... 20 more 06-Dec-2019 16:11:07.392 INFO [main] org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler ["ajp-nio-8009"] -- 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] 06/07: Add an atomic method to rotate session ID and return new value. Use it.
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 1949da1cf5e6be10c8e39572a701fef217fa99f1
Author: Mark Thomas
AuthorDate: Fri Dec 6 12:13:15 2019 +
Add an atomic method to rotate session ID and return new value. Use it.
---
java/org/apache/catalina/Manager.java | 33 +++
java/org/apache/catalina/connector/Request.java | 3 +--
java/org/apache/catalina/session/ManagerBase.java | 7 +
3 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/Manager.java
b/java/org/apache/catalina/Manager.java
index ac9b8fb..86b47e5 100644
--- a/java/org/apache/catalina/Manager.java
+++ b/java/org/apache/catalina/Manager.java
@@ -215,11 +215,44 @@ public interface Manager {
* session ID.
*
* @param session The session to change the session ID for
+ *
+ * @deprecated Use {@link #rotateSessionId(Session)}.
+ * Will be removed in Tomcat 10
*/
+@Deprecated
public void changeSessionId(Session session);
/**
+ * Change the session ID of the current session to a new randomly generated
+ * session ID.
+ *
+ * @param session The session to change the session ID for
+ *
+ * @return The new session ID
+ */
+public default String rotateSessionId(Session session) {
+String newSessionId = null;
+// Assume there new Id is a duplicate until we prove it isn't. The
+// chances of a duplicate are extremely low but the current ManagerBase
+// code protects against duplicates so this default method does too.
+boolean duplicate = true;
+do {
+newSessionId = getSessionIdGenerator().generateSessionId();
+try {
+if (findSession(newSessionId) == null) {
+duplicate = false;
+}
+} catch (IOException ioe) {
+// Swallow. An IOE means the ID was known so continue looping
+}
+} while (duplicate);
+changeSessionId(session, newSessionId);
+return newSessionId;
+}
+
+
+/**
* Change the session ID of the current session to a specified session ID.
*
* @param session The session to change the session ID for
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 7cd30f7..8608276 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2675,9 +2675,8 @@ public class Request implements HttpServletRequest {
}
Manager manager = this.getContext().getManager();
-manager.changeSessionId(session);
-String newSessionId = session.getId();
+String newSessionId = manager.rotateSessionId(session);
this.changeSessionId(newSessionId);
return newSessionId;
diff --git a/java/org/apache/catalina/session/ManagerBase.java
b/java/org/apache/catalina/session/ManagerBase.java
index de6ae81..5e769c8 100644
--- a/java/org/apache/catalina/session/ManagerBase.java
+++ b/java/org/apache/catalina/session/ManagerBase.java
@@ -753,8 +753,15 @@ public abstract class ManagerBase extends
LifecycleMBeanBase implements Manager
@Override
public void changeSessionId(Session session) {
+rotateSessionId(session);
+}
+
+
+@Override
+public String rotateSessionId(Session session) {
String newId = generateSessionId();
changeSessionId(session, newId, true, true);
+return newId;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/07: Refactor so Principal is never cached in session with cache==false
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 1ecba14e690cf5f3f143eef6ae7037a6d3c16652
Author: Mark Thomas
AuthorDate: Thu Dec 5 23:25:37 2019 +
Refactor so Principal is never cached in session with cache==false
---
.../catalina/authenticator/AuthenticatorBase.java | 5 ++--
.../apache/catalina/authenticator/Constants.java | 3 ++
.../catalina/authenticator/FormAuthenticator.java | 33 ++
3 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index b644934..0b63fd9 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -1133,10 +1133,11 @@ public abstract class AuthenticatorBase extends
ValveBase
}
// Cache the authentication information in our session, if any
-if (cache) {
-if (session != null) {
+if (session != null) {
+if (cache) {
session.setAuthType(authType);
session.setPrincipal(principal);
+} else {
if (username != null) {
session.setNote(Constants.SESS_USERNAME_NOTE, username);
} else {
diff --git a/java/org/apache/catalina/authenticator/Constants.java
b/java/org/apache/catalina/authenticator/Constants.java
index 69b6066..9857c09 100644
--- a/java/org/apache/catalina/authenticator/Constants.java
+++ b/java/org/apache/catalina/authenticator/Constants.java
@@ -77,7 +77,10 @@ public class Constants {
/**
* The previously authenticated principal (if caching is disabled).
+ *
+ * @deprecated Unused. Will be removed in Tomcat 10.
*/
+@Deprecated
public static final String FORM_PRINCIPAL_NOTE =
"org.apache.catalina.authenticator.PRINCIPAL";
/**
diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java
b/java/org/apache/catalina/authenticator/FormAuthenticator.java
index 9d5e3f8..f326f77 100644
--- a/java/org/apache/catalina/authenticator/FormAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java
@@ -132,10 +132,6 @@ public class FormAuthenticator
protected boolean doAuthenticate(Request request, HttpServletResponse
response)
throws IOException {
-if (checkForCachedAuthentication(request, response, true)) {
-return true;
-}
-
// References to objects we will need later
Session session = null;
Principal principal = null;
@@ -154,9 +150,8 @@ public class FormAuthenticator
}
principal = context.getRealm().authenticate(username,
password);
if (principal != null) {
-session.setNote(Constants.FORM_PRINCIPAL_NOTE, principal);
+register(request, response, principal,
HttpServletRequest.FORM_AUTH, username, password);
if (!matchRequest(request)) {
-register(request, response, principal,
HttpServletRequest.FORM_AUTH, username, password);
return true;
}
}
@@ -173,16 +168,6 @@ public class FormAuthenticator
if (log.isDebugEnabled()) {
log.debug("Restore request from session '" +
session.getIdInternal() + "'");
}
-principal = (Principal)
session.getNote(Constants.FORM_PRINCIPAL_NOTE);
-register(request, response, principal,
HttpServletRequest.FORM_AUTH,
- (String) session.getNote(Constants.SESS_USERNAME_NOTE),
- (String) session.getNote(Constants.SESS_PASSWORD_NOTE));
-// If we're caching principals we no longer need the user name
-// and password in the session, so remove them
-if (cache) {
-session.removeNote(Constants.SESS_USERNAME_NOTE);
-session.removeNote(Constants.SESS_PASSWORD_NOTE);
-}
if (restoreRequest(request, session)) {
if (log.isDebugEnabled()) {
log.debug("Proceed to restored request");
@@ -197,6 +182,12 @@ public class FormAuthenticator
}
}
+// This check has to be after the previous check for a matching request
+// because that matching request may also include a cached Principal.
+if (checkForCachedAuthentication(request, response, true)) {
+return true;
+}
+
// Acquire references to objects we will need to evaluate
String contextPath = request.getContextPath();
String requestURI = request.getDecodedRequestURI();
@@ -283,12 +274,7 @@ public class FormAuthent
[tomcat] 05/07: Harden the FORM authentication process
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 fd381e94f222831fd2bee697deb6246d417b8f33
Author: Mark Thomas
AuthorDate: Thu Dec 5 23:01:42 2019 +
Harden the FORM authentication process
When the session ID is configured to change on authentication, track the
expected session ID through the authentication process and ensure that
the expected value is seen at each stage.
---
.../catalina/authenticator/AuthenticatorBase.java| 6 +-
.../org/apache/catalina/authenticator/Constants.java | 6 ++
.../catalina/authenticator/FormAuthenticator.java| 20 +++-
3 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 0b63fd9..d63d652 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -1126,7 +1126,11 @@ public abstract class AuthenticatorBase extends ValveBase
// If the principal is null then this is a logout. No need to
change
// the session ID. See BZ 59043.
if (getChangeSessionIdOnAuthentication() && principal != null) {
-changeSessionID(request, session);
+String newSessionId = changeSessionID(request, session);
+// If the current session ID is being tracked, update it.
+if (session.getNote(Constants.SESSION_ID_NOTE) != null) {
+session.setNote(Constants.SESSION_ID_NOTE, newSessionId);
+}
}
} else if (alwaysUseSession) {
session = request.getSessionInternal(true);
diff --git a/java/org/apache/catalina/authenticator/Constants.java
b/java/org/apache/catalina/authenticator/Constants.java
index 9857c09..a8e9a47 100644
--- a/java/org/apache/catalina/authenticator/Constants.java
+++ b/java/org/apache/catalina/authenticator/Constants.java
@@ -53,6 +53,12 @@ public class Constants {
// -- Session Notes
/**
+ * The session id used as a CSRF marker when redirecting a user's request.
+ */
+public static final String SESSION_ID_NOTE =
"org.apache.catalina.authenticator.SESSION_ID";
+
+
+/**
* If the cache property of our authenticator is set, and
* the current request is part of a session, authentication information
* will be cached to avoid the need for repeated calls to
diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java
b/java/org/apache/catalina/authenticator/FormAuthenticator.java
index f326f77..e9b9839 100644
--- a/java/org/apache/catalina/authenticator/FormAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java
@@ -253,6 +253,14 @@ public class FormAuthenticator
if (session == null) {
session = request.getSessionInternal(false);
}
+if (session != null && getChangeSessionIdOnAuthentication()) {
+// Does session id match?
+String expectedSessionId = (String)
session.getNote(Constants.SESSION_ID_NOTE);
+if (expectedSessionId == null ||
!expectedSessionId.equals(request.getRequestedSessionId())) {
+session.expire();
+session = null;
+}
+}
if (session == null) {
if (containerLog.isDebugEnabled()) {
containerLog.debug("User took so long to log on the session
expired");
@@ -382,7 +390,8 @@ public class FormAuthenticator
if (getChangeSessionIdOnAuthentication()) {
Session session = request.getSessionInternal(false);
if (session != null) {
-changeSessionID(request, session);
+String newSessionId = changeSessionID(request, session);
+session.setNote(Constants.SESSION_ID_NOTE, newSessionId);
}
}
@@ -479,6 +488,14 @@ public class FormAuthenticator
return false;
}
+// Does session id match?
+if (getChangeSessionIdOnAuthentication()) {
+String expectedSessionId = (String)
session.getNote(Constants.SESSION_ID_NOTE);
+if (expectedSessionId == null ||
!expectedSessionId.equals(request.getRequestedSessionId())) {
+return false;
+}
+}
+
// Does the request URI match?
String decodedRequestURI = request.getDecodedRequestURI();
if (decodedRequestURI == null) {
@@ -505,6 +522,7 @@ public class FormAuthenticator
// Retrieve and remove the SavedRequest object from our session
SavedRequest saved = (SavedRequest)
session.getNote(Constants.FORM_REQUEST_NOTE);
session.removeNote(
[tomcat] branch master updated (0499c74 -> 50ac62d)
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 0499c74 Fix codec new 14dea88 Clean-up. No functional change. new e55e662 Clean-up prior to some refactoring. new d237110 Refactor change of session ID to reduce duplicate code new 1ecba14 Refactor so Principal is never cached in session with cache==false new fd381e9 Harden the FORM authentication process new 1949da1 Add an atomic method to rotate session ID and return new value. Use it. new 50ac62d Update changelog The 7 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/Manager.java | 33 +++ .../catalina/authenticator/AuthenticatorBase.java | 36 --- .../apache/catalina/authenticator/Constants.java | 48 - .../catalina/authenticator/FormAuthenticator.java | 107 + java/org/apache/catalina/connector/Request.java| 3 +- java/org/apache/catalina/session/ManagerBase.java | 7 ++ webapps/docs/changelog.xml | 5 + 7 files changed, 130 insertions(+), 109 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/07: Refactor change of session ID to reduce duplicate code
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 d237110e056984989a3b64ade86ef9d88fef0db5
Author: Mark Thomas
AuthorDate: Thu Dec 5 23:11:03 2019 +
Refactor change of session ID to reduce duplicate code
---
.../catalina/authenticator/AuthenticatorBase.java | 29 --
.../catalina/authenticator/FormAuthenticator.java | 5 +---
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index b6f2c9e..b644934 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -46,7 +46,6 @@ import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.Manager;
import org.apache.catalina.Realm;
import org.apache.catalina.Session;
import org.apache.catalina.TomcatPrincipal;
@@ -1126,18 +1125,8 @@ public abstract class AuthenticatorBase extends ValveBase
if (session != null) {
// If the principal is null then this is a logout. No need to
change
// the session ID. See BZ 59043.
-if (changeSessionIdOnAuthentication && principal != null) {
-String oldId = null;
-if (log.isDebugEnabled()) {
-oldId = session.getId();
-}
-Manager manager = request.getContext().getManager();
-manager.changeSessionId(session);
-request.changeSessionId(session.getId());
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("authenticator.changeSessionId",
-oldId, session.getId()));
-}
+if (getChangeSessionIdOnAuthentication() && principal != null) {
+changeSessionID(request, session);
}
} else if (alwaysUseSession) {
session = request.getSessionInternal(true);
@@ -1224,6 +1213,20 @@ public abstract class AuthenticatorBase extends ValveBase
}
+
+protected String changeSessionID(Request request, Session session) {
+String oldId = null;
+if (log.isDebugEnabled()) {
+oldId = session.getId();
+}
+String newId = request.changeSessionId();
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("authenticator.changeSessionId", oldId,
newId));
+}
+return newId;
+}
+
+
@Override
public void login(String username, String password, Request request)
throws ServletException {
Principal principal = doLogin(request, username, password);
diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java
b/java/org/apache/catalina/authenticator/FormAuthenticator.java
index 8f4268b..9d5e3f8 100644
--- a/java/org/apache/catalina/authenticator/FormAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java
@@ -28,7 +28,6 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.catalina.Manager;
import org.apache.catalina.Realm;
import org.apache.catalina.Session;
import org.apache.catalina.connector.Request;
@@ -397,9 +396,7 @@ public class FormAuthenticator
if (getChangeSessionIdOnAuthentication()) {
Session session = request.getSessionInternal(false);
if (session != null) {
-Manager manager = request.getContext().getManager();
-manager.changeSessionId(session);
-request.changeSessionId(session.getId());
+changeSessionID(request, session);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/07: Clean-up. No functional change.
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 14dea885579e275dc3633b2a0df328dff5beb653
Author: Mark Thomas
AuthorDate: Thu Dec 5 19:59:47 2019 +
Clean-up. No functional change.
---
.../apache/catalina/authenticator/Constants.java | 41 ++
1 file changed, 10 insertions(+), 31 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/Constants.java
b/java/org/apache/catalina/authenticator/Constants.java
index 452a4f0..69b6066 100644
--- a/java/org/apache/catalina/authenticator/Constants.java
+++ b/java/org/apache/catalina/authenticator/Constants.java
@@ -14,11 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.authenticator;
-
public class Constants {
// Authentication methods for login configuration
// Servlet spec schemes are defined in HttpServletRequest
@@ -33,17 +30,13 @@ public class Constants {
// SPNEGO authentication constants
public static final String KRB5_CONF_PROPERTY = "java.security.krb5.conf";
public static final String DEFAULT_KRB5_CONF = "conf/krb5.ini";
-public static final String JAAS_CONF_PROPERTY =
-"java.security.auth.login.config";
+public static final String JAAS_CONF_PROPERTY =
"java.security.auth.login.config";
public static final String DEFAULT_JAAS_CONF = "conf/jaas.conf";
-public static final String DEFAULT_LOGIN_MODULE_NAME =
-"com.sun.security.jgss.krb5.accept";
+public static final String DEFAULT_LOGIN_MODULE_NAME =
"com.sun.security.jgss.krb5.accept";
// Cookie name for single sign on support
-public static final String SINGLE_SIGN_ON_COOKIE =
-System.getProperty(
-
"org.apache.catalina.authenticator.Constants.SSO_SESSION_COOKIE_NAME",
-"JSESSIONIDSSO");
+public static final String SINGLE_SIGN_ON_COOKIE = System.getProperty(
+
"org.apache.catalina.authenticator.Constants.SSO_SESSION_COOKIE_NAME",
"JSESSIONIDSSO");
// - Request Notes
@@ -52,17 +45,13 @@ public class Constants {
* The notes key to track the single-sign-on identity with which this
* request is associated.
*/
-public static final String REQ_SSOID_NOTE =
-"org.apache.catalina.request.SSOID";
+public static final String REQ_SSOID_NOTE =
"org.apache.catalina.request.SSOID";
-
-public static final String REQ_JASPIC_SUBJECT_NOTE =
-"org.apache.catalina.authenticator.jaspic.SUBJECT";
+public static final String REQ_JASPIC_SUBJECT_NOTE =
"org.apache.catalina.authenticator.jaspic.SUBJECT";
// -- Session Notes
-
/**
* If the cache property of our authenticator is set, and
* the current request is part of a session, authentication information
@@ -70,19 +59,15 @@ public class Constants {
* Realm.authenticate(), under the following keys:
*/
-
/**
* The notes key for the password used to authenticate this user.
*/
-public static final String SESS_PASSWORD_NOTE =
- "org.apache.catalina.session.PASSWORD";
-
+public static final String SESS_PASSWORD_NOTE =
"org.apache.catalina.session.PASSWORD";
/**
* The notes key for the username used to authenticate this user.
*/
-public static final String SESS_USERNAME_NOTE =
- "org.apache.catalina.session.USERNAME";
+public static final String SESS_USERNAME_NOTE =
"org.apache.catalina.session.USERNAME";
/**
@@ -90,20 +75,14 @@ public class Constants {
* cache required information prior to the completion of authentication.
*/
-
/**
* The previously authenticated principal (if caching is disabled).
*/
-public static final String FORM_PRINCIPAL_NOTE =
-"org.apache.catalina.authenticator.PRINCIPAL";
-
+public static final String FORM_PRINCIPAL_NOTE =
"org.apache.catalina.authenticator.PRINCIPAL";
/**
* The original request information, to which the user will be
* redirected if authentication succeeds.
*/
-public static final String FORM_REQUEST_NOTE =
-"org.apache.catalina.authenticator.REQUEST";
-
-
+public static final String FORM_REQUEST_NOTE =
"org.apache.catalina.authenticator.REQUEST";
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 07/07: Update changelog
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 50ac62d5c94414a31264479cf951eda4b4e86617 Author: Mark Thomas AuthorDate: Fri Dec 6 21:14:06 2019 + Update changelog --- webapps/docs/changelog.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d5a71ba..6d904d4 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -102,6 +102,11 @@ Moved server-side include (SSI) module into a separate JAR library. (schultz) + +Refactor FORM authentication to reduce duplicate code and to ensure that +the authenticated Principal is not cached in the session when caching is +disabled. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/07: Clean-up prior to some refactoring.
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 e55e662708996848e0709a1859289e4f562528d8
Author: Mark Thomas
AuthorDate: Thu Dec 5 20:00:02 2019 +
Clean-up prior to some refactoring.
---
.../catalina/authenticator/FormAuthenticator.java | 57 --
1 file changed, 19 insertions(+), 38 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java
b/java/org/apache/catalina/authenticator/FormAuthenticator.java
index 1b54ddd..8f4268b 100644
--- a/java/org/apache/catalina/authenticator/FormAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java
@@ -147,22 +147,17 @@ public class FormAuthenticator
if (log.isDebugEnabled()) {
log.debug("Checking for reauthenticate in session " + session);
}
-String username =
-(String) session.getNote(Constants.SESS_USERNAME_NOTE);
-String password =
-(String) session.getNote(Constants.SESS_PASSWORD_NOTE);
-if ((username != null) && (password != null)) {
+String username = (String)
session.getNote(Constants.SESS_USERNAME_NOTE);
+String password = (String)
session.getNote(Constants.SESS_PASSWORD_NOTE);
+if (username != null && password != null) {
if (log.isDebugEnabled()) {
log.debug("Reauthenticating username '" + username + "'");
}
-principal =
-context.getRealm().authenticate(username, password);
+principal = context.getRealm().authenticate(username,
password);
if (principal != null) {
session.setNote(Constants.FORM_PRINCIPAL_NOTE, principal);
if (!matchRequest(request)) {
-register(request, response, principal,
-HttpServletRequest.FORM_AUTH,
-username, password);
+register(request, response, principal,
HttpServletRequest.FORM_AUTH, username, password);
return true;
}
}
@@ -177,16 +172,13 @@ public class FormAuthenticator
if (matchRequest(request)) {
session = request.getSessionInternal(true);
if (log.isDebugEnabled()) {
-log.debug("Restore request from session '"
- + session.getIdInternal()
- + "'");
+log.debug("Restore request from session '" +
session.getIdInternal() + "'");
}
-principal = (Principal)
-session.getNote(Constants.FORM_PRINCIPAL_NOTE);
+principal = (Principal)
session.getNote(Constants.FORM_PRINCIPAL_NOTE);
register(request, response, principal,
HttpServletRequest.FORM_AUTH,
(String) session.getNote(Constants.SESS_USERNAME_NOTE),
(String) session.getNote(Constants.SESS_PASSWORD_NOTE));
-// If we're caching principals we no longer need the username
+// If we're caching principals we no longer need the user name
// and password in the session, so remove them
if (cache) {
session.removeNote(Constants.SESS_USERNAME_NOTE);
@@ -211,9 +203,7 @@ public class FormAuthenticator
String requestURI = request.getDecodedRequestURI();
// Is this the action request from the login page?
-boolean loginAction =
-requestURI.startsWith(contextPath) &&
-requestURI.endsWith(Constants.FORM_ACTION);
+boolean loginAction = requestURI.startsWith(contextPath) &&
requestURI.endsWith(Constants.FORM_ACTION);
LoginConfig config = context.getLoginConfig();
@@ -241,8 +231,7 @@ public class FormAuthenticator
saveRequest(request, session);
} catch (IOException ioe) {
log.debug("Request body too big to save during
authentication");
-response.sendError(HttpServletResponse.SC_FORBIDDEN,
-sm.getString("authenticator.requestBodyTooBig"));
+response.sendError(HttpServletResponse.SC_FORBIDDEN,
sm.getString("authenticator.requestBodyTooBig"));
return false;
}
forwardToLoginPage(request, response, config);
@@ -276,12 +265,11 @@ public class FormAuthenticator
}
if (session == null) {
if (containerLog.isDebugEnabled()) {
-containerLog.debug
-("User took so long to log on the session expired");
+containerLog.debug("User took so long to log on the session
expired");
}
if (landingPage == null) {
-
[tomcat] 04/09: Merge in Pool 2 changes to 6092f92 (2019-12-06, 2.8.0-SNAPSHOT)
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 6ad6bfcc66b48d8c9b7cfe2e401b05c94a92ff25
Author: Mark Thomas
AuthorDate: Fri Dec 6 15:43:08 2019 +
Merge in Pool 2 changes to 6092f92 (2019-12-06, 2.8.0-SNAPSHOT)
---
MERGE.txt | 12 +-
.../dbcp/pool2/BaseKeyedPooledObjectFactory.java | 2 +
.../apache/tomcat/dbcp/pool2/BaseObjectPool.java | 1 +
.../apache/tomcat/dbcp/pool2/KeyedObjectPool.java | 227 +
java/org/apache/tomcat/dbcp/pool2/ObjectPool.java | 138 +++--
java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 26 +--
.../org/apache/tomcat/dbcp/pool2/PooledObject.java | 3 +-
.../dbcp/pool2/impl/DefaultEvictionPolicy.java | 2 +
.../tomcat/dbcp/pool2/impl/EvictionConfig.java | 1 +
.../tomcat/dbcp/pool2/impl/EvictionTimer.java | 9 +-
.../dbcp/pool2/impl/GenericKeyedObjectPool.java| 25 ++-
.../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 29 +--
.../pool2/impl/InterruptibleReentrantLock.java | 1 +
.../dbcp/pool2/impl/LinkedBlockingDeque.java | 4 +
.../dbcp/pool2/impl/SecurityManagerCallStack.java | 7 +-
.../dbcp/pool2/impl/SoftReferenceObjectPool.java | 3 +
webapps/docs/changelog.xml | 4 +
17 files changed, 294 insertions(+), 200 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index 893ac89..7daec6d 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -58,15 +58,15 @@ Note: Tomcat's copy of fileupload also includes classes
copied manually from
DBCP
+Pool2
+Sub-tree
+src/main/java/org/apache/commons/pool2
+The SHA1 ID for the most recent commit to be merged to Tomcat is:
+6092f924b36061353ff92b18c88400ab3bc05327 (2019-12-06)
+
DBCP2
Sub-tree
src/main/java/org/apache/commons/dbcp2
src/main/resources/org/apache/commons/dbcp2
The SHA1 ID for the most recent commit to be merged to Tomcat is:
4813b7f5456c1f4fecc4f701ac731a71f57db249 (2019-08-09)
-
-Pool2
-Sub-tree
-src/main/java/org/apache/commons/pool2
-The SHA1 ID for the most recent commit to be merged to Tomcat is:
-796e32d53cc0d870ba0db3a7faf4c5b24ff76f3f (2019-08-01)
diff --git
a/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
b/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
index 3dd7429..dfbc5a9 100644
--- a/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
+++ b/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
@@ -21,7 +21,9 @@ package org.apache.tomcat.dbcp.pool2;
*
* All operations defined here are essentially no-op's.
*
+ *
* This class is immutable, and therefore thread-safe.
+ *
*
* @see KeyedPooledObjectFactory
*
diff --git a/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
b/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
index 29f189a..df23b12 100644
--- a/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
@@ -22,6 +22,7 @@ package org.apache.tomcat.dbcp.pool2;
* indicating it is unsupported or throw {@link UnsupportedOperationException}.
*
* This class is intended to be thread-safe.
+ *
*
* @param Type of element pooled in this pool.
*
diff --git a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
index 4df37d8..fc18acc 100644
--- a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
@@ -17,6 +17,8 @@
package org.apache.tomcat.dbcp.pool2;
import java.io.Closeable;
+import java.util.Collection;
+import java.util.Iterator;
import java.util.NoSuchElementException;
/**
@@ -66,6 +68,75 @@ import java.util.NoSuchElementException;
* @since 2.0
*/
public interface KeyedObjectPool extends Closeable {
+
+/**
+ * Create an object using the {@link KeyedPooledObjectFactory factory} or
+ * other implementation dependent mechanism, passivate it, and then place
it
+ * in the idle object pool. addObject is useful for
+ * "pre-loading" a pool with idle objects (Optional operation).
+ *
+ * @param key the key a new instance should be added to
+ *
+ * @throws Exception
+ * when {@link KeyedPooledObjectFactory#makeObject} fails.
+ * @throws IllegalStateException
+ * after {@link #close} has been called on this pool.
+ * @throws UnsupportedOperationException
+ * when this pool cannot add new idle objects.
+ */
+void addObject(K key) throws Exception, IllegalStateException,
+UnsupportedOperationException;
+
+/**
+ * Calls {@link KeyedObjectPool#addObject(Object)} with each
+ * key in keys for count number of times. This
has
+ * the same effect as calling {@link #addObjects(Object, int)}
+ * for each k
[tomcat] 03/09: Merge in FileUpload changes to 2317552 (2019-12-06, 2.0-SNAPSHOT)
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 ee7666aab2cf4e12f0eadc9864b742866a4061a1
Author: Mark Thomas
AuthorDate: Fri Dec 6 15:30:48 2019 +
Merge in FileUpload changes to 2317552 (2019-12-06, 2.0-SNAPSHOT)
---
MERGE.txt | 2 +-
java/org/apache/catalina/connector/Request.java| 6 +-
.../util/http/fileupload/FileItemIterator.java | 49 +-
.../util/http/fileupload/FileUploadBase.java | 702 +
.../util/http/fileupload/MultipartStream.java | 10 +-
.../util/http/fileupload/disk/DiskFileItem.java| 3 +-
.../http/fileupload/impl/FileItemIteratorImpl.java | 339 ++
.../http/fileupload/impl/FileItemStreamImpl.java | 222 +++
.../impl/FileSizeLimitExceededException.java | 94 +++
.../fileupload/impl/FileUploadIOException.java | 63 ++
.../fileupload/impl/IOFileUploadException.java | 62 ++
.../impl/InvalidContentTypeException.java | 62 ++
.../util/http/fileupload/impl/SizeException.java | 75 +++
.../impl/SizeLimitExceededException.java | 43 ++
webapps/docs/changelog.xml | 4 +
15 files changed, 1032 insertions(+), 704 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index b4bd507..893ac89 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -51,7 +51,7 @@ FileUpload
Sub-tree:
src/main/java/org/apache/commons/fileupload2
The SHA1 ID for the most recent commit to be merged to Tomcat is:
-9958ea2426ec5682a7c929a13372c04426ee3818 (2019-08-01)
+2317552993fd5180a84083d599b8cbdb05a07bab (2019-12-06)
Note: Tomcat's copy of fileupload also includes classes copied manually from
Commons IO.
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 61dea52..3c04c1c 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -105,10 +105,10 @@ import org.apache.tomcat.util.http.Parameters.FailReason;
import org.apache.tomcat.util.http.ServerCookie;
import org.apache.tomcat.util.http.ServerCookies;
import org.apache.tomcat.util.http.fileupload.FileItem;
-import org.apache.tomcat.util.http.fileupload.FileUploadBase;
-import
org.apache.tomcat.util.http.fileupload.FileUploadBase.InvalidContentTypeException;
import org.apache.tomcat.util.http.fileupload.FileUploadException;
import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory;
+import org.apache.tomcat.util.http.fileupload.impl.InvalidContentTypeException;
+import org.apache.tomcat.util.http.fileupload.impl.SizeLimitExceededException;
import org.apache.tomcat.util.http.fileupload.servlet.ServletFileUpload;
import org.apache.tomcat.util.http.fileupload.servlet.ServletRequestContext;
import org.apache.tomcat.util.http.parser.AcceptLanguage;
@@ -2906,7 +2906,7 @@ public class Request implements HttpServletRequest {
} catch (InvalidContentTypeException e) {
parameters.setParseFailedReason(FailReason.INVALID_CONTENT_TYPE);
partsParseException = new ServletException(e);
-} catch (FileUploadBase.SizeException e) {
+} catch (SizeLimitExceededException e) {
parameters.setParseFailedReason(FailReason.POST_TOO_LARGE);
checkSwallowInput();
partsParseException = new IllegalStateException(e);
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
b/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
index 4f331ad..9665312 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
@@ -17,12 +17,56 @@
package org.apache.tomcat.util.http.fileupload;
import java.io.IOException;
+import java.util.List;
+
+import
org.apache.tomcat.util.http.fileupload.impl.FileSizeLimitExceededException;
+import org.apache.tomcat.util.http.fileupload.impl.SizeLimitExceededException;
/**
* An iterator, as returned by
* {@link FileUploadBase#getItemIterator(RequestContext)}.
*/
public interface FileItemIterator {
+/** Returns the maximum size of a single file. An {@link
FileSizeLimitExceededException}
+ * will be thrown, if there is an uploaded file, which is exceeding this
value.
+ * By default, this value will be copied from the {@link
FileUploadBase#getFileSizeMax()
+ * FileUploadBase} object, however, the user may replace the default value
with a
+ * request specific value by invoking {@link #setFileSizeMax(long)} on
this object.
+ * @return The maximum size of a single, uploaded file. The value -1
indicates "unlimited".
+ */
+public long getFileSizeMax();
+
+/** Sets the maximum size of a single file. An {@link
FileSizeLimitExceededException}
+ *
[tomcat] 07/09: Remove unused code reported by SpotBugs
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 86dcf493500011998328ad949ee51d90919ad8e5
Author: Mark Thomas
AuthorDate: Fri Dec 6 16:49:52 2019 +
Remove unused code reported by SpotBugs
---
.../tomcat/util/http/fileupload/impl/FileItemStreamImpl.java | 9 -
1 file changed, 9 deletions(-)
diff --git
a/java/org/apache/tomcat/util/http/fileupload/impl/FileItemStreamImpl.java
b/java/org/apache/tomcat/util/http/fileupload/impl/FileItemStreamImpl.java
index 58c0089..40dadf4 100644
--- a/java/org/apache/tomcat/util/http/fileupload/impl/FileItemStreamImpl.java
+++ b/java/org/apache/tomcat/util/http/fileupload/impl/FileItemStreamImpl.java
@@ -61,11 +61,6 @@ public class FileItemStreamImpl implements FileItemStream {
private final InputStream stream;
/**
- * Whether the file item was already opened.
- */
-private boolean opened;
-
-/**
* The headers, if any.
*/
private FileItemHeaders headers;
@@ -180,10 +175,6 @@ public class FileItemStreamImpl implements FileItemStream {
*/
@Override
public InputStream openStream() throws IOException {
-if (opened) {
-throw new IllegalStateException(
-"The stream was already opened.");
-}
if (((Closeable) stream).isClosed()) {
throw new FileItemStream.ItemSkippedException();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (dff6e16 -> 0499c74)
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 dff6e16 Fix missing loose-ends when re-packaging SSI into a separate
library.
new 07f80e3 Merge in BCEL changes to ff6941e (2019-12-06, 6.4.2-dev)
new 98ef428 Merge in Codec changes to 9637dd4 (2019-12-06, 1.14-SNAPSHOT)
new ee7666a Merge in FileUpload changes to 2317552 (2019-12-06,
2.0-SNAPSHOT)
new 6ad6bfc Merge in Pool 2 changes to 6092f92 (2019-12-06,
2.8.0-SNAPSHOT)
new a5e3a52 Merge in DBCP 2 changes 2 a363390 (2019-12-06, 2.7.1-SNAPSHOT)
new 5cad86d Fix Findbugs warnings
new 86dcf49 Remove unused code reported by SpotBugs
new 77401cb Fix FileUpload
new 0499c74 Fix codec
The 9 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:
MERGE.txt | 20 +-
java/org/apache/catalina/connector/Request.java| 6 +-
.../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 92 +--
.../dbcp/pool2/BaseKeyedPooledObjectFactory.java | 2 +
.../apache/tomcat/dbcp/pool2/BaseObjectPool.java | 1 +
.../apache/tomcat/dbcp/pool2/KeyedObjectPool.java | 227 ---
java/org/apache/tomcat/dbcp/pool2/ObjectPool.java | 138 ++--
java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 26 +-
.../org/apache/tomcat/dbcp/pool2/PooledObject.java | 3 +-
.../dbcp/pool2/impl/DefaultEvictionPolicy.java | 2 +
.../tomcat/dbcp/pool2/impl/EvictionConfig.java | 1 +
.../tomcat/dbcp/pool2/impl/EvictionTimer.java | 9 +-
.../dbcp/pool2/impl/GenericKeyedObjectPool.java| 25 +-
.../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 29 +-
.../pool2/impl/InterruptibleReentrantLock.java | 1 +
.../dbcp/pool2/impl/LinkedBlockingDeque.java | 4 +
.../dbcp/pool2/impl/SecurityManagerCallStack.java | 7 +-
.../dbcp/pool2/impl/SoftReferenceObjectPool.java | 3 +
java/org/apache/tomcat/util/bcel/Const.java| 14 +-
.../tomcat/util/bcel/classfile/ConstantClass.java | 2 +-
.../tomcat/util/bcel/classfile/ConstantDouble.java | 2 +-
.../tomcat/util/bcel/classfile/ConstantFloat.java | 2 +-
.../util/bcel/classfile/ConstantInteger.java | 2 +-
.../tomcat/util/bcel/classfile/ConstantLong.java | 2 +-
.../apache/tomcat/util/codec/binary/Base64.java| 28 +-
.../tomcat/util/codec/binary/BaseNCodec.java | 100 ++-
.../util/http/fileupload/FileItemIterator.java | 49 +-
.../util/http/fileupload/FileUploadBase.java | 702 +
.../util/http/fileupload/MultipartStream.java | 10 +-
.../util/http/fileupload/disk/DiskFileItem.java| 3 +-
.../http/fileupload/impl/FileItemIteratorImpl.java | 339 ++
.../http/fileupload/impl/FileItemStreamImpl.java | 213 +++
.../impl/FileSizeLimitExceededException.java | 94 +++
.../fileupload/impl/FileUploadIOException.java | 63 ++
.../fileupload/impl/IOFileUploadException.java | 62 ++
.../impl/InvalidContentTypeException.java | 62 ++
.../util/http/fileupload/impl/SizeException.java | 75 +++
.../SizeLimitExceededException.java} | 81 +--
.../authenticator/TestBasicAuthParser.java | 15 +-
.../org/apache/catalina/session/FileStoreTest.java | 12 +-
webapps/docs/changelog.xml | 20 +
41 files changed, 1508 insertions(+), 1040 deletions(-)
create mode 100644
java/org/apache/tomcat/util/http/fileupload/impl/FileItemIteratorImpl.java
create mode 100644
java/org/apache/tomcat/util/http/fileupload/impl/FileItemStreamImpl.java
create mode 100644
java/org/apache/tomcat/util/http/fileupload/impl/FileSizeLimitExceededException.java
create mode 100644
java/org/apache/tomcat/util/http/fileupload/impl/FileUploadIOException.java
create mode 100644
java/org/apache/tomcat/util/http/fileupload/impl/IOFileUploadException.java
create mode 100644
java/org/apache/tomcat/util/http/fileupload/impl/InvalidContentTypeException.java
create mode 100644
java/org/apache/tomcat/util/http/fileupload/impl/SizeException.java
copy
java/org/apache/tomcat/util/http/fileupload/{util/mime/ParseException.java =>
impl/SizeLimitExceededException.java} (51%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/09: Merge in BCEL changes to ff6941e (2019-12-06, 6.4.2-dev)
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 07f80e3ec4325005b189fe1b9f2cafd122582c86
Author: Mark Thomas
AuthorDate: Fri Dec 6 14:18:15 2019 +
Merge in BCEL changes to ff6941e (2019-12-06, 6.4.2-dev)
---
MERGE.txt | 2 +-
java/org/apache/tomcat/util/bcel/Const.java| 14 --
.../apache/tomcat/util/bcel/classfile/ConstantClass.java | 2 +-
.../apache/tomcat/util/bcel/classfile/ConstantDouble.java | 2 +-
.../apache/tomcat/util/bcel/classfile/ConstantFloat.java | 2 +-
.../apache/tomcat/util/bcel/classfile/ConstantInteger.java | 2 +-
.../apache/tomcat/util/bcel/classfile/ConstantLong.java| 2 +-
webapps/docs/changelog.xml | 4
8 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index 18da378..f4fb1f8 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -36,7 +36,7 @@ BCEL
Sub-tree:
src/main/java/org/apache/bcel
The SHA1 ID for the most recent commit to be merged to Tomcat is:
-4b760bb53b57b704006a0a33f7ec187b7e7f5ebc (2019-08-01)
+ff6941e4491c68f6eaf270ff03c1bc1e554c7b42 (2019-12-06)
Codec
-
diff --git a/java/org/apache/tomcat/util/bcel/Const.java
b/java/org/apache/tomcat/util/bcel/Const.java
index 402b304..bfaeb42 100644
--- a/java/org/apache/tomcat/util/bcel/Const.java
+++ b/java/org/apache/tomcat/util/bcel/Const.java
@@ -23,12 +23,14 @@ package org.apache.tomcat.util.bcel;
public final class Const {
/** One of the access flags for fields, methods, or classes.
- * @see http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.5";>
- * Flag definitions for Fields in the Java Virtual Machine Specification
(Java SE 8 Edition).
- * @see http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.6";>
- * Flag definitions for Methods in the Java Virtual Machine Specification
(Java SE 8 Edition).
- * @see http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.6-300-D.1-D.1";>
- * Flag definitions for Classes in the Java Virtual Machine Specification
(Java SE 8 Edition).
+ * @see http://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.1-200-E.1";>
+ * Flag definitions for Classes in the Java Virtual Machine Specification
(Java SE 9 Edition).
+ * @see http://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.5";>
+ * Flag definitions for Fields in the Java Virtual Machine Specification
(Java SE 9 Edition).
+ * @see http://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.6";>
+ * Flag definitions for Methods in the Java Virtual Machine Specification
(Java SE 9 Edition).
+ * @see http://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.7.6-300-D.1-D.1";>
+ * Flag definitions for Inner Classes in the Java Virtual Machine
Specification (Java SE 9 Edition).
*/
public static final short ACC_FINAL = 0x0010;
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
index 86e7262..4bce5cc 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
@@ -48,7 +48,7 @@ public final class ConstantClass extends Constant {
/**
* @return Name index in constant pool of class name.
*/
-public final int getNameIndex() {
+public int getNameIndex() {
return name_index;
}
}
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
index 5ba7fcc..1152dbd 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
@@ -48,7 +48,7 @@ public final class ConstantDouble extends Constant {
/**
* @return data, i.e., 8 bytes.
*/
-public final double getBytes() {
+public double getBytes() {
return bytes;
}
}
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
index f372bb9..1fd2450 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
@@ -48,7 +48,7 @@ public final class ConstantFloat extends Constant {
/**
* @return data, i.e., 4 bytes.
*/
-public final float getBytes() {
+public float getBytes() {
return bytes;
}
}
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
index f2c1ba8..0d95983 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/Const
[tomcat] 02/09: Merge in Codec changes to 9637dd4 (2019-12-06, 1.14-SNAPSHOT)
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 98ef428f5c5b5524582c6c440f16a7e3e9562ba8
Author: Mark Thomas
AuthorDate: Fri Dec 6 14:29:01 2019 +
Merge in Codec changes to 9637dd4 (2019-12-06, 1.14-SNAPSHOT)
---
MERGE.txt | 2 +-
.../apache/tomcat/util/codec/binary/Base64.java| 28 +++---
.../tomcat/util/codec/binary/BaseNCodec.java | 100 +
webapps/docs/changelog.xml | 4 +
4 files changed, 107 insertions(+), 27 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index f4fb1f8..b4bd507 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -43,7 +43,7 @@ Codec
Sub-tree:
src/main/java/org/apache/commons/codec
The SHA1 ID for the most recent commit to be merged to Tomcat is:
-3ebef4ad92e31697fb52ca7cc71904c68654c2c8 (2019-08-01)
+9637dd44fa0e2d5a6ddb45791e3cd78298842d95 (2019-12-06)
Note: Only classes required for Base64 encoding/decoding. The rest are removed.
FileUpload
diff --git a/java/org/apache/tomcat/util/codec/binary/Base64.java
b/java/org/apache/tomcat/util/codec/binary/Base64.java
index da1487f..ab89854 100644
--- a/java/org/apache/tomcat/util/codec/binary/Base64.java
+++ b/java/org/apache/tomcat/util/codec/binary/Base64.java
@@ -139,6 +139,10 @@ public class Base64 extends BaseNCodec {
*/
/** Mask used to extract 6 bits, used when encoding */
private static final int MASK_6BITS = 0x3f;
+/** Mask used to extract 4 bits, used when decoding final trailing
character. */
+private static final int MASK_4BITS = 0xf;
+/** Mask used to extract 2 bits, used when decoding final trailing
character. */
+private static final int MASK_2BITS = 0x3;
// The static final fields above are used for the original static byte[]
methods on Base64.
// The private member fields below are used with the new streaming
approach, which requires
@@ -483,12 +487,12 @@ public class Base64 extends BaseNCodec {
// TODO not currently tested; perhaps it is impossible?
break;
case 2 : // 12 bits = 8 + 4
-validateCharacter(4, context);
+validateCharacter(MASK_4BITS, context);
context.ibitWorkArea = context.ibitWorkArea >> 4; // dump
the extra 4 bits
buffer[context.pos++] = (byte) ((context.ibitWorkArea) &
MASK_8BITS);
break;
case 3 : // 18 bits = 8 + 8 + 2
-validateCharacter(2, context);
+validateCharacter(MASK_2BITS, context);
context.ibitWorkArea = context.ibitWorkArea >> 2; // dump
2 bits
buffer[context.pos++] = (byte) ((context.ibitWorkArea >>
8) & MASK_8BITS);
buffer[context.pos++] = (byte) ((context.ibitWorkArea) &
MASK_8BITS);
@@ -792,20 +796,22 @@ public class Base64 extends BaseNCodec {
/**
- *
- * Validates whether the character is possible in the context of the set
of possible base 64 values.
- *
+ * Validates whether decoding the final trailing character is possible in
the context
+ * of the set of possible base 64 values.
+ *
+ * The character is valid if the lower bits within the provided mask
are zero. This
+ * is used to test the final trailing base-64 digit is zero in the bits
that will be discarded.
*
- * @param numBitsToDrop number of least significant bits to check
+ * @param emptyBitsMask The mask of the lower bits that should be empty
* @param context the context to be used
*
* @throws IllegalArgumentException if the bits being checked contain any
non-zero value
*/
-private long validateCharacter(final int numBitsToDrop, final Context
context) {
-if ((context.ibitWorkArea & numBitsToDrop) != 0) {
-throw new IllegalArgumentException(
-"Last encoded character (before the paddings if any) is a valid
base 64 alphabet but not a possible value");
+private static void validateCharacter(final int emptyBitsMask, final
Context context) {
+if ((context.ibitWorkArea & emptyBitsMask) != 0) {
+throw new IllegalArgumentException(
+"Last encoded character (before the paddings if any) is a
valid base 64 alphabet but not a possible value. " +
+"Expected the discarded bits to be zero.");
}
-return context.ibitWorkArea >> numBitsToDrop;
}
}
diff --git a/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
b/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
index d24b43c..83e81ba 100644
--- a/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
+++ b/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
@@ -136,6 +136,18 @@ public abstract class BaseNCodec {
[tomcat] 05/09: Merge in DBCP 2 changes 2 a363390 (2019-12-06, 2.7.1-SNAPSHOT)
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 a5e3a52a838dff0e5737d22da8bad2f09f64cd8e
Author: Mark Thomas
AuthorDate: Fri Dec 6 16:34:07 2019 +
Merge in DBCP 2 changes 2 a363390 (2019-12-06, 2.7.1-SNAPSHOT)
---
MERGE.txt | 2 +-
.../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 92 +++---
webapps/docs/changelog.xml | 4 +
3 files changed, 51 insertions(+), 47 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index 7daec6d..5551fb2 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -69,4 +69,4 @@ Sub-tree
src/main/java/org/apache/commons/dbcp2
src/main/resources/org/apache/commons/dbcp2
The SHA1 ID for the most recent commit to be merged to Tomcat is:
-4813b7f5456c1f4fecc4f701ac731a71f57db249 (2019-08-09)
+a363906bf7a039f79c07fa3c68b082a69ae035d7 (2019-12-06)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
b/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
index 3969480..671e3e6 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
@@ -58,45 +58,6 @@ public class AbandonedTrace implements TrackedUse {
}
/**
- * Initializes abandoned tracing for this object.
- *
- * @param parent
- *AbandonedTrace parent object.
- */
-private void init(final AbandonedTrace parent) {
-if (parent != null) {
-parent.addTrace(this);
-}
-}
-
-/**
- * Gets the last time this object was used in milliseconds.
- *
- * @return long time in milliseconds.
- */
-@Override
-public long getLastUsed() {
-return lastUsedMillis;
-}
-
-/**
- * Sets the time this object was last used to the current time in
milliseconds.
- */
-protected void setLastUsed() {
-lastUsedMillis = System.currentTimeMillis();
-}
-
-/**
- * Sets the time in milliseconds this object was last used.
- *
- * @param lastUsedMillis
- *time in milliseconds.
- */
-protected void setLastUsed(final long lastUsedMillis) {
-this.lastUsedMillis = lastUsedMillis;
-}
-
-/**
* Adds an object to the list of objects being traced.
*
* @param trace
@@ -119,6 +80,16 @@ public class AbandonedTrace implements TrackedUse {
}
/**
+ * Gets the last time this object was used in milliseconds.
+ *
+ * @return long time in milliseconds.
+ */
+@Override
+public long getLastUsed() {
+return lastUsedMillis;
+}
+
+/**
* Gets a list of objects being traced by this object.
*
* @return List of objects.
@@ -145,6 +116,30 @@ public class AbandonedTrace implements TrackedUse {
}
/**
+ * Initializes abandoned tracing for this object.
+ *
+ * @param parent
+ *AbandonedTrace parent object.
+ */
+private void init(final AbandonedTrace parent) {
+if (parent != null) {
+parent.addTrace(this);
+}
+}
+
+/**
+ * Removes this object the source object is tracing.
+ *
+ * @param source The object tracing
+ * @since 2.7.0
+ */
+protected void removeThisTrace(final Object source) {
+if (source instanceof AbandonedTrace) {
+AbandonedTrace.class.cast(source).removeTrace(this);
+}
+}
+
+/**
* Removes a child object this object is tracing.
*
* @param trace
@@ -167,14 +162,19 @@ public class AbandonedTrace implements TrackedUse {
}
/**
- * Removes this object the source object is tracing.
+ * Sets the time this object was last used to the current time in
milliseconds.
+ */
+protected void setLastUsed() {
+lastUsedMillis = System.currentTimeMillis();
+}
+
+/**
+ * Sets the time in milliseconds this object was last used.
*
- * @param source The object tracing
- * @since 2.7.0
+ * @param lastUsedMillis
+ *time in milliseconds.
*/
-protected void removeThisTrace(final Object source) {
-if (source instanceof AbandonedTrace) {
-AbandonedTrace.class.cast(source).removeTrace(this);
-}
+protected void setLastUsed(final long lastUsedMillis) {
+this.lastUsedMillis = lastUsedMillis;
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c1d9427..d5a71ba 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -220,6 +220,10 @@
Update the internal fork of Apache Commons Pool 2 to 6092f92
(2019-12-06,
2.8.0-SNAPSHOT). Clean-up and minor refactoring. (markt)
+
+Update the internal fork of Apache Commons DBCP 2 to a36390
(2019-12-06,
+2.7.1-SNAPSHOT). Mino
[tomcat] 08/09: Fix FileUpload
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 77401cbbe2306e96295a9dfe4be88f6466fe0852
Author: Mark Thomas
AuthorDate: Fri Dec 6 18:59:59 2019 +
Fix FileUpload
---
java/org/apache/catalina/connector/Request.java | 4 ++--
java/org/apache/tomcat/util/http/fileupload/impl/SizeException.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 3c04c1c..7cd30f7 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -108,7 +108,7 @@ import org.apache.tomcat.util.http.fileupload.FileItem;
import org.apache.tomcat.util.http.fileupload.FileUploadException;
import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory;
import org.apache.tomcat.util.http.fileupload.impl.InvalidContentTypeException;
-import org.apache.tomcat.util.http.fileupload.impl.SizeLimitExceededException;
+import org.apache.tomcat.util.http.fileupload.impl.SizeException;
import org.apache.tomcat.util.http.fileupload.servlet.ServletFileUpload;
import org.apache.tomcat.util.http.fileupload.servlet.ServletRequestContext;
import org.apache.tomcat.util.http.parser.AcceptLanguage;
@@ -2906,7 +2906,7 @@ public class Request implements HttpServletRequest {
} catch (InvalidContentTypeException e) {
parameters.setParseFailedReason(FailReason.INVALID_CONTENT_TYPE);
partsParseException = new ServletException(e);
-} catch (SizeLimitExceededException e) {
+} catch (SizeException e) {
parameters.setParseFailedReason(FailReason.POST_TOO_LARGE);
checkSwallowInput();
partsParseException = new IllegalStateException(e);
diff --git
a/java/org/apache/tomcat/util/http/fileupload/impl/SizeException.java
b/java/org/apache/tomcat/util/http/fileupload/impl/SizeException.java
index c37d644..09429ad 100644
--- a/java/org/apache/tomcat/util/http/fileupload/impl/SizeException.java
+++ b/java/org/apache/tomcat/util/http/fileupload/impl/SizeException.java
@@ -22,7 +22,7 @@ import
org.apache.tomcat.util.http.fileupload.FileUploadException;
* This exception is thrown, if a requests permitted size
* is exceeded.
*/
-abstract class SizeException extends FileUploadException {
+public abstract class SizeException extends FileUploadException {
/**
* Serial version UID, being used, if serialized.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 09/09: Fix codec
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 0499c7455de5cbdd952cb9cc56fb00ee2ce50192
Author: Mark Thomas
AuthorDate: Fri Dec 6 19:00:06 2019 +
Fix codec
---
.../catalina/authenticator/TestBasicAuthParser.java | 15 ++-
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
b/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
index 627a59a..93e874d 100644
--- a/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
+++ b/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
@@ -362,26 +362,23 @@ public class TestBasicAuthParser {
/*
* invalid base64 string tests
*
- * Refer to RFC2045 section 6.8.
+ * Refer to
+ * - RFC 7617 (Basic Auth)
+ * - RFC 4648 (base 64)
*/
/*
- * non-trailing "=" should trigger premature termination of the
- * decoder, returning a truncated string that will eventually
- * result in an authentication Assert.failure.
+ * non-trailing "=" is illegal and will be rejected by the parser
*/
-@Test
+@Test(expected = IllegalArgumentException.class)
public void testBadBase64InlineEquals() throws Exception {
final String BASE64_CRIB = "dXNlcmlkOnNlY3J=dAo=";
-final String TRUNCATED_PWD = "secr";
final BasicAuthHeader AUTH_HEADER =
new BasicAuthHeader(NICE_METHOD, BASE64_CRIB);
+@SuppressWarnings("unused") // Exception will be thrown.
BasicAuthenticator.BasicCredentials credentials =
new BasicAuthenticator.BasicCredentials(
AUTH_HEADER.getHeader(), StandardCharsets.UTF_8, true);
-Assert.assertEquals(USER_NAME, credentials.getUsername());
-Assert.assertNotSame(PASSWORD, credentials.getPassword());
-Assert.assertEquals(TRUNCATED_PWD, credentials.getPassword());
}
/*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/09: Fix Findbugs warnings
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 5cad86d7b3b564c4058ef9b72f7d321d332fe9ae
Author: Mark Thomas
AuthorDate: Fri Dec 6 16:42:32 2019 +
Fix Findbugs warnings
---
test/org/apache/catalina/session/FileStoreTest.java | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/test/org/apache/catalina/session/FileStoreTest.java
b/test/org/apache/catalina/session/FileStoreTest.java
index f2555de..c827562 100644
--- a/test/org/apache/catalina/session/FileStoreTest.java
+++ b/test/org/apache/catalina/session/FileStoreTest.java
@@ -60,9 +60,15 @@ public class FileStoreTest {
@Before
public void beforeEachTest() throws IOException {
fileStore.setDirectory(SESS_TEMPPATH);
-dir.mkdir();
-file1.createNewFile();
-file2.createNewFile();
+if (!dir.mkdir()) {
+Assert.fail();
+}
+if (!file1.createNewFile()) {
+Assert.fail();
+}
+if (!file2.createNewFile()) {
+Assert.fail();
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch master updated: Move SSI component into separate JAR file.
On 06/12/2019 17:48, Christopher Schultz wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > Mark, > > On 12/6/19 12:12, Mark Thomas wrote: >> On 06/12/2019 16:52, Christopher Schultz wrote: >> >> >> >>> Let me know if that's all good. >> >> Thanks. >> >> Looks good to me from a quick scan. >> >> I'll let the CI system run as it does a Maven deploy of a snapshot >> so we should be able to use that to check the Maven artefacts. >> >> Scratch that. The CI has already run. Looks like it built. Woot! >> >> Only query is the POM correct for dependencies? The OSGI >> import/export package info BND added to the manifest doesn't agree >> with the POM. > > Which parts? I'm not sure what I'm looking for. > > tomcat-ssi.pom contains the wrong -- I copied from > tomcat-tribes and forgot to change that, so I'll fix that. Thanks. I didn;'t even see that. > BND contains: > > Bundle-Name: tomcat-ssi > Bundle-SymbolicName: org.apache.tomcat-ssi > Bundle-Version: @VERSION@ > Export-Package: \ > org.apache.catalina.ssi More stuff gets added to that during the build and placed in the manifest. > POM contains: > > tomcat-ssi > > Oh. My POM looks like it's missing a bunch of things such as a > dependency on Tomcat itself. I believe we need: > > tomcat-catalina > tomcat-util > tomcat-coyote > > (I'd like to work to remove that last one soon if possible.) > > Just add those to the POM? Correct. There is a dependency on the servlet API too but we'll get that via the deps you've already listed. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch master updated: Move SSI component into separate JAR file.
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Mark, On 12/6/19 12:12, Mark Thomas wrote: > On 06/12/2019 16:52, Christopher Schultz wrote: > > > >> Let me know if that's all good. > > Thanks. > > Looks good to me from a quick scan. > > I'll let the CI system run as it does a Maven deploy of a snapshot > so we should be able to use that to check the Maven artefacts. > > Scratch that. The CI has already run. Looks like it built. Woot! > > Only query is the POM correct for dependencies? The OSGI > import/export package info BND added to the manifest doesn't agree > with the POM. Which parts? I'm not sure what I'm looking for. tomcat-ssi.pom contains the wrong -- I copied from tomcat-tribes and forgot to change that, so I'll fix that. BND contains: Bundle-Name: tomcat-ssi Bundle-SymbolicName: org.apache.tomcat-ssi Bundle-Version: @VERSION@ Export-Package: \ org.apache.catalina.ssi POM contains: tomcat-ssi Oh. My POM looks like it's missing a bunch of things such as a dependency on Tomcat itself. I believe we need: tomcat-catalina tomcat-util tomcat-coyote (I'd like to work to remove that last one soon if possible.) Just add those to the POM? - -chris -BEGIN PGP SIGNATURE- Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl3qlIEACgkQHPApP6U8 pFjOiBAAyd8FOqWSPAiXAnaz3p28MUNFpMJsq5TH9QIBz8DHJChXDbs5QjjsKMT+ hlNsqfYF28wmy1JVBPuDrbN/XDCkWnm84cDIqNcvrUEgngWjEwoz8zbDYT/bQgBz RqAEKG8Oh5nWsaO4qjXSFltyrp8IG2p+m+RaoOx9l8vhG6jsZYaRY+DJfgBj6l3m h4rLOmvQ2XTDpd3RWAeM+3+UoqZ7e74SQbtCuEAgC9e1lAyU65yq3o9hivoUeuHi xrMptzE+ldrcccLJHqOhvXYovMxLOFs2Rv/iuz3cQ7qJoFrM5MNJAgEg6IMEF7R2 hZEivFNsjwtF/EfBXqsyy+apD6TyE7sG72hA7Sl9xMud01Gb98FU8PJjEWGZ4BDy t97yAs02g18L6Dnd+PF4MNsCMwevbB/2Jvwn3rW3U3vQbEk2km7EaB2eUb6s2mRF 4pee3iZUqJ3fhpVRNpgQkIurtWxlrBHNyLTgj94Onx+53oUwcvFFwh6peq3FIuMr JggvXSarEASMr0iLMsMLAsuMN2a1cPnVa9rHCBgnZMHh4YHA+E5meOXGueDbr7Nr PnCEMvm17xQhhZNqGBsEOKniV39dtxd7i2MoS5RjEQrxTlH9Dy558gIsLthRDfN4 11D5LVD5APKBk8A598Ts5nD5U6wdoD1IJnI39S72nDsiW6Gh9HY= =HkYW -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch master updated: Move SSI component into separate JAR file.
On 06/12/2019 16:52, Christopher Schultz wrote: > Let me know if that's all good. Thanks. Looks good to me from a quick scan. I'll let the CI system run as it does a Maven deploy of a snapshot so we should be able to use that to check the Maven artefacts. Scratch that. The CI has already run. Looks like it built. Woot! Only query is the POM correct for dependencies? The OSGI import/export package info BND added to the manifest doesn't agree with the POM. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch master updated: Move SSI component into separate JAR file.
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Mark, On 12/5/19 18:51, Mark Thomas wrote: > On 05/12/2019 23:03, Christopher Schultz wrote: >> Mark, >> >> On 12/5/19 11:46, Mark Thomas wrote: >>> On 05/12/2019 16:40, schu...@apache.org wrote: This is an automated email from the ASF dual-hosted git repository. schultz 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 3554723 Move SSI component into separate JAR file. 3554723 is described below commit 3554723117122fb520c72b6c4a828d5f146d8c40 Author: Christopher Schultz AuthorDate: Thu Dec 5 11:39:36 2019 -0500 Move SSI component into separate JAR file. --- build.xml | 18 ++ res/bnd/catalina-ssi.jar.tmp.bnd | 19 +++ >> >>> You need a pom in res/maven as well. >> >> Okay, thanks. >> >> Time to dive into what that will take as well. >> >> So, like res/maven/tomcat-ssi.pom? How do I wire that into >> whatever process kicks off e.g. tomcat-tribes.pom? In >> mvn-pub.xml? Something like this? >> >> > jarFileName="catalina-ssi.jar" >> srcJarFileName="catalina-ssi-src.jar"/> >> >> ... > jarFileName="catalina-ssi.jar" >> srcJarFileName="catalina-ssi-src.jar"/> > > Looks about right. Done. > You'll also need to add to: - list of JARs in > conf/catalina.properties Done. > - list of JARs in org/apache/catalina/startup/catalina.properties > (one of those may be copied from the other - I forget) This is the copy. > - webapps/docs/class-loader-howto.xml Done. > - RELEASE-NOTES Done. Also, changelog :) Let me know if that's all good. Thanks, - -chris -BEGIN PGP SIGNATURE- Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl3qhzIACgkQHPApP6U8 pFiY8A/9HxOpy7TCs+Y/nJBNuOArnR4dByXJ1u0iFe8OfFvhgGQ47GMfs4iksZKB CV5tNi1YwB7R23QVA7cYfYr7eXBhrgQuZ4hWfyqNgg6Qq05lz+TYiW2EOPPv+CeI l29kWo0R+TvdlRj2O/VlKphtpvYzUajkpSmN6PjeSL1Nm5ZCF2VNzF+emEK7PfLN CurSjcVGbzOWOlyzLSO0BIsa/xkoRGd3G8NLWHzqn3CnKGmbimOaDv5MP4seqN29 BFFombeU0a+hKfDpNTdXsUf7fo2Nox+bCcuIVtnrd2dGK59FgOl/lIzT0waajDdk GdKPySgAWBOzG0W6KcbGUt1odxuJcI/JryjcQMXVBSbB6YNVShWFOJfTZ7Cg0EUC KIOm6oUy2CGNsmFG0FTyxLZRfy4IyW4xJsCq3ainwRBMbE5xmCM87KTozii6+uAY HiBkDL+y52/6CzZwPeLREbG0uiSYd/GKaJy0J5+0hsCOxiznSKZ5w6fSIyv3hNoX mqWcMmK6Amxyg+uicODPrB1wEVFAWF3PcsYureum9h1SwYjFB7pyT/MDgKW5VpkD qi+X/Vb3XJ6kS2eWHGCM8c9rM/GbBOw2zah5AuYaPa2cnb+sa8Gy7W045xDqv9lq j+DWJ0ysf9CFyERneu3mdTEIGzQb1lQZ/2xNjYHM9vwMVSDWfdI= =T2Uy -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix missing loose-ends when re-packaging SSI into a separate library.
This is an automated email from the ASF dual-hosted git repository. schultz 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 dff6e16 Fix missing loose-ends when re-packaging SSI into a separate library. dff6e16 is described below commit dff6e167db57804ed9c93e7475d42a3d93443b0e Author: Christopher Schultz AuthorDate: Fri Dec 6 11:51:12 2019 -0500 Fix missing loose-ends when re-packaging SSI into a separate library. --- RELEASE-NOTES | 1 + conf/catalina.properties| 1 + res/maven/mvn-pub.xml | 8 +++ res/maven/tomcat-ssi.pom| 43 + webapps/docs/changelog.xml | 3 +++ webapps/docs/class-loader-howto.xml | 1 + 6 files changed, 57 insertions(+) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 825889a..c4e88e1 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -70,6 +70,7 @@ for use by web applications (by placing them in "lib"): * catalina.jar (Tomcat Catalina implementation) * catalina-ant.jar (Tomcat Catalina Ant tasks) * catalina-ha.jar (High availability package) +* catalina-ssi.jar (Server-side Includes module) * catalina-storeconfig.jar (Generation of XML configuration from current state) * catalina-tribes.jar (Group communication) * ecj-@JDT_VERSION@.jar (Eclipse JDT Java compiler) diff --git a/conf/catalina.properties b/conf/catalina.properties index 289f697..cff2aa2 100644 --- a/conf/catalina.properties +++ b/conf/catalina.properties @@ -115,6 +115,7 @@ aspectj*.jar,\ bootstrap.jar,\ catalina-ant.jar,\ catalina-ha.jar,\ +catalina-ssi.jar,\ catalina-storeconfig.jar,\ catalina-tribes.jar,\ catalina.jar,\ diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml index 467165f..fee8d8e 100644 --- a/res/maven/mvn-pub.xml +++ b/res/maven/mvn-pub.xml @@ -291,6 +291,10 @@ jarFileName="catalina-tribes.jar" srcJarFileName="catalina-tribes-src.jar"/> + + @@ -385,6 +389,10 @@ jarFileName="catalina-tribes.jar" srcJarFileName="catalina-tribes-src.jar"/> + + diff --git a/res/maven/tomcat-ssi.pom b/res/maven/tomcat-ssi.pom new file mode 100644 index 000..5db29d2 --- /dev/null +++ b/res/maven/tomcat-ssi.pom @@ -0,0 +1,43 @@ + + +http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd";> + 4.0.0 + org.apache.tomcat + tomcat-ssi + @MAVEN.DEPLOY.VERSION@ + Tomcat Group Communication Package + https://tomcat.apache.org/ + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + org.apache.tomcat + tomcat-juli + @MAVEN.DEPLOY.VERSION@ + compile + + + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 238f90f..91dbce6 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -99,6 +99,9 @@ and refactor loops in FileStore to use the ForEach style. Pull request provided by Govinda Sakhare. (markt) + +Moved server-side include (SSI) module into a separate JAR library. (schultz) + diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml index 9054593..eecbc01 100644 --- a/webapps/docs/class-loader-howto.xml +++ b/webapps/docs/class-loader-howto.xml @@ -135,6 +135,7 @@ loaders as it is initialized: container portion of Tomcat. catalina-ant.jar — Tomcat Catalina Ant tasks. catalina-ha.jar — High availability package. +catalina-ssi.jar — Server-side Includes module. catalina-storeconfig.jar — Generation of XML configuration files from current state catalina-tribes.jar — Group communication package. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63982] CombinedRealm makes assumptions about principal implementation
https://bz.apache.org/bugzilla/show_bug.cgi?id=63982 Michael Osipov changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED CC||micha...@apache.org --- Comment #7 from Michael Osipov --- Fixed in: - master for 9.0.30 onwards - 8.5.x for 8.5.50 onwards - 7.0.x for 7.0.99 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 7.0.x updated: BZ 63982: CombinedRealm makes assumptions about principal implementation
This is an automated email from the ASF dual-hosted git repository.
michaelo 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 1d43f40 BZ 63982: CombinedRealm makes assumptions about principal
implementation
1d43f40 is described below
commit 1d43f40f04adb729223f4b4d3d2d8c8fd82b0c6e
Author: Michael Osipov
AuthorDate: Fri Dec 6 13:49:35 2019 +0100
BZ 63982: CombinedRealm makes assumptions about principal implementation
---
java/org/apache/catalina/realm/CombinedRealm.java | 14 ++
webapps/docs/changelog.xml| 4
2 files changed, 18 insertions(+)
diff --git a/java/org/apache/catalina/realm/CombinedRealm.java
b/java/org/apache/catalina/realm/CombinedRealm.java
index 026af6d..f6a8a3d 100644
--- a/java/org/apache/catalina/realm/CombinedRealm.java
+++ b/java/org/apache/catalina/realm/CombinedRealm.java
@@ -30,6 +30,7 @@ import org.apache.catalina.GSSRealm;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Realm;
+import org.apache.catalina.Wrapper;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.ietf.jgss.GSSContext;
@@ -412,6 +413,19 @@ public class CombinedRealm extends RealmBase {
return authenticatedUser;
}
+/**
+ * {@inheritDoc}
+ */
+@Override
+public boolean hasRole(Wrapper wrapper, Principal principal, String role) {
+for (Realm realm : realms) {
+if (realm.hasRole(wrapper, principal, role)) {
+return true;
+}
+}
+return false;
+}
+
@Override
protected String getName() {
return name;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 50fefa6..b09bd6c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -85,6 +85,10 @@
TestAsyncContextStateChanges test that caused it
to hang indefinitely. (markt)
+
+63982: CombinedRealm makes assumptions about principal
implementation
+(michaelo)
+
Add a unit test for the session FileStore implementation
and refactor loops in FileStore to use the ForEach style.
-
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 63982: CombinedRealm makes assumptions about principal implementation
This is an automated email from the ASF dual-hosted git repository.
michaelo 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 98fd719 BZ 63982: CombinedRealm makes assumptions about principal
implementation
98fd719 is described below
commit 98fd719f1902910ca0f7c7d73223350e32056fe8
Author: Michael Osipov
AuthorDate: Fri Dec 6 13:49:35 2019 +0100
BZ 63982: CombinedRealm makes assumptions about principal implementation
---
java/org/apache/catalina/realm/CombinedRealm.java | 14 ++
webapps/docs/changelog.xml| 4
2 files changed, 18 insertions(+)
diff --git a/java/org/apache/catalina/realm/CombinedRealm.java
b/java/org/apache/catalina/realm/CombinedRealm.java
index 27f68cc..03665e4 100644
--- a/java/org/apache/catalina/realm/CombinedRealm.java
+++ b/java/org/apache/catalina/realm/CombinedRealm.java
@@ -29,6 +29,7 @@ import org.apache.catalina.Container;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Realm;
+import org.apache.catalina.Wrapper;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.ietf.jgss.GSSContext;
@@ -431,6 +432,19 @@ public class CombinedRealm extends RealmBase {
return authenticatedUser;
}
+/**
+ * {@inheritDoc}
+ */
+@Override
+public boolean hasRole(Wrapper wrapper, Principal principal, String role) {
+for (Realm realm : realms) {
+if (realm.hasRole(wrapper, principal, role)) {
+return true;
+}
+}
+return false;
+}
+
@Override
@Deprecated
protected String getName() {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cef3d73..3a287e1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -86,6 +86,10 @@
case-sensitive manner as required by the CORS specification. (markt)
+63982: CombinedRealm makes assumptions about principal
implementation
+(michaelo)
+
+
63983: Correct a regression in the static resource caching
changes introduced in 9.0.28. A large number of file descriptors were
opened that could reach the OS limit before being released by GC.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: BZ 63982: CombinedRealm makes assumptions about principal implementation
This is an automated email from the ASF dual-hosted git repository.
michaelo 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 15c72df BZ 63982: CombinedRealm makes assumptions about principal
implementation
15c72df is described below
commit 15c72df0ca36a0b05a3dded50971c216125704f8
Author: Michael Osipov
AuthorDate: Fri Dec 6 13:49:35 2019 +0100
BZ 63982: CombinedRealm makes assumptions about principal implementation
---
java/org/apache/catalina/realm/CombinedRealm.java | 14 ++
webapps/docs/changelog.xml| 4
2 files changed, 18 insertions(+)
diff --git a/java/org/apache/catalina/realm/CombinedRealm.java
b/java/org/apache/catalina/realm/CombinedRealm.java
index b3b79de..865120c 100644
--- a/java/org/apache/catalina/realm/CombinedRealm.java
+++ b/java/org/apache/catalina/realm/CombinedRealm.java
@@ -29,6 +29,7 @@ import org.apache.catalina.Container;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Realm;
+import org.apache.catalina.Wrapper;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.ietf.jgss.GSSContext;
@@ -414,6 +415,19 @@ public class CombinedRealm extends RealmBase {
return authenticatedUser;
}
+/**
+ * {@inheritDoc}
+ */
+@Override
+public boolean hasRole(Wrapper wrapper, Principal principal, String role) {
+for (Realm realm : realms) {
+if (realm.hasRole(wrapper, principal, role)) {
+return true;
+}
+}
+return false;
+}
+
@Override
protected String getPassword(String username) {
// This method should never be called
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d221bc5..238f90f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -82,6 +82,10 @@
by Andy Wilkinson. (markt)
+63982: CombinedRealm makes assumptions about principal
implementation
+(michaelo)
+
+
63983: Correct a regression in the static resource caching
changes introduced in 9.0.28. A large number of file descriptors were
opened that could reach the OS limit before being released by GC.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63966] Charset of TLS message is hardcoded to ISO-8859-1.
https://bz.apache.org/bugzilla/show_bug.cgi?id=63966 --- Comment #6 from madhavpulip...@gmail.com --- Thanks for your response, Converting the message to UTF-8 is sufficient so that all messages to client will be in UTF-8. Please ignore my request on making it configurable. regards, Madhav Pulipaka -- 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 63989] tomcat-users.xml encoding='cp936' after apache-tomcat-9.0.29.exe installed
https://bz.apache.org/bugzilla/show_bug.cgi?id=63989 Mark Thomas changed: What|Removed |Added OS||All Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #1 from Mark Thomas --- See bug 45332 -- 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] 06/06: Back-port updates to the Chinese translations from 8, 5, x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 96fbaf76106d5308dd7c686679776b45a2d2f9d8
Author: Mark Thomas
AuthorDate: Fri Dec 6 10:22:55 2019 +
Back-port updates to the Chinese translations from 8,5,x
---
java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/realm/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/session/LocalStrings_zh_CN.properties| 1 +
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties| 1 +
java/org/apache/catalina/valves/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/http11/LocalStrings_zh_CN.properties | 1 +
java/org/apache/jasper/resources/LocalStrings_zh_CN.properties| 1 +
java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties | 1 +
webapps/docs/changelog.xml| 4
10 files changed, 13 insertions(+)
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
index f65f96a..c3e7dd8 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+farmWarDeployer.deleteFail=无法删除 [{0}]
farmWarDeployer.hostOnly=FarmWarDeployer 只有做为 host cluster 的子元素是才生效
farmWarDeployer.mbeanNameFail=无法为引擎[{0}]和主机[{1}]构造MBean对象名
farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}]
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index ef59200..9290c3f 100644
--- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
@@ -21,6 +21,7 @@ dataSourceRealm.getRoles.exception=:)检索角色[{0}]异常
jaasCallback.username=返回用户名 [{0}]
+jaasRealm.authenticateFailure=用户 [{0}] 认证失败
jaasRealm.authenticateSuccess=用户名 [{0}] 已被成功认证为身份 [{1}] -- 主体也已创建
jaasRealm.failedLogin=由于登录失败，用户名 [{0}] 无法授权
jaasRealm.loginContextCreated=为用户名创建的JAAS 登陆上下文[{0}]
diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
index a98f87e..30cda59 100644
--- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
@@ -41,6 +41,7 @@ standardManager.managerUnload=卸载会话到持久存储的异常
standardManager.unloading.nosessions=没有要卸载的持久会话
standardSession.attributeEvent=会话属性事件侦听器引发异常
+standardSession.getAttribute.ise=getAttribute: 会话已失效
standardSession.getAttributeNames.ise=getAttributeNames：会话已失效
standardSession.getCreationTime.ise=getCreataionTime：会话已经无效
standardSession.getLastAccessedTime.ise=getLastAccessedTime: 会话已失效
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 9e4b10e..d85303d 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -77,6 +77,7 @@ hostConfig.deployDescriptor.error=部署描述符[{0}]时出错
hostConfig.deployDescriptor.finished=部署描述符[{0}]的部署已在[{1}]ms内完成
hostConfig.deployDescriptor.localDocBaseSpecified=(:在主机appBase 中指定了docBase
[{0}]，将被忽略
hostConfig.deployDir=把web 应用程序部署到目录 [{0}]
+hostConfig.deployDir.error=无法部署应用目录 [{0}]
hostConfig.deployWar.error=部署 Web 应用程序 archive [{0}] 时出错
hostConfig.deployWar.hiddenDir=将忽略目录[{0}]，因为WAR [{1}]优先，unpackWAR为false
hostConfig.deployWar.threaded.error=等待WAR文件的多线程部署完成时出错
diff --git a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
index 08f8e26..084f291 100644
--- a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
@@ -83,6 +83,7 @@ http.511.desc=客户端需要进行身份验证才能获得网络访问权限。
remoteCidrValve.noRemoteIp=客户端没有IP地址。请求被拒绝。
+remoteIpValve.invalidHostHeader=在HTTP请求头[{1}]中发现Host的无效值[{0}]
remoteIpValve.invalidPortHeader=HTTP标头[{1}]中的端口找到的值[{0}]无效
requestFilterValve.configInvalid=为Remote [Addr |
Host]阀门提供了一个或多个无效配置设置，阻止Valve及其父容器启动
diff --git a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
index 3f61189..cf485d2 100644
--- a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
@@ -17,6 +17,7 @@ http11processor.header.parse=解析 HTTP 请求 header 错误
http11processor.request.inconsistentHosts=请求行中指定的主机与主机头不
[tomcat] 05/06: Back-port updates to the Korean translations from 8.5.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1ea8fa8f3a5ae5eb0312019ac2dcc7d65de30fa8
Author: Mark Thomas
AuthorDate: Fri Dec 6 10:22:33 2019 +
Back-port updates to the Korean translations from 8.5.x
---
java/org/apache/catalina/core/LocalStrings_ko.properties | 4
java/org/apache/coyote/LocalStrings_ko.properties | 1 +
java/org/apache/tomcat/util/buf/LocalStrings_ko.properties | 2 ++
webapps/docs/changelog.xml | 4
4 files changed, 11 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 26e738a..ad737f6 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -86,6 +86,10 @@ aprListener.wrongFIPSMode=예기치 않은 AprLifecycleListener의
FIPSMode 옵
asyncContextImpl.asyncDispachError=비동기 디스패치 도중 오류 발생
asyncContextImpl.asyncRunnableError=AsyncContext.start()를 통해, 비동기로 Runnable을
처리하는 도중 오류 발생
asyncContextImpl.dispatchingStarted=비동기 디스패치 오퍼레이션이 이미 호출되었습니다. 동일한 비동기 사이클
내에서, 추가적인 비동기 디스패치 오퍼레이션은 허용되지 않습니다.
+asyncContextImpl.fireOnComplete=등록된 AsyncListener들에 onComplete() 이벤트를 호출합니다.
+asyncContextImpl.fireOnError=등록된 AsyncListener들에 onError() 이벤트를 호출합니다.
+asyncContextImpl.fireOnStartAsync=등록된 AsyncListener들에 onStartAsync() 이벤트를
호출합니다.
+asyncContextImpl.fireOnTimeout=등록된 AsyncListener들에 onTimeout() 이벤트를 호출합니다.
asyncContextImpl.noAsyncDispatcher=ServletContext로부터 반환된 디스패처는 비동기 디스패치를 지원하지
않습니다.
asyncContextImpl.onCompleteError=타입 [{0}]의 리스너를 위한 onComplete() 호출이 실패했습니다.
asyncContextImpl.onErrorError=타입 [{0}]의 리스너를 위한 onError() 호출이 실패했습니다.
diff --git a/java/org/apache/coyote/LocalStrings_ko.properties
b/java/org/apache/coyote/LocalStrings_ko.properties
index 888a96c..8b0c78b 100644
--- a/java/org/apache/coyote/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/LocalStrings_ko.properties
@@ -15,6 +15,7 @@
abstractConnectionHandler.error=요청을 읽는 중 오류 발생. 무시합니다.
abstractConnectionHandler.ioexception.debug=IOException들은 정상적이므로, 무시합니다.
+abstractConnectionHandler.oome=요청 처리를 완료하지 못했습니다.
abstractConnectionHandler.socketexception.debug=SocketException들은 정상적인 상태이므로
무시되었습니다.
abstractProcessor.fallToDebug=\n\
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
index 8bdce35..d49aa5d 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
@@ -16,5 +16,7 @@
b2cConverter.unknownEncoding=문자 인코딩 [{0}]은(는) 지원되지 않습니다.
uDecoder.convertHexDigit.notHex=[{0}]은(는) 16진수 숫자가 아닙니다.
+uDecoder.eof=파일의 끝 (EOF)
+uDecoder.noSlash=인코딩된 슬래시 문자는 허용되지 않습니다.
uDecoder.urlDecode.conversionError=문자셋 [{1}]을(를) 사용하여 [{0}]을(를) 디코드하지 못했습니다.
uDecoder.urlDecode.missingDigit=% 문자 뒤에 두 개의 16진수 숫자들이 이어져야 하기 때문에, [{0}]을(를)
디코드하지 못했습니다.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 575d61a..ffac708 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -145,6 +145,10 @@
Expand the coverage of the Japanese translations provided with Apache
Tomcat. (markt)
+
+Expand the coverage of the Korean translations provided with Apache
+Tomcat. (woonsan)
+
-
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 (2fc2044 -> 96fbaf7)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 2fc2044 Remove unused entry new 64171d7 Correct ordering new 1237623 Back-port updates to German translations from 8.5.x new 06a7463 Back-port updates to the French translations from 8.5.x new 134d573 Back-port updates to the Japanese translations from 8.5.x new 1ea8fa8 Back-port updates to the Korean translations from 8.5.x new 96fbaf7 Back-port updates to the Chinese translations from 8,5,x The 6 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: .../apache/catalina/core/LocalStrings_fr.properties | 4 .../apache/catalina/core/LocalStrings_ko.properties | 4 .../catalina/ha/deploy/LocalStrings_zh_CN.properties | 1 + .../catalina/realm/LocalStrings_zh_CN.properties | 1 + .../catalina/session/LocalStrings_zh_CN.properties | 1 + .../catalina/startup/LocalStrings_zh_CN.properties | 1 + .../catalina/valves/LocalStrings_zh_CN.properties| 1 + java/org/apache/coyote/LocalStrings_de.properties| 1 + java/org/apache/coyote/LocalStrings_fr.properties| 1 + java/org/apache/coyote/LocalStrings_ko.properties| 1 + .../coyote/http11/LocalStrings_zh_CN.properties | 1 + .../jasper/resources/LocalStrings_zh_CN.properties | 1 + .../apache/tomcat/util/buf/LocalStrings.properties | 2 +- .../tomcat/util/buf/LocalStrings_fr.properties | 2 ++ .../tomcat/util/buf/LocalStrings_ja.properties | 2 ++ .../tomcat/util/buf/LocalStrings_ko.properties | 2 ++ .../util/http/parser/LocalStrings_zh_CN.properties | 1 + .../websocket/pojo/LocalStrings_zh_CN.properties | 1 + webapps/docs/changelog.xml | 20 19 files changed, 47 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/06: Back-port updates to the French translations from 8.5.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 06a74637e9542f8d42a9c64309b81d40f650dbc9
Author: Mark Thomas
AuthorDate: Fri Dec 6 10:21:37 2019 +
Back-port updates to the French translations from 8.5.x
---
java/org/apache/catalina/core/LocalStrings_fr.properties | 4
java/org/apache/coyote/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/util/buf/LocalStrings_fr.properties | 2 ++
webapps/docs/changelog.xml | 4
4 files changed, 11 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 552277f..2f8a72f 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -94,6 +94,10 @@ aprListener.wrongFIPSMode=Valuer inattendue de l''option
FIPSMode de AprLifecycl
asyncContextImpl.asyncDispachError=Erreur lors d'un dispatch asynchrone
asyncContextImpl.asyncRunnableError=Erreur lors du traitement asynchrone du
Runnable via AsyncContext.start()
asyncContextImpl.dispatchingStarted=Une opération de dispatch asynchrone a
déjà été appelée, plusieurs dispatch au cours d'un même cycle asynchrone n'est
pas autorisé
+asyncContextImpl.fireOnComplete=Déclenchement de l'évènement onComplete() sur
tous les AsyncListeners
+asyncContextImpl.fireOnError=Déclenchement de l'évènement onError() sur tous
les AsyncListeners
+asyncContextImpl.fireOnStartAsync=Déclenchement de l'évènement onStartAsync()
sur tous les AsyncListeners
+asyncContextImpl.fireOnTimeout=Déclenchement de l'évènement onTimeout() sur
tous les AsyncListeners
asyncContextImpl.noAsyncDispatcher=Le Servlet dispatcher retourné par le
ServletContext ne supporte pas de dispatch asynchrone
asyncContextImpl.onCompleteError=L''appel à onComplete() a échoué pour
l''écouteur de type [{0}]
asyncContextImpl.onErrorError=L''appel à onError() a échoué pour l''écouteur
de type [{0}]
diff --git a/java/org/apache/coyote/LocalStrings_fr.properties
b/java/org/apache/coyote/LocalStrings_fr.properties
index d0b9f25..d583d9e 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -15,6 +15,7 @@
abstractConnectionHandler.error=Erreur de lecture de la requête, ignorée
abstractConnectionHandler.ioexception.debug=Les IOException sont normales et
sont ignorées
+abstractConnectionHandler.oome=Echec de la fin de traitement d'une requête
abstractConnectionHandler.socketexception.debug=Les SocketException sont
normales et sont ignorées
abstractProcessor.fallToDebug=\ Note : les occurrences suivantes d'erreur
d'analyse de la requête seront enregistrées au niveau DEBUG
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
index 435a9d8..5abe4ec 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
@@ -16,5 +16,7 @@
b2cConverter.unknownEncoding=L''encodage de caractères [{0}] n''est pas
supporté
uDecoder.convertHexDigit.notHex=[{0}] n''est pas un chiffre hexadécimal
+uDecoder.eof=Fin de fichier (EOF)
+uDecoder.noSlash=Un caractère slash encodé n'est pas autorisé
uDecoder.urlDecode.conversionError=Echec de décodage [{0}] en utilisant le jeu
de caractères [{1}]
uDecoder.urlDecode.missingDigit=Impossible de décoder [{0}] parce que le
caractère % doit être suivi de deux chiffres héxadécimaux
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 37a929c..31ab8aa 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -137,6 +137,10 @@
Expand the coverage of the German translations provided with Apache
Tomcat. Contribution provided by Jens. (markt)
+
+Expand the coverage of the French translations provided with Apache
+Tomcat. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/06: Back-port updates to German translations from 8.5.x
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 12376235cb1a13649cc00a12f109e697e42bed07 Author: Mark Thomas AuthorDate: Fri Dec 6 10:21:06 2019 + Back-port updates to German translations from 8.5.x --- java/org/apache/coyote/LocalStrings_de.properties | 1 + webapps/docs/changelog.xml| 4 2 files changed, 5 insertions(+) diff --git a/java/org/apache/coyote/LocalStrings_de.properties b/java/org/apache/coyote/LocalStrings_de.properties index 542ab3a..99409e2 100644 --- a/java/org/apache/coyote/LocalStrings_de.properties +++ b/java/org/apache/coyote/LocalStrings_de.properties @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +abstractConnectionHandler.oome=Verarbeitung der Anfrage fehlgeschlagen abstractConnectionHandler.socketexception.debug=SocketExceptions sind normal, werden ignoriert abstractProcessor.fallToDebug=Info: Weitere Vorkommen von Fehlern beim Parsen der Anfragen werden mit DEBUG Level ausgegeben diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 16c50a6..37a929c 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -133,6 +133,10 @@ JAVA_HOME environment variable. Pull request provided by Alexander Norz. (markt) + +Expand the coverage of the German translations provided with Apache +Tomcat. Contribution provided by Jens. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/06: Back-port updates to the Japanese translations from 8.5.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 134d57373294b692f3e5089fd5bc111ee8e43239
Author: Mark Thomas
AuthorDate: Fri Dec 6 10:22:03 2019 +
Back-port updates to the Japanese translations from 8.5.x
---
java/org/apache/tomcat/util/buf/LocalStrings_ja.properties | 2 ++
webapps/docs/changelog.xml | 4
2 files changed, 6 insertions(+)
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
index 1645963..4f78067 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
@@ -16,5 +16,7 @@
b2cConverter.unknownEncoding=文字エンコーディング [{0}] は未対応です。
uDecoder.convertHexDigit.notHex=[{0}] は16 進数ではありません。
+uDecoder.eof=予期せぬ場所で終端に達しました。
+uDecoder.noSlash="/" を符号化して含めることはできません。
uDecoder.urlDecode.conversionError=文字セット[{1}]を使用して[{0}]のデコードに失敗しました
uDecoder.urlDecode.missingDigit=％文字の後ろに2つの16進数字が続く必要があるため、[{0}]のデコードに失敗しました。
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 31ab8aa..575d61a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,10 @@
Expand the coverage of the French translations provided with Apache
Tomcat. (remm)
+
+Expand the coverage of the Japanese translations provided with Apache
+Tomcat. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/06: Correct ordering
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 64171d7865584e0ebe83e3671b80e8eaa19413f7
Author: Mark Thomas
AuthorDate: Fri Dec 6 10:18:55 2019 +
Correct ordering
---
java/org/apache/tomcat/util/buf/LocalStrings.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings.properties
b/java/org/apache/tomcat/util/buf/LocalStrings.properties
index 1f5e8b0..a7dacdf 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings.properties
@@ -17,8 +17,8 @@ b2cConverter.unknownEncoding=The character encoding [{0}] is
not supported
c2bConverter.recycleFailed=Failed to recycle the C2B Converter. Creating new
BufferedWriter, WriteConvertor and IntermediateOutputStream.
+uDecoder.convertHexDigit.notHex=[{0}] is not a hexadecimal digit
uDecoder.eof=End of file (EOF)
uDecoder.noSlash=The encoded slash character is not allowed
-uDecoder.convertHexDigit.notHex=[{0}] is not a hexadecimal digit
uDecoder.urlDecode.conversionError=Failed to decode [{0}] using character set
[{1}]
uDecoder.urlDecode.missingDigit=Failed to decode [{0}] because the % character
must be followed by two hexademical digits
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63989] tomcat-users.xml encoding='cp936' after apache-tomcat-9.0.29.exe installed
https://bz.apache.org/bugzilla/show_bug.cgi?id=63989 charyGao changed: What|Removed |Added URL||https://github.com/charygao CC||gaoyab...@126.com OS||Windows 10 -- 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 63989] New: tomcat-users.xml encoding='cp936' after apache-tomcat-9.0.29.exe installed
https://bz.apache.org/bugzilla/show_bug.cgi?id=63989 Bug ID: 63989 Summary: tomcat-users.xml encoding='cp936' after apache-tomcat-9.0.29.exe installed Product: Tomcat 9 Version: 9.0.26 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Packaging Assignee: dev@tomcat.apache.org Reporter: gaoyab...@126.com Target Milestone: - Product apache-tomcat-9.0.29.exe. When "apache-tomcat-9.0.29.exe" installed in windows 10(Chinese Encoding);I find conf/tomcat-users.xml file content "" become to "encoding='cp936'",so I guess NSIS install script is error!please fix it,thank you all! === Component – NSIS install script error. "\$PLUGINSDIR\nsDialogs.dll" "\$PLUGINSDIR\nsExec.dll" Platform and OS –Windows 10 X64 1903. Severity – normal. Configuration details Please mention these in your text: Java version – C:\Program Files\Java\jdk1.8.0_221 === -- 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 62924] tomcat-users.xml has open file descriptors and opens tomcat-users.xml all the time
https://bz.apache.org/bugzilla/show_bug.cgi?id=62924 charyGao changed: What|Removed |Added CC||gaoyab...@126.com -- 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] 02/05: Back-port French tranlations from 9.0.x
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 50bb8c30e38bd23cc9e7da8474da555d0a449d2c
Author: Mark Thomas
AuthorDate: Fri Dec 6 10:11:37 2019 +
Back-port French tranlations from 9.0.x
---
java/org/apache/catalina/core/LocalStrings_fr.properties | 4
java/org/apache/coyote/LocalStrings_fr.properties | 5 +
java/org/apache/tomcat/util/buf/LocalStrings_fr.properties | 2 ++
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 2 ++
webapps/docs/changelog.xml | 4
5 files changed, 17 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 835a849..2cd9981 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -94,6 +94,10 @@ aprListener.wrongFIPSMode=Valuer inattendue de l''option
FIPSMode de AprLifecycl
asyncContextImpl.asyncDispachError=Erreur lors d'un dispatch asynchrone
asyncContextImpl.asyncRunnableError=Erreur lors du traitement asynchrone du
Runnable via AsyncContext.start()
asyncContextImpl.dispatchingStarted=Une opération de dispatch asynchrone a
déjà été appelée, plusieurs dispatch au cours d'un même cycle asynchrone n'est
pas autorisé
+asyncContextImpl.fireOnComplete=Déclenchement de l'évènement onComplete() sur
tous les AsyncListeners
+asyncContextImpl.fireOnError=Déclenchement de l'évènement onError() sur tous
les AsyncListeners
+asyncContextImpl.fireOnStartAsync=Déclenchement de l'évènement onStartAsync()
sur tous les AsyncListeners
+asyncContextImpl.fireOnTimeout=Déclenchement de l'évènement onTimeout() sur
tous les AsyncListeners
asyncContextImpl.noAsyncDispatcher=Le Servlet dispatcher retourné par le
ServletContext ne supporte pas de dispatch asynchrone
asyncContextImpl.onCompleteError=L''appel à onComplete() a échoué pour
l''écouteur de type [{0}]
asyncContextImpl.onErrorError=L''appel à onError() a échoué pour l''écouteur
de type [{0}]
diff --git a/java/org/apache/coyote/LocalStrings_fr.properties
b/java/org/apache/coyote/LocalStrings_fr.properties
index 1abd38e..49e8c1b 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -17,6 +17,7 @@ abstractConnectionHandler.connectionsGet=Trouvé le processeur
[{0}] pour le soc
abstractConnectionHandler.error=Erreur de lecture de la requête, ignorée
abstractConnectionHandler.ioexception.debug=Les IOException sont normales et
sont ignorées
abstractConnectionHandler.negotiatedProcessor.fail=Impossible de créer un
processeur pour le protocole négocié [{0}]
+abstractConnectionHandler.oome=Echec de la fin de traitement d'une requête
abstractConnectionHandler.process=Traitement du socket [{0}] avec le statut
[{1}]
abstractConnectionHandler.processorPop=Retrait du processeur [{0}] du cache
abstractConnectionHandler.protocolexception.debug=Les ProtocolExceptions sont
normales et sont ignorées
@@ -30,6 +31,8 @@ abstractProcessor.pushrequest.notsupported=Le requêtes push
du serveur ne sont
abstractProcessor.socket.ssl=Exception lors de l'obtention des attributs SSL
abstractProtocol.mbeanDeregistrationFailed=Erreur lors du désenregistrement du
mbean [{0}] dans le serveur [{1}]
+abstractProtocol.processorRegisterError=Erreur lors de l'enregistrement du
processeur de requêtes
+abstractProtocol.processorUnregisterError=Erreur lors du désenregistrement du
processeur de requêtes
abstractProtocolHandler.destroy=Destruction du gestionnaire de protocole [{0}]
abstractProtocolHandler.init=Initialisation du gestionnaire de protocole [{0}]
@@ -41,6 +44,8 @@ abstractProtocolHandler.stop=Arrêt du gestionnaire de
protocole [{0}]
asyncStateMachine.invalidAsyncState=L''appel à [{0}] n''est pas valide pour
une requête dans l''état Async [{1}]
+compressionConfig.ContentEncodingParseFail=Echec du traitement de l'en-tête
Content-Encoding en vérifiant si la compression était déjà utilisée
+
request.notAsync=Il n'est possible de passer en mode d'entrée-sorties non
bloquantes que lors de traitements asynchrones ou après mise à niveau depuis
HTTP
request.nullReadListener=L'écouteur passé à setReadListener() ne peut pas être
null
request.readListenerSet=L'écouteur des lectures non bloquantes a déjà été
défini
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
index 10dbae1..f23cd3d 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
@@ -23,5 +23,7 @@ byteBufferUtils.cleaner=Impossible d'utiliser le nettoyeur de
ByteBuffers direct
hexUtils.fromHex.nonHex=L'entrée doit être uniquement des chiffres héxadécimaux
hexUtils.from
[tomcat] branch 8.5.x updated (982629d -> 69e2f4a)
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 982629d Review PR #227. Add changelog entry new 1f4d351 Back-port German translations from 9.0.x new 50bb8c3 Back-port French tranlations from 9.0.x new 8fa1cb0 Back-port Japanese translations from 9.0.x new 63d35a1 Backport Korean translations from 9.0.x new 69e2f4a Back-port updates to Chinese translations from 9.0.x The 5 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: .../apache/catalina/core/LocalStrings_fr.properties | 4 .../apache/catalina/core/LocalStrings_ko.properties | 4 .../catalina/ha/deploy/LocalStrings_zh_CN.properties | 1 + .../catalina/realm/LocalStrings_zh_CN.properties | 1 + .../catalina/session/LocalStrings_zh_CN.properties | 1 + .../catalina/startup/LocalStrings_zh_CN.properties | 1 + .../tribes/tipis/LocalStrings_zh_CN.properties | 1 + .../catalina/valves/LocalStrings_zh_CN.properties| 1 + java/org/apache/coyote/LocalStrings_de.properties| 1 + java/org/apache/coyote/LocalStrings_fr.properties| 5 + java/org/apache/coyote/LocalStrings_ko.properties| 5 + java/org/apache/coyote/LocalStrings_zh_CN.properties | 3 +++ .../apache/coyote/ajp/LocalStrings_zh_CN.properties | 1 + .../coyote/http11/LocalStrings_zh_CN.properties | 1 + .../coyote/http2/LocalStrings_zh_CN.properties | 5 + .../jasper/resources/LocalStrings_zh_CN.properties | 1 + .../tomcat/util/buf/LocalStrings_fr.properties | 2 ++ .../tomcat/util/buf/LocalStrings_ja.properties | 2 ++ .../tomcat/util/buf/LocalStrings_ko.properties | 2 ++ .../util/http/parser/LocalStrings_zh_CN.properties | 1 + .../tomcat/util/net/LocalStrings_fr.properties | 2 ++ .../tomcat/util/net/LocalStrings_ko.properties | 2 ++ .../websocket/pojo/LocalStrings_zh_CN.properties | 1 + webapps/docs/changelog.xml | 20 24 files changed, 68 insertions(+) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/05: Back-port Japanese translations from 9.0.x
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 8fa1cb0a56c98eddfaa04e8dd6e39c5c72267bd6
Author: Mark Thomas
AuthorDate: Fri Dec 6 10:13:48 2019 +
Back-port Japanese translations from 9.0.x
---
java/org/apache/tomcat/util/buf/LocalStrings_ja.properties | 2 ++
webapps/docs/changelog.xml | 4
2 files changed, 6 insertions(+)
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
index a78e204..2c30d38 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
@@ -20,5 +20,7 @@ byteBufferUtils.cleaner=直接ByteBufferクリーナーを使用することは
hexUtils.fromHex.nonHex=入力は16進数でなければなりません
hexUtils.fromHex.oddDigits=入力は、偶数の16進数で構成する必要があります。
+uDecoder.eof=予期せぬ場所で終端に達しました。
+uDecoder.noSlash="/" を符号化して含めることはできません。
uDecoder.urlDecode.conversionError=文字セット[{1}]を使用して[{0}]のデコードに失敗しました
uDecoder.urlDecode.missingDigit=％文字の後ろに2つの16進数字が続く必要があるため、[{0}]のデコードに失敗しました。
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7eff9ad..ed4d20d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -185,6 +185,10 @@
Expand the coverage of the French translations provided with Apache
Tomcat. (remm)
+
+Expand the coverage of the Japanese translations provided with Apache
+Tomcat. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/05: Back-port updates to Chinese translations from 9.0.x
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 69e2f4a95e2020c30ac460852ba2a55517c1f889
Author: Mark Thomas
AuthorDate: Fri Dec 6 10:15:58 2019 +
Back-port updates to Chinese translations from 9.0.x
---
java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/realm/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/session/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/valves/LocalStrings_zh_CN.properties| 1 +
java/org/apache/coyote/LocalStrings_zh_CN.properties | 3 +++
java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/http11/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 5 +
java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 1 +
.../org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties | 1 +
webapps/docs/changelog.xml | 4
14 files changed, 23 insertions(+)
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
index f65f96a..c3e7dd8 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+farmWarDeployer.deleteFail=无法删除 [{0}]
farmWarDeployer.hostOnly=FarmWarDeployer 只有做为 host cluster 的子元素是才生效
farmWarDeployer.mbeanNameFail=无法为引擎[{0}]和主机[{1}]构造MBean对象名
farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}]
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index 2a38fa7..82d513d 100644
--- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
@@ -21,6 +21,7 @@ dataSourceRealm.getRoles.exception=:)检索角色[{0}]异常
jaasCallback.username=返回用户名 [{0}]
+jaasRealm.authenticateFailure=用户 [{0}] 认证失败
jaasRealm.authenticateSuccess=用户名 [{0}] 已被成功认证为身份 [{1}] -- 主体也已创建
jaasRealm.failedLogin=由于登录失败，用户名 [{0}] 无法授权
jaasRealm.loginContextCreated=为用户名创建的JAAS 登陆上下文[{0}]
diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
index fc55f23..050bdef 100644
--- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
@@ -43,6 +43,7 @@ standardManager.managerUnload=卸载会话到持久存储的异常
standardManager.unloading.nosessions=没有要卸载的持久会话
standardSession.attributeEvent=会话属性事件侦听器引发异常
+standardSession.getAttribute.ise=getAttribute: 会话已失效
standardSession.getAttributeNames.ise=getAttributeNames：会话已失效
standardSession.getCreationTime.ise=getCreataionTime：会话已经无效
standardSession.getIdleTime.ise=getIdleTime: 已失效的会话
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 248d4d2..5371ad2 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -79,6 +79,7 @@ hostConfig.deployDescriptor.error=部署描述符[{0}]时出错
hostConfig.deployDescriptor.finished=部署描述符[{0}]的部署已在[{1}]ms内完成
hostConfig.deployDescriptor.localDocBaseSpecified=(:在主机appBase 中指定了docBase
[{0}]，将被忽略
hostConfig.deployDir=把web 应用程序部署到目录 [{0}]
+hostConfig.deployDir.error=无法部署应用目录 [{0}]
hostConfig.deployWar.error=部署 Web 应用程序 archive [{0}] 时出错
hostConfig.deployWar.hiddenDir=将忽略目录[{0}]，因为WAR [{1}]优先，unpackWAR为false
hostConfig.deployWar.threaded.error=等待WAR文件的多线程部署完成时出错
diff --git
a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
index 4bf1c9a..df980b2 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
@@ -18,6 +18,7 @@ abstractReplicatedMap.leftOver.ignored=消息[{0}]被忽略
abstractReplicatedMap.member.disappeared=成员[{0}]已消失。相关的映射项将重新定位到新节点。
abstractReplicatedMap.transferState.noReplies=传输状态，0响应，也许是超时。
abstractReplicatedMap.unable.get=无法复制 AbstractReplicatedMap.get 操作的数据
+abstractReplicatedMap.unable.put=无法复制AbstractReplicatedMap.Put操作的数据
abstractReplicatedMap.unable.relocate=无法将[{0}]重新定位到新的备份节点
abstractReplicatedMap.unableSelec
[tomcat] 01/05: Back-port German translations from 9.0.x
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 1f4d3513c439a5638a3ac6e67f42f5acdd81a2e0
Author: Mark Thomas
AuthorDate: Fri Dec 6 10:10:39 2019 +
Back-port German translations from 9.0.x
---
java/org/apache/coyote/LocalStrings_de.properties | 1 +
webapps/docs/changelog.xml| 4
2 files changed, 5 insertions(+)
diff --git a/java/org/apache/coyote/LocalStrings_de.properties
b/java/org/apache/coyote/LocalStrings_de.properties
index dc66652..1b66a7a 100644
--- a/java/org/apache/coyote/LocalStrings_de.properties
+++ b/java/org/apache/coyote/LocalStrings_de.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+abstractConnectionHandler.oome=Verarbeitung der Anfrage fehlgeschlagen
abstractConnectionHandler.processorPop=Prozessor [{0}] wurde aus dem Cache
genommen.
abstractConnectionHandler.socketexception.debug=SocketExceptions sind normal,
werden ignoriert
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2b1b3eb..989ccc7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -177,6 +177,10 @@
JAVA_HOME environment variable. Pull request provided by
Alexander Norz. (markt)
+
+Expand the coverage of the German translations provided with Apache
+Tomcat. Contribution provided by Jens. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/05: Backport Korean translations from 9.0.x
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 63d35a15098d66a9840c6c82249843f1320b2547
Author: Mark Thomas
AuthorDate: Fri Dec 6 10:14:31 2019 +
Backport Korean translations from 9.0.x
---
java/org/apache/catalina/core/LocalStrings_ko.properties | 4
java/org/apache/coyote/LocalStrings_ko.properties | 5 +
java/org/apache/tomcat/util/buf/LocalStrings_ko.properties | 2 ++
java/org/apache/tomcat/util/net/LocalStrings_ko.properties | 2 ++
webapps/docs/changelog.xml | 4
5 files changed, 17 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index c53a8b2..0012e83 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -94,6 +94,10 @@ aprListener.wrongFIPSMode=예기치 않은 AprLifecycleListener의
FIPSMode 옵
asyncContextImpl.asyncDispachError=비동기 디스패치 도중 오류 발생
asyncContextImpl.asyncRunnableError=AsyncContext.start()를 통해, 비동기로 Runnable을
처리하는 도중 오류 발생
asyncContextImpl.dispatchingStarted=비동기 디스패치 오퍼레이션이 이미 호출되었습니다. 동일한 비동기 사이클
내에서, 추가적인 비동기 디스패치 오퍼레이션은 허용되지 않습니다.
+asyncContextImpl.fireOnComplete=등록된 AsyncListener들에 onComplete() 이벤트를 호출합니다.
+asyncContextImpl.fireOnError=등록된 AsyncListener들에 onError() 이벤트를 호출합니다.
+asyncContextImpl.fireOnStartAsync=등록된 AsyncListener들에 onStartAsync() 이벤트를
호출합니다.
+asyncContextImpl.fireOnTimeout=등록된 AsyncListener들에 onTimeout() 이벤트를 호출합니다.
asyncContextImpl.noAsyncDispatcher=ServletContext로부터 반환된 디스패처는 비동기 디스패치를 지원하지
않습니다.
asyncContextImpl.onCompleteError=타입 [{0}]의 리스너를 위한 onComplete() 호출이 실패했습니다.
asyncContextImpl.onErrorError=타입 [{0}]의 리스너를 위한 onError() 호출이 실패했습니다.
diff --git a/java/org/apache/coyote/LocalStrings_ko.properties
b/java/org/apache/coyote/LocalStrings_ko.properties
index de89a19..99539dd 100644
--- a/java/org/apache/coyote/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/LocalStrings_ko.properties
@@ -17,6 +17,7 @@ abstractConnectionHandler.connectionsGet=소켓 [{1}]을(를) 위한 프로세
abstractConnectionHandler.error=요청을 읽는 중 오류 발생. 무시합니다.
abstractConnectionHandler.ioexception.debug=IOException들은 정상적이므로, 무시합니다.
abstractConnectionHandler.negotiatedProcessor.fail=Negotiate된 프로토콜 [{0}]을(를)
위한 프로세서를 생성하지 못했습니다.
+abstractConnectionHandler.oome=요청 처리를 완료하지 못했습니다.
abstractConnectionHandler.process=상태가 [{1}]인 소켓 [{0}]을(를) 처리합니다.
abstractConnectionHandler.processorPop=캐시로부터 프로세서 [{0}]을(를) 추출했습니다.
abstractConnectionHandler.protocolexception.debug=ProtocolException들은 정상적이므로,
무시합니다.
@@ -31,6 +32,8 @@ abstractProcessor.pushrequest.notsupported=이 프로토콜은 서버 push 요
abstractProcessor.socket.ssl=SSL 속성들을 얻으려는 중 예외 발생
abstractProtocol.mbeanDeregistrationFailed=MBean 서버 [{1}](으)로부터, [{0}](이)라는
이름의 MBean의 등록을 제거하지 못했습니다.
+abstractProtocol.processorRegisterError=RequestProcessor 구성요소를 등록하는 중 오류 발생
+abstractProtocol.processorUnregisterError=RequestProcessor 구성요소를 등록 해제하는 중 오류
발생
abstractProtocolHandler.destroy=프로토콜 핸들러 [{0}]을(를) 소멸시킵니다.
abstractProtocolHandler.init=프로토콜 핸들러 [{0}]을(를) 초기화합니다.
@@ -42,6 +45,8 @@ abstractProtocolHandler.stop=프로토콜 핸들러 [{0}]을(를) 중지시킵
asyncStateMachine.invalidAsyncState=비동기 상태가 [{1}]인 요청에 대하여, [{0}]을(를) 호출하는 것은
유효하지 않습니다.
+compressionConfig.ContentEncodingParseFail=압축이 이미 사용되는지 여부를 점검하는 중,
Content-Encoding 헤더를 파싱하지 못했습니다.
+
request.notAsync=오직 비동기 처리 또는 HTTP 업그레이드 처리 시에만, Non-blocking IO로의 전환이 유효합니다.
request.nullReadListener=setReadListener()에 전달된 리스너는 널일 수 없습니다.
request.readListenerSet=Non-blocking 읽기 리스너가 이미 설정되어 있습니다.
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
index 08e5b3a..ff5a002 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
@@ -23,5 +23,7 @@ byteBufferUtils.cleaner=직접적인 ByteBuffer cleaner를 사용할 수 없습
hexUtils.fromHex.nonHex=입력은 오직 16진수 숫자로만 이루어져야 합니다.
hexUtils.fromHex.oddDigits=입력은 반드시 짝수 개의 16진수 숫자들로 이루어져야 합니다.
+uDecoder.eof=파일의 끝 (EOF)
+uDecoder.noSlash=인코딩된 슬래시 문자는 허용되지 않습니다.
uDecoder.urlDecode.conversionError=문자셋 [{1}]을(를) 사용하여 [{0}]을(를) 디코드하지 못했습니다.
uDecoder.urlDecode.missingDigit=% 문자 뒤에 두 개의 16진수 숫자들이 이어져야 하기 때문에, [{0}]을(를)
디코드하지 못했습니다.
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
index 22a3fcc..6771997 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
@@ -67,6 +67,8 @@ endpoint.debug.pollerAddDo=Poller에 소켓 [{0}]을(를) 추가합니다.
endpoint.debug.pollerProcess=다음 이벤트(들)을 위해 소켓 [{0}]을(를) 처리합니다: [{1}]
endpoint.debug.pollerRemove=Poller로부터 [{0}]을(를) 제거하려 시도 중
endpoint.debug.pollerRemoved=Poller로부터 [{0}]을(를) 제거했습니다.
+e
[tomcat] branch master updated: Import updated Chinese translations from poeditor.com
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 eedaeab Import updated Chinese translations from poeditor.com
eedaeab is described below
commit eedaeab1b2870dd24c2b40a0d0ad686408c9a05b
Author: Mark Thomas
AuthorDate: Fri Dec 6 10:00:58 2019 +
Import updated Chinese translations from poeditor.com
Contributions provided by lins and 磊
---
java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/realm/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/session/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/valves/LocalStrings_zh_CN.properties| 1 +
java/org/apache/coyote/LocalStrings_zh_CN.properties | 3 +++
java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/http11/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 5 +
java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 1 +
.../org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties | 1 +
webapps/docs/changelog.xml | 4
13 files changed, 22 insertions(+)
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
index f65f96a..c3e7dd8 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+farmWarDeployer.deleteFail=无法删除 [{0}]
farmWarDeployer.hostOnly=FarmWarDeployer 只有做为 host cluster 的子元素是才生效
farmWarDeployer.mbeanNameFail=无法为引擎[{0}]和主机[{1}]构造MBean对象名
farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}]
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index 1065222..eb9540c 100644
--- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
@@ -24,6 +24,7 @@ jaasCallback.username=返回用户名 [{0}]
jaasMemoryLoginModule.invalidCredentials=用户名或密码不正确
jaasMemoryLoginModule.noConfig=无法加载配置文件 [{0}]
+jaasRealm.authenticateFailure=用户 [{0}] 认证失败
jaasRealm.authenticateSuccess=用户名 [{0}] 已被成功认证为身份 [{1}] -- 主体也已创建
jaasRealm.classNotFound=找不到类 [{0}]
jaasRealm.failedLogin=由于登录失败，用户名 [{0}] 无法授权
diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
index df24712..2249786 100644
--- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
@@ -44,6 +44,7 @@ standardManager.managerUnload=卸载会话到持久存储的异常
standardManager.unloading.nosessions=没有要卸载的持久会话
standardSession.attributeEvent=会话属性事件侦听器引发异常
+standardSession.getAttribute.ise=getAttribute: 会话已失效
standardSession.getAttributeNames.ise=getAttributeNames：会话已失效
standardSession.getCreationTime.ise=getCreataionTime：会话已经无效
standardSession.getIdleTime.ise=getIdleTime: 已失效的会话
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index df5c273..cc3c57d 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -88,6 +88,7 @@ hostConfig.deployDescriptor.error=部署描述符[{0}]时出错
hostConfig.deployDescriptor.finished=部署描述符[{0}]的部署已在[{1}]ms内完成
hostConfig.deployDescriptor.localDocBaseSpecified=(:在主机appBase 中指定了docBase
[{0}]，将被忽略
hostConfig.deployDir=把web 应用程序部署到目录 [{0}]
+hostConfig.deployDir.error=无法部署应用目录 [{0}]
hostConfig.deployWar.error=部署 Web 应用程序 archive [{0}] 时出错
hostConfig.deployWar.hiddenDir=将忽略目录[{0}]，因为WAR [{1}]优先，unpackWAR为false
hostConfig.deployWar.threaded.error=等待WAR文件的多线程部署完成时出错
diff --git a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
index ce79add..613cceb 100644
--- a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
@@ -85,6 +85,7 @@ http.511.desc=客户端需要进行身份验证才能获得网络访问权限。
remoteCidrValve.noRemoteIp=客户端没有IP地址。请求被拒绝。
+remoteIpValve.invalidHostHeader=在HTTP请求头[{1}]中发现Host的无效值[{0}]
remoteIpValve.invalidPortHeader=HTTP标头[{1}]中的端口找到的值[{0}]无效
requestFilterValve.configInvalid=为Remote [Addr |
Host]阀门
[tomcat] branch master updated (e6d4afe -> abcb521)
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 e6d4afe Update Korean translations new 37987e1 Import updated Korean translations from poeditor.com (woonsan) new abcb521 Import updated French translations from poeditor.com (remm) 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/core/LocalStrings_fr.properties | 4 java/org/apache/coyote/LocalStrings_fr.properties | 4 java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 2 ++ webapps/docs/changelog.xml | 8 4 files changed, 18 insertions(+) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Import updated French translations from poeditor.com (remm)
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 abcb5215da9db86e2ec9976b11e109a1abc4e2e0
Author: Mark Thomas
AuthorDate: Fri Dec 6 09:54:36 2019 +
Import updated French translations from poeditor.com (remm)
---
java/org/apache/catalina/core/LocalStrings_fr.properties | 4
java/org/apache/coyote/LocalStrings_fr.properties | 4
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 2 ++
webapps/docs/changelog.xml | 4
4 files changed, 14 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index c27b405..cfec4e1 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -94,6 +94,10 @@ aprListener.wrongFIPSMode=Valuer inattendue de l''option
FIPSMode de AprLifecycl
asyncContextImpl.asyncDispachError=Erreur lors d'un dispatch asynchrone
asyncContextImpl.asyncRunnableError=Erreur lors du traitement asynchrone du
Runnable via AsyncContext.start()
asyncContextImpl.dispatchingStarted=Une opération de dispatch asynchrone a
déjà été appelée, plusieurs dispatch au cours d'un même cycle asynchrone n'est
pas autorisé
+asyncContextImpl.fireOnComplete=Déclenchement de l'évènement onComplete() sur
tous les AsyncListeners
+asyncContextImpl.fireOnError=Déclenchement de l'évènement onError() sur tous
les AsyncListeners
+asyncContextImpl.fireOnStartAsync=Déclenchement de l'évènement onStartAsync()
sur tous les AsyncListeners
+asyncContextImpl.fireOnTimeout=Déclenchement de l'évènement onTimeout() sur
tous les AsyncListeners
asyncContextImpl.noAsyncDispatcher=Le Servlet dispatcher retourné par le
ServletContext ne supporte pas de dispatch asynchrone
asyncContextImpl.onCompleteError=L''appel à onComplete() a échoué pour
l''écouteur de type [{0}]
asyncContextImpl.onErrorError=L''appel à onError() a échoué pour l''écouteur
de type [{0}]
diff --git a/java/org/apache/coyote/LocalStrings_fr.properties
b/java/org/apache/coyote/LocalStrings_fr.properties
index 6b19011..2624e77 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -32,6 +32,8 @@ abstractProcessor.pushrequest.notsupported=Le requêtes push
du serveur ne sont
abstractProcessor.socket.ssl=Exception lors de l'obtention des attributs SSL
abstractProtocol.mbeanDeregistrationFailed=Erreur lors du désenregistrement du
mbean [{0}] dans le serveur [{1}]
+abstractProtocol.processorRegisterError=Erreur lors de l'enregistrement du
processeur de requêtes
+abstractProtocol.processorUnregisterError=Erreur lors du désenregistrement du
processeur de requêtes
abstractProtocolHandler.asyncTimeoutError=Erreur de traitement du délai
d'attente maximum en mode asynchrone
abstractProtocolHandler.destroy=Destruction du gestionnaire de protocole [{0}]
@@ -45,6 +47,8 @@ abstractProtocolHandler.stop=Arrêt du gestionnaire de
protocole [{0}]
asyncStateMachine.invalidAsyncState=L''appel à [{0}] n''est pas valide pour
une requête dans l''état Async [{1}]
+compressionConfig.ContentEncodingParseFail=Echec du traitement de l'en-tête
Content-Encoding en vérifiant si la compression était déjà utilisée
+
request.notAsync=Il n'est possible de passer en mode d'entrée-sorties non
bloquantes que lors de traitements asynchrones ou après mise à niveau depuis
HTTP
request.nullReadListener=L'écouteur passé à setReadListener() ne peut pas être
null
request.readListenerSet=L'écouteur des lectures non bloquantes a déjà été
défini
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index f38baab..c94d6f7 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -68,6 +68,8 @@ endpoint.debug.pollerAddDo=Ajout du socket [{0}] au poller
endpoint.debug.pollerProcess=Traitement de(s) évènement(s) [{1}] pour la
socket [{0}]
endpoint.debug.pollerRemove=Essai d''enlever [{0}] du poller
endpoint.debug.pollerRemoved=Enlevé [{0}] du poller
+endpoint.debug.registerRead=Enregistrement de l’intérêt en lecture pour [{0}]
+endpoint.debug.registerWrite=Enregistrement de l’intérêt en écriture pour [{0}]
endpoint.debug.socket=socket [{0}]
endpoint.debug.socketTimeout=Expiration [{0}]
endpoint.debug.unlock.fail=Reçu une exception en essayant de déverrouiller
l''accepteur sur le port [{0}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c271643..0cb6a85 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -189,6 +189,10 @@
Expand the coverage of the Korean translations provided with Apache
Tomcat. (woonsan)
+
+
[tomcat] 01/02: Import updated Korean translations from poeditor.com (woonsan)
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 37987e1523f842ebc7420b5ebc41fce428cd9915 Author: Mark Thomas AuthorDate: Fri Dec 6 09:49:41 2019 + Import updated Korean translations from poeditor.com (woonsan) --- webapps/docs/changelog.xml | 4 1 file changed, 4 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 53a5f78..c271643 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -185,6 +185,10 @@ JAVA_HOME environment variable. Pull request provided by Alexander Norz. (markt) + +Expand the coverage of the Korean translations provided with Apache +Tomcat. (woonsan) + - 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: Remove unused entry
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 2fc2044 Remove unused entry
2fc2044 is described below
commit 2fc2044e1c61c14d9a8f5294d6b2531b33847d91
Author: Mark Thomas
AuthorDate: Fri Dec 6 09:32:46 2019 +
Remove unused entry
---
java/org/apache/catalina/authenticator/LocalStrings.properties| 1 -
java/org/apache/catalina/authenticator/LocalStrings_ko.properties | 1 -
2 files changed, 2 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/LocalStrings.properties
b/java/org/apache/catalina/authenticator/LocalStrings.properties
index 49cfa4e..8cd326f 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings.properties
@@ -65,6 +65,5 @@ singleSignOn.sessionExpire.sessionNotFound=SSO unable to
expire session [{0}] be
spnegoAuthenticator.authHeaderNoToken=The Negotiate authorization header sent
by the client did not include a token
spnegoAuthenticator.authHeaderNotNego=The authorization header sent by the
client did not start with Negotiate
-spnegoAuthenticator.hostnameFail=Unable to determine the host name to
construct the default SPN. Please set the spn attribute of the authenticator.
spnegoAuthenticator.serviceLoginFail=Unable to login as the service principal
spnegoAuthenticator.ticketValidateFail=Failed to validate client supplied
ticket
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
b/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
index e162b94..fa58ec7 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ko.properties
@@ -65,6 +65,5 @@ singleSignOn.sessionExpire.sessionNotFound=세션을 찾을 수 없기 때문에
spnegoAuthenticator.authHeaderNoToken=클라이언트에 의해 전송된 Negotiate authorization
헤더가 토큰을 포함하지 않았습니다.
spnegoAuthenticator.authHeaderNotNego=클라이언트가 보낸 Authorization 헤더가 Negotiate로
시작하지 않았습니다.
-spnegoAuthenticator.hostnameFail=Unable to determine the host name to
construct the default SPN. Please set the spn attribute of the authenticator.
spnegoAuthenticator.serviceLoginFail=서비스 Principal로서 로그인 할 수 없습니다.
spnegoAuthenticator.ticketValidateFail=클라이언트에 의해 제공된 티켓이 유효한지를 확인하지 못했습니다.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Tagging 9.0.x / 8.5.x
Hi, I'm getting close to the point where I'll be ready to tag the next 9.0.x and 8.5.x releases. The remaining items on the TODO list are: - check POEditor for i18n updates - check Commons Pool and friends for updates - BZ 63982 - complete SSI JAR refactoring - some clean-up / refactoring I've been working on for FORM auth - running the unit tests Some of the above are being worked on by others. I'll leave those items to the end to give folks a chance to finish them but I wanted to give a heads up that if it gets to the point where those items are the only things remaining I intend to make the changes myself. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
