[tomcat] branch master updated: Fix credit
This is an automated email from the ASF dual-hosted git repository. remm 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 09a383c Fix credit 09a383c is described below commit 09a383c466afcc9f8de3d2072038804538cb4af9 Author: remm AuthorDate: Wed Nov 6 09:57:42 2019 +0100 Fix credit With TLS, testing is usually the most difficult part. --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index a800015..2d8c84b 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -113,7 +113,7 @@ 63894: Ensure that the configured values for certificateVerification and certificateVerificationDepth are correctly based to the -OpenSSL based SSLEngine implementation. (remm) +OpenSSL based SSLEngine implementation. (remm/markt) - 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: Fix credit
This is an automated email from the ASF dual-hosted git repository. remm 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 7961a4a Fix credit 7961a4a is described below commit 7961a4a278a502c49354e5e01b55a00617528e8f Author: remm AuthorDate: Wed Nov 6 09:57:42 2019 +0100 Fix credit With TLS, testing is usually the most difficult part. --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 415510d..af8946b 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -102,7 +102,7 @@ 63894: Ensure that the configured values for certificateVerification and certificateVerificationDepth are correctly based to the -OpenSSL based SSLEngine implementation. (remm) +OpenSSL based SSLEngine implementation. (remm/markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63898] JSP EL generation is wrong when using newer version of Java 1.8 & tag class uses method overloading and isELIgnored="false
https://bz.apache.org/bugzilla/show_bug.cgi?id=63898 --- Comment #3 from Mark Thomas --- (In reply to Christopher Schultz from comment #2) > Is there scope for Tomcat to either (a) pick the "best" method (based upon > type-agreement) or (b) detect a conflict and throw an error? > > A consistent error would be much better than inconsistent failure/success. Anything is possible but it would require essentially re-implementing the JavaBean Introspection code. The effort required seems out of proportion to the size problem. -- 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 63892] TLS 1.3 with client auth fails with NOT_HANDSHAKING during handshake
https://bz.apache.org/bugzilla/show_bug.cgi?id=63892 --- Comment #11 from Mark Thomas --- (In reply to Christopher Schultz from comment #10) > Again, a wild guess. But it might explain what is happening, here. It doesn't. The failure happens right at the end of the handshake more details of exactly where in the JDK bug report. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4700 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 09a383c466afcc9f8de3d2072038804538cb4af9 Blamelist: remm Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch master updated: Fix credit
On 06/11/2019 08:58, r...@apache.org wrote: > This is an automated email from the ASF dual-hosted git repository. > > remm 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 09a383c Fix credit > 09a383c is described below > > commit 09a383c466afcc9f8de3d2072038804538cb4af9 > Author: remm > AuthorDate: Wed Nov 6 09:57:42 2019 +0100 > > Fix credit > > With TLS, testing is usually the most difficult part. Thanks. That is very generous of you. I thought you did all the hard work. Mark > --- > webapps/docs/changelog.xml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml > index a800015..2d8c84b 100644 > --- a/webapps/docs/changelog.xml > +++ b/webapps/docs/changelog.xml > @@ -113,7 +113,7 @@ > 63894: Ensure that the configured values for > certificateVerification and > certificateVerificationDepth are correctly based to the > -OpenSSL based SSLEngine implementation. (remm) > +OpenSSL based SSLEngine implementation. (remm/markt) > > > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Reformat comment
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 17dc9cc Reformat comment
17dc9cc is described below
commit 17dc9cce6c900846b3be08718668b780289db2c7
Author: Mark Thomas
AuthorDate: Wed Nov 6 09:40:22 2019 +
Reformat comment
---
java/org/apache/jasper/compiler/Generator.java | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index c5678ec..02492ee 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3273,12 +3273,18 @@ class Generator {
}
/*
- * @param c The target class to which to coerce the given string @param
- * s The string value @param attrName The name of the attribute whose
- * value is being supplied @param propEditorClass The property editor
- * for the given attribute @param isNamedAttribute true if the given
- * attribute is a named attribute (that is, specified using the
- * jsp:attribute standard action), and false otherwise
+ * @param c
+ * The target class to which to coerce the given string
+ * @param s
+ * The string value
+ * @param attrName
+ * The name of the attribute whose value is being supplied
+ * @param propEditorClass
+ * The property editor for the given attribute
+ * @param isNamedAttribute
+ * true if the given attribute is a named attribute (that
+ * is, specified using the jsp:attribute standard action),
+ * and false otherwise
*/
private String convertString(Class c, String s, String attrName,
Class propEditorClass, boolean isNamedAttribute) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Correct entry so it makes sense
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 b351ed7 Correct entry so it makes sense b351ed7 is described below commit b351ed7978785eb39aacde5cf20c4daa2a7b95d4 Author: Mark Thomas AuthorDate: Wed Nov 6 09:41:35 2019 + Correct entry so it makes sense --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 2d8c84b..421b323 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -112,7 +112,7 @@ 63894: Ensure that the configured values for certificateVerification and -certificateVerificationDepth are correctly based to the +certificateVerificationDepth are correctly passed to the OpenSSL based SSLEngine implementation. (remm/markt) - 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: Correct entry so it makes sense
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 7a35c15 Correct entry so it makes sense 7a35c15 is described below commit 7a35c15182998ef7cc94929c8e1a5fdfa00d8150 Author: Mark Thomas AuthorDate: Wed Nov 6 09:41:35 2019 + Correct entry so it makes sense --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index af8946b..6a3e1ce 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -101,7 +101,7 @@ 63894: Ensure that the configured values for certificateVerification and -certificateVerificationDepth are correctly based to the +certificateVerificationDepth are correctly passed to the OpenSSL based SSLEngine implementation. (remm/markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63905] ErrorReportValve adds CSS even if both showReport and showServerInfo are set to false
https://bz.apache.org/bugzilla/show_bug.cgi?id=63905 Michael Osipov changed: What|Removed |Added CC||micha...@apache.org --- Comment #1 from Michael Osipov --- The documentation is wrong. If you look at the CSS, you need at least for body and h1. One would need to break up the CSS in parts and include only the required bits. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Remove connections map from APR endpoint
This is an automated email from the ASF dual-hosted git repository.
remm 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 4945083 Remove connections map from APR endpoint
4945083 is described below
commit 49450836423be8ed1d1e3b6a46757f983ede9414
Author: remm
AuthorDate: Wed Nov 6 11:01:43 2019 +0100
Remove connections map from APR endpoint
The connections map from AbstractEndpoint can be used by APR as well,
after refactoring using a key on the socket. Once (if) APR is removed,
this can go back to using the socket wrapper as a key (and value).
AbstractEndpoint.getConnections becomes more costly but it is only used
on pause or destroy.
Also make sure close attempts a full cleanup using a finally to remove
from the connection map and call doClose.
---
.../org/apache/tomcat/util/net/AbstractEndpoint.java | 11 ---
java/org/apache/tomcat/util/net/AprEndpoint.java | 20
java/org/apache/tomcat/util/net/Nio2Endpoint.java| 2 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 2 +-
.../apache/tomcat/util/net/SocketWrapperBase.java| 5 +++--
webapps/docs/changelog.xml | 9 +
6 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index f3f10a4..c96 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -25,6 +25,7 @@ import java.net.SocketException;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -188,12 +189,16 @@ public abstract class AbstractEndpoint {
private ObjectName oname = null;
/**
- * Connection structure holding all current connections.
+ * Map holding all current connections keyed with the sockets (for APR).
*/
-protected Map, SocketWrapperBase> connections =
new ConcurrentHashMap<>();
+protected Map> connections = new
ConcurrentHashMap<>();
+/**
+ * Get a set with the current open connections.
+ * @return A set with the open socket wrappers
+ */
public Set> getConnections() {
-return connections.keySet();
+return new HashSet>(connections.values());
}
// -
Properties
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 5629154..1fefe85 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -27,7 +27,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
@@ -109,9 +108,6 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
protected long sslContext = 0;
-private final Map connections = new
ConcurrentHashMap<>();
-
-
// Constructor
public AprEndpoint() {
@@ -684,7 +680,7 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
log.debug(sm.getString("endpoint.debug.socket", socket));
}
AprSocketWrapper wrapper = new AprSocketWrapper(socket, this);
-super.connections.put(wrapper, wrapper);
+connections.put(socket, wrapper);
wrapper.setKeepAliveLeft(getMaxKeepAliveRequests());
wrapper.setSecure(isSSLEnabled());
wrapper.setReadTimeout(getConnectionTimeout());
@@ -729,7 +725,7 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
* socket should be closed
*/
protected boolean processSocket(long socket, SocketEvent event) {
-AprSocketWrapper socketWrapper = connections.get(Long.valueOf(socket));
+SocketWrapperBase socketWrapper =
connections.get(Long.valueOf(socket));
if (event == SocketEvent.OPEN_READ && socketWrapper.readOperation !=
null) {
return socketWrapper.readOperation.process();
} else if (event == SocketEvent.OPEN_WRITE &&
socketWrapper.writeOperation != null) {
@@ -780,7 +776,7 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
* this directly from a known error condition.
*/
private void destroySocket(long socket) {
-connections.remove(Long.valueOf(socket));
+closeSocket(socket);
if (log.isDebugEnabled()) {
St
[tomcat] branch master updated: Update to CXF 3.3.4
This is an automated email from the ASF dual-hosted git repository. remm 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 eb1d0e8 Update to CXF 3.3.4 eb1d0e8 is described below commit eb1d0e84e7dea7d8db8ba9137840e9efb19f72df Author: remm AuthorDate: Wed Nov 6 11:09:49 2019 +0100 Update to CXF 3.3.4 --- modules/cxf/pom.xml| 2 +- webapps/docs/changelog.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml index 814789b..23eb7e9 100644 --- a/modules/cxf/pom.xml +++ b/modules/cxf/pom.xml @@ -29,7 +29,7 @@ Apache CXF for Apache Tomcat CDI Apache CXF packaged for Apache Tomcat CDI -3.3.3 +3.3.4 jar diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 851b817..ef998a8 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -159,6 +159,9 @@ 63838: Suppress reflexive access warnings when running the unit tests on the command line. (markt) + +Update the CXF module to Apache CXF 3.3.4. (remm) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Remove duplicate put operation
This is an automated email from the ASF dual-hosted git repository.
remm 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 785becd Remove duplicate put operation
785becd is described below
commit 785becd891adc1d07bb695af0790322bbaa97a61
Author: remm
AuthorDate: Wed Nov 6 11:11:31 2019 +0100
Remove duplicate put operation
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 1fefe85..6361756 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -685,7 +685,6 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
wrapper.setSecure(isSSLEnabled());
wrapper.setReadTimeout(getConnectionTimeout());
wrapper.setWriteTimeout(getConnectionTimeout());
-connections.put(socket, wrapper);
getExecutor().execute(new SocketWithOptionsProcessor(wrapper));
return true;
} catch (RejectedExecutionException x) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63905] ErrorReportValve adds CSS even if both showReport and showServerInfo are set to false
https://bz.apache.org/bugzilla/show_bug.cgi?id=63905 --- Comment #2 from Mark Thomas --- For the record: The CSS was removed when showServerInfo and showReport are both false for debatable security reasons as part of bug 58383. The CSS was restored in all cases as part of bug 60490. I have a preference for fixing the docs but am happy to support any reasonable solution that means the behaviour and the docs are consistent. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/03: Fix IDE warning
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 ae8f518e297ec09fa0887ec09748156f534bee3f
Author: Mark Thomas
AuthorDate: Wed Nov 6 11:24:05 2019 +
Fix IDE warning
---
java/org/apache/tomcat/util/net/AbstractEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index c96..8f216c4 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -198,7 +198,7 @@ public abstract class AbstractEndpoint {
* @return A set with the open socket wrappers
*/
public Set> getConnections() {
-return new HashSet>(connections.values());
+return new HashSet<>(connections.values());
}
// -
Properties
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Expand coverage of French translations
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 e765a4d3cf6ba4035f36b450a00406daa296d0c9
Author: Mark Thomas
AuthorDate: Wed Nov 6 11:34:57 2019 +
Expand coverage of French translations
---
java/org/apache/tomcat/util/compat/LocalStrings_fr.properties | 2 ++
webapps/docs/changelog.xml| 4
2 files changed, 6 insertions(+)
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
index 1f7543c..998e08b 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
@@ -14,6 +14,8 @@
# limitations under the License.
jre9Compat.invalidModuleUri=L''URI du module fournie [{0}] n''a pas pu être
convertie en URL pour être traitée par le JarScanner
+jre9Compat.javaPre9=Le code est considéré être exécuté sur une JVM antérieure
à Java 9 car la classe n'a pas été trouvée
+jre9Compat.unexpected=Impossible de créer les références vers les classes et
méthodes de Java 9
jreCompat.noApplicationProtocol=Le Java Runtime utilisé ne supporte pas
SSLEngine.getApplicationProtocol(). Il faut Java 9 pour utiliser cette option.
jreCompat.noApplicationProtocols=L'environnement Java ne supporte pas
SSLParameters.setApplicationProtocols(), cette fonctionnalité demande Java 9
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ef998a8..5a68147 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -162,6 +162,10 @@
Update the CXF module to Apache CXF 3.3.4. (remm)
+
+Expand the coverage and quality 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/03: Fix typo
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 2a9b0fe06c243974b398a9087ac83aa91986667b
Author: Mark Thomas
AuthorDate: Wed Nov 6 11:28:29 2019 +
Fix typo
---
java/org/apache/coyote/LocalStrings.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/LocalStrings.properties
b/java/org/apache/coyote/LocalStrings.properties
index 6eb6dc5..4dddf71 100644
--- a/java/org/apache/coyote/LocalStrings.properties
+++ b/java/org/apache/coyote/LocalStrings.properties
@@ -48,7 +48,7 @@ abstractProtocolHandler.stop=Stopping ProtocolHandler [{0}]
asyncStateMachine.invalidAsyncState=Calling [{0}] is not valid for a request
with Async state [{1}]
-compressionConfig.ContentEncodingParseFail=Failed to parse Content-Encoding
header when chekcing to see if compression was already in use
+compressionConfig.ContentEncodingParseFail=Failed to parse Content-Encoding
header when checking to see if compression was already in use
request.notAsync=It is only valid to switch to non-blocking IO within async
processing or HTTP upgrade processing
request.nullReadListener=The listener passed to setReadListener() may not be
null
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (785becd -> e765a4d)
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 785becd Remove duplicate put operation new ae8f518 Fix IDE warning new 2a9b0fe Fix typo new e765a4d Expand coverage of French translations The 3 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/coyote/LocalStrings.properties| 2 +- java/org/apache/tomcat/util/compat/LocalStrings_fr.properties | 2 ++ java/org/apache/tomcat/util/net/AbstractEndpoint.java | 2 +- webapps/docs/changelog.xml| 4 4 files changed, 8 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63905] ErrorReportValve adds CSS even if both showReport and showServerInfo are set to false
https://bz.apache.org/bugzilla/show_bug.cgi?id=63905 --- Comment #3 from Michael Osipov --- (In reply to Mark Thomas from comment #2) > For the record: > > The CSS was removed when showServerInfo and showReport are both false for > debatable security reasons as part of bug 58383. Are you certain? That does not look related?! > The CSS was restored in all cases as part of bug 60490. > > I have a preference for fixing the docs but am happy to support any > reasonable solution that means the behaviour and the docs are consistent. Even if you fix the docs, as least a minimal CSS is required. What we can do is to reduce the CSS for starters: * is never used * Setting font-family should be done at best once in the body * background color #525D76 should be done once too I will take care of this, but at low priority. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (e765a4d -> 47de9b2)
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 e765a4d Expand coverage of French translations
new a8defb1 Fix typos in Japanese translations.
new 47de9b2 Expand coverage and quality of Simplified Chinese translations
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/javax/el/LocalStrings_zh_CN.properties| 4 +--
java/javax/servlet/LocalStrings_zh_CN.properties | 3 ++
.../servlet/http/LocalStrings_zh_CN.properties | 1 +
.../authenticator/LocalStrings_zh_CN.properties| 7 +
.../jaspic/LocalStrings_zh_CN.properties | 1 +
.../connector/LocalStrings_zh_CN.properties| 9 ++
.../catalina/core/LocalStrings_zh_CN.properties| 33 ++
.../catalina/filters/LocalStrings_zh_CN.properties | 12
.../backend}/LocalStrings_zh_CN.properties | 2 +-
.../ha/deploy/LocalStrings_zh_CN.properties| 3 ++
.../ha/session/LocalStrings_zh_CN.properties | 10 +++
.../catalina/loader/LocalStrings_zh_CN.properties | 5
.../catalina/mapper/LocalStrings_zh_CN.properties | 3 ++
.../catalina/mbeans/LocalStrings_zh_CN.properties | 2 ++
.../catalina/realm/LocalStrings_zh_CN.properties | 9 ++
.../servlets/LocalStrings_zh_CN.properties | 2 ++
.../catalina/session/LocalStrings_zh_CN.properties | 10 +++
.../LocalStrings_zh_CN.properties | 2 +-
.../catalina/startup/LocalStrings_zh_CN.properties | 15 ++
.../storeconfig/LocalStrings_zh_CN.properties | 7 +
.../tribes/group/LocalStrings_zh_CN.properties | 4 +++
.../interceptors/LocalStrings_zh_CN.properties | 4 +++
.../membership/LocalStrings_zh_CN.properties | 12 +++-
.../tribes/tipis/LocalStrings_zh_CN.properties | 6
.../transport/bio/LocalStrings_zh_CN.properties| 4 +++
.../transport/nio/LocalStrings_zh_CN.properties| 5
.../tribes/util/LocalStrings_zh_CN.properties | 1 +
.../catalina/util/LocalStrings_zh_CN.properties| 6
.../catalina/valves/LocalStrings_zh_CN.properties | 16 +++
.../rewrite}/LocalStrings_zh_CN.properties | 2 +-
.../webresources/LocalStrings_zh_CN.properties | 7 +
.../apache/coyote/LocalStrings_zh_CN.properties| 3 ++
.../coyote/ajp/LocalStrings_zh_CN.properties | 1 +
.../coyote/http11/LocalStrings_zh_CN.properties| 5
.../http11/filters/LocalStrings_zh_CN.properties | 1 +
.../http11/upgrade/LocalStrings_zh_CN.properties | 4 +++
.../coyote/http2/LocalStrings_zh_CN.properties | 18
.../jasper/resources/LocalStrings_zh_CN.properties | 25
.../apache/naming/LocalStrings_zh_CN.properties| 4 +++
.../naming/factory/LocalStrings_zh_CN.properties | 5
.../tomcat/util/LocalStrings_zh_CN.properties | 1 +
.../tomcat/util/buf/LocalStrings_zh_CN.properties | 5
.../util/compat/LocalStrings_zh_CN.properties | 2 ++
.../util/descriptor}/LocalStrings_zh_CN.properties | 2 +-
.../descriptor/web/LocalStrings_zh_CN.properties | 10 +++
.../util/digester/LocalStrings_ja.properties | 4 +--
.../util/digester/LocalStrings_zh_CN.properties| 2 +-
.../tomcat/util/http/LocalStrings_zh_CN.properties | 5
.../util/http/parser/LocalStrings_zh_CN.properties | 3 ++
.../util/json}/LocalStrings_zh_CN.properties | 2 +-
.../tomcat/util/net/LocalStrings_zh_CN.properties | 19 -
.../util/net/jsse/LocalStrings_zh_CN.properties| 1 +
.../util/net/openssl/LocalStrings_zh_CN.properties | 3 ++
.../tomcat/util/scan/LocalStrings_zh_CN.properties | 1 +
.../tomcat/websocket/LocalStrings_zh_CN.properties | 17 +++
.../websocket/pojo/LocalStrings_zh_CN.properties | 6
.../websocket/server/LocalStrings_zh_CN.properties | 5
webapps/docs/changelog.xml | 10 +++
.../WEB-INF/classes/LocalStrings_zh_CN.properties | 1 +
59 files changed, 360 insertions(+), 12 deletions(-)
copy java/org/apache/catalina/{storeconfig =>
ha/backend}/LocalStrings_zh_CN.properties (93%)
copy java/org/apache/catalina/{storeconfig =>
ssi}/LocalStrings_zh_CN.properties (93%)
copy java/org/apache/catalina/{storeconfig =>
valves/rewrite}/LocalStrings_zh_CN.properties (93%)
copy java/org/apache/{catalina/ha/authenticator =>
tomcat/util/descriptor}/LocalStrings_zh_CN.properties (86%)
copy java/org/apache/{catalina/storeconfig =>
tomcat/util/json}/LocalStrings_zh_CN.properties (92%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additi
[tomcat] 02/02: Expand coverage and quality of Simplified Chinese translations
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 47de9b28021a5796d0b177821f5a892d5952acd5
Author: Mark Thomas
AuthorDate: Wed Nov 6 11:46:56 2019 +
Expand coverage and quality of Simplified Chinese translations
Contributions provided by rpo130, Mason Shen, leeyazhou, winsonzhao,
qingshi huang, Lay and Shucheng Hou.
---
java/javax/el/LocalStrings_zh_CN.properties| 4 +--
java/javax/servlet/LocalStrings_zh_CN.properties | 3 ++
.../servlet/http/LocalStrings_zh_CN.properties | 1 +
.../authenticator/LocalStrings_zh_CN.properties| 7 +
.../jaspic/LocalStrings_zh_CN.properties | 1 +
.../connector/LocalStrings_zh_CN.properties| 9 ++
.../catalina/core/LocalStrings_zh_CN.properties| 33 ++
.../catalina/filters/LocalStrings_zh_CN.properties | 12
.../backend}/LocalStrings_zh_CN.properties | 2 +-
.../ha/deploy/LocalStrings_zh_CN.properties| 3 ++
.../ha/session/LocalStrings_zh_CN.properties | 10 +++
.../catalina/loader/LocalStrings_zh_CN.properties | 5
.../catalina/mapper/LocalStrings_zh_CN.properties | 3 ++
.../catalina/mbeans/LocalStrings_zh_CN.properties | 2 ++
.../catalina/realm/LocalStrings_zh_CN.properties | 9 ++
.../servlets/LocalStrings_zh_CN.properties | 2 ++
.../catalina/session/LocalStrings_zh_CN.properties | 10 +++
.../LocalStrings_zh_CN.properties | 2 +-
.../catalina/startup/LocalStrings_zh_CN.properties | 15 ++
.../storeconfig/LocalStrings_zh_CN.properties | 7 +
.../tribes/group/LocalStrings_zh_CN.properties | 4 +++
.../interceptors/LocalStrings_zh_CN.properties | 4 +++
.../membership/LocalStrings_zh_CN.properties | 12 +++-
.../tribes/tipis/LocalStrings_zh_CN.properties | 6
.../transport/bio/LocalStrings_zh_CN.properties| 4 +++
.../transport/nio/LocalStrings_zh_CN.properties| 5
.../tribes/util/LocalStrings_zh_CN.properties | 1 +
.../catalina/util/LocalStrings_zh_CN.properties| 6
.../catalina/valves/LocalStrings_zh_CN.properties | 16 +++
.../rewrite}/LocalStrings_zh_CN.properties | 2 +-
.../webresources/LocalStrings_zh_CN.properties | 7 +
.../apache/coyote/LocalStrings_zh_CN.properties| 3 ++
.../coyote/ajp/LocalStrings_zh_CN.properties | 1 +
.../coyote/http11/LocalStrings_zh_CN.properties| 5
.../http11/filters/LocalStrings_zh_CN.properties | 1 +
.../http11/upgrade/LocalStrings_zh_CN.properties | 4 +++
.../coyote/http2/LocalStrings_zh_CN.properties | 18
.../jasper/resources/LocalStrings_zh_CN.properties | 25
.../apache/naming/LocalStrings_zh_CN.properties| 4 +++
.../naming/factory/LocalStrings_zh_CN.properties | 5
.../tomcat/util/LocalStrings_zh_CN.properties | 1 +
.../tomcat/util/buf/LocalStrings_zh_CN.properties | 5
.../util/compat/LocalStrings_zh_CN.properties | 2 ++
.../util/descriptor}/LocalStrings_zh_CN.properties | 2 +-
.../descriptor/web/LocalStrings_zh_CN.properties | 10 +++
.../util/digester/LocalStrings_zh_CN.properties| 2 +-
.../tomcat/util/http/LocalStrings_zh_CN.properties | 5
.../util/http/parser/LocalStrings_zh_CN.properties | 3 ++
.../util/json}/LocalStrings_zh_CN.properties | 2 +-
.../tomcat/util/net/LocalStrings_zh_CN.properties | 19 -
.../util/net/jsse/LocalStrings_zh_CN.properties| 1 +
.../util/net/openssl/LocalStrings_zh_CN.properties | 3 ++
.../tomcat/util/scan/LocalStrings_zh_CN.properties | 1 +
.../tomcat/websocket/LocalStrings_zh_CN.properties | 17 +++
.../websocket/pojo/LocalStrings_zh_CN.properties | 6
.../websocket/server/LocalStrings_zh_CN.properties | 5
webapps/docs/changelog.xml | 6
.../WEB-INF/classes/LocalStrings_zh_CN.properties | 1 +
58 files changed, 354 insertions(+), 10 deletions(-)
diff --git a/java/javax/el/LocalStrings_zh_CN.properties
b/java/javax/el/LocalStrings_zh_CN.properties
index 99ab703..7b409ee 100644
--- a/java/javax/el/LocalStrings_zh_CN.properties
+++ b/java/javax/el/LocalStrings_zh_CN.properties
@@ -28,7 +28,7 @@ expressionFactory.readFailed=无法读取[{0}]
importHandler.ambiguousImport=无法导入类[{0}]，因为它与已导入的[{1}]冲突
importHandler.ambiguousStaticImport=无法处理静态导入[{0}]，因为它与已导入的[{1}]冲突
importHandler.classNotFound=无法导入类[{0}]，因为无法找到它
-importHandler.invalidClass=类[{0}]必须是公共的和非抽象的，并且不能是接口
+importHandler.invalidClass=类[{0}]必须是公共的、非抽象的、非接口且（对于Java 9+）在一个导出包
importHandler.invalidClassNameForStatic=为 static import [{1}] 指定的类 [{0}] 不可用
importHandler.invalidStaticName=导入 [{0}] 的静态方法或字段名称必须包含类
importHandler.staticNotFound=导入[{2}]的类[{1}]中找不到静态导入[{0}]
@@ -43,7 +43,7 @@ propertyReadError=在类型[{0}]上读取[{1}]时出错
propertyWri
[tomcat] 01/02: Fix typos in Japanese translations.
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 a8defb18dd570d30ac0ca873e2c1bbe24a6bb04a
Author: Mark Thomas
AuthorDate: Wed Nov 6 11:40:58 2019 +
Fix typos in Japanese translations.
Patch provided by motohashi.yuki
---
java/org/apache/tomcat/util/digester/LocalStrings_ja.properties | 4 ++--
webapps/docs/changelog.xml | 4
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/digester/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/digester/LocalStrings_ja.properties
index 1726592..c17b7df 100644
--- a/java/org/apache/tomcat/util/digester/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/digester/LocalStrings_ja.properties
@@ -28,9 +28,9 @@ digester.noLocator=ロケータを利用できません。
digester.noRulesFound=[{0}]と一致するルールは見つかりませんでした。
digester.parseError=行[{0}]の列[{1}]のエラー解析
digester.parseErrorFatal=行[{0}]の列[{1}]で致命的なエラーを解析します。
-digester.parseWarning=行番号 [{0}] 列番号 [{1]] の解釈中に警告が発生しました。
+digester.parseWarning=行番号 [{0}] 列番号 [{1}] の解釈中に警告が発生しました。
digester.propertySourceLoadError=プロパティソースクラス [{0}] の読み込み中に異常が発生しました。
rule.createError=オブジェクトの作成中にエラーが発生しました: [{0}]
rule.noClassName=[{0}] [{1}]に指定されたクラス名がありません。
-rule.noProperty=マッチしたパターン [{0}] でプロパティ [[1}] に [{2}] を設定できません。
+rule.noProperty=マッチしたパターン [{0}] でプロパティ [{1}] に [{2}] を設定できません。
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5a68147..7688893 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -166,6 +166,10 @@
Expand the coverage and quality of the French translations provided
with Apache Tomcat. (remm)
+
+Expand the coverage and quality of the Japanese translations provided
+with Apache Tomcat. Patch provided by motohashi.yuki. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Remove unnecessary trailing space
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 7dca58a Remove unnecessary trailing space
7dca58a is described below
commit 7dca58ab94f97776974cb50333b892dd54115c10
Author: Mark Thomas
AuthorDate: Wed Nov 6 11:48:20 2019 +
Remove unnecessary trailing space
---
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
index b727c02..202b764 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -32,7 +32,7 @@ endpoint.apr.applyConf=正将OpenSSLConfCmd应用在SSL Context上。
endpoint.apr.checkConf=检查配置OpenSSLConf
endpoint.apr.errApplyConf=不能对SSL上下文应用OpenSSLConf 配置
endpoint.apr.errMakeConf=无法创建OpenSSLConf 上下文
-endpoint.apr.failSslContextMake=无法创建SSLContext。检查AprLifecycleListener中的SSLEngine
是否已启用，AprLifecycleListener是否已正确初始化，以及是否已指定有效的SSLProtocol
+endpoint.apr.failSslContextMake=无法创建SSLContext。检查AprLifecycleListener中的SSLEngine
是否已启用，AprLifecycleListener是否已正确初始化，以及是否已指定有效的SSLProtocol
endpoint.apr.invalidSslProtocol=为SSLProtocol属性提供了无效值[{0}]
endpoint.apr.maxConnections.running=):APR终结点在运行时不支持MaxConnections的设置。[{0}]的现有值将继续使用。
endpoint.apr.maxConnections.unlimited=APR终结点不支持无限连接。[{0}]的现有值将继续使用。
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Expand coverage and quality of Brazilian Portuguese translations
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 8dc6c1f Expand coverage and quality of Brazilian Portuguese
translations
8dc6c1f is described below
commit 8dc6c1f630005c43b9ed802bd3d6d87a00aa0b23
Author: Mark Thomas
AuthorDate: Wed Nov 6 11:54:57 2019 +
Expand coverage and quality of Brazilian Portuguese translations
Contribution by Danielamorais
---
java/javax/el/LocalStrings_pt_BR.properties | 5 +
.../catalina/tribes/transport/bio/LocalStrings_pt_BR.properties | 2 ++
java/org/apache/catalina/util/LocalStrings_pt_BR.properties | 2 +-
webapps/docs/changelog.xml | 4
4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/java/javax/el/LocalStrings_pt_BR.properties
b/java/javax/el/LocalStrings_pt_BR.properties
index e3593fa..a31dbbb 100644
--- a/java/javax/el/LocalStrings_pt_BR.properties
+++ b/java/javax/el/LocalStrings_pt_BR.properties
@@ -13,4 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+beanNameELResolver.beanReadOnly=O nome do bean [{0}] é apenas para leitura
+
+elProcessor.defineFunctionInvalidClass=A classe [{0}] não possui visibilidade
pública
+elProcessor.defineFunctionInvalidMethod=O método [{0}] da classe [{1}] não é
um método público e estático
+
importHandler.invalidClassNameForStatic=A classe [{0}] especificada para o
import estático [{1}] é inválida
diff --git
a/java/org/apache/catalina/tribes/transport/bio/LocalStrings_pt_BR.properties
b/java/org/apache/catalina/tribes/transport/bio/LocalStrings_pt_BR.properties
index ec7ffb9..a56f384 100644
---
a/java/org/apache/catalina/tribes/transport/bio/LocalStrings_pt_BR.properties
+++
b/java/org/apache/catalina/tribes/transport/bio/LocalStrings_pt_BR.properties
@@ -13,4 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+bioReceiver.socket.closeFailed=Falha ao encerrar a conexão do socket
+
bioSender.send.again=Enviar dados novamente para [{0}:{1,number,integer}]
diff --git a/java/org/apache/catalina/util/LocalStrings_pt_BR.properties
b/java/org/apache/catalina/util/LocalStrings_pt_BR.properties
index 1ee865d..aa8cad4 100644
--- a/java/org/apache/catalina/util/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/util/LocalStrings_pt_BR.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-customObjectInputStream.nomatch=A classe [{0}] não casou com a expressão
regular [{1}] para classes permitidas para deserialização
+customObjectInputStream.nomatch=A classe [{0}] não combina com a expressão
regular [{1}] para classes permitidas para deserialização
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e20ca1c..5494849 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -176,6 +176,10 @@
Shen, leeyazhou, winsonzhao, qingshi huang, Lay and Shucheng Hou.
(markt)
+
+Expand the coverage and quality of the Brazilian Portuguese
translations
+provided with Apache Tomcat. Patch provided by Danielamorais. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] dedovich-s opened a new pull request #222: EmbeddedServletOptions constructor has been refactored
dedovich-s opened a new pull request #222: EmbeddedServletOptions constructor has been refactored URL: https://github.com/apache/tomcat/pull/222 Each value initializing moved to appropriate private method This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/05: Fix typos
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 7cb3e16974ac25c1aa1ac9a40a17c7bbd712a244
Author: Mark Thomas
AuthorDate: Wed Nov 6 12:07:11 2019 +
Fix typos
---
java/org/apache/catalina/tribes/tipis/LocalStrings.properties | 6 +++---
java/org/apache/coyote/LocalStrings.properties | 2 +-
java/org/apache/tomcat/util/http/parser/LocalStrings.properties | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
b/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
index 5aff1d7..604c31b 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
@@ -29,10 +29,10 @@ abstractReplicatedMap.relocate.complete=Relocation of map
entries was complete i
abstractReplicatedMap.transferState.noReplies=Transfer state, 0 replies,
probably a timeout.
abstractReplicatedMap.unable.deserialize.MapMessage=Unable to deserialize
MapMessage.
abstractReplicatedMap.unable.diffObject=Unable to diff object. Will replicate
the entire object instead.
-abstractReplicatedMap.unable.get=Unable to replicate out data for a
AbstractReplicatedMap.get operation
-abstractReplicatedMap.unable.put=Unable to replicate out data for a
AbstractReplicatedMap.put operation
+abstractReplicatedMap.unable.get=Unable to replicate out data for an
AbstractReplicatedMap.get operation
+abstractReplicatedMap.unable.put=Unable to replicate out data for an
AbstractReplicatedMap.put operation
abstractReplicatedMap.unable.relocate=Unable to relocate[{0}] to a new backup
node
-abstractReplicatedMap.unable.remove=Unable to replicate out data for a
AbstractReplicatedMap.remove operation
+abstractReplicatedMap.unable.remove=Unable to replicate out data for an
AbstractReplicatedMap.remove operation
abstractReplicatedMap.unable.replicate=Unable to replicate data.
abstractReplicatedMap.unable.retrieve=Unable to retrieve remote object for
key:[{0}]
abstractReplicatedMap.unable.transferState=Unable to transfer
AbstractReplicatedMap state.
diff --git a/java/org/apache/coyote/LocalStrings.properties
b/java/org/apache/coyote/LocalStrings.properties
index 29d2e41..4c59741 100644
--- a/java/org/apache/coyote/LocalStrings.properties
+++ b/java/org/apache/coyote/LocalStrings.properties
@@ -50,7 +50,7 @@ abstractProtocolHandler.stopError=Failed to stop end point
associated with Proto
asyncStateMachine.invalidAsyncState=Calling [{0}] is not valid for a request
with Async state [{1}]
-compressionConfig.ContentEncodingParseFail=Failed to parse Content-Encoding
header when chekcing to see if compression was already in use
+compressionConfig.ContentEncodingParseFail=Failed to parse Content-Encoding
header when checking to see if compression was already in use
request.notAsync=It is only valid to switch to non-blocking IO within async
processing or HTTP upgrade processing
request.nullReadListener=The listener passed to setReadListener() may not be
null
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
b/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
index e9d54bb..8421e4f 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
@@ -29,7 +29,7 @@ http.illegalCharacterIpv6=The character [{0}] is never valid
in an IPv6 address.
http.invalidCharacterDomain=The character [{0}] is not valid{1} a domain name.
http.invalidHextet=Invalid hextet. A hextet must consist of 4 or less hex
characters.
http.invalidIpv4Location=The IPv6 address contains an embedded IPv4 address at
an invalid location.
-http.invalidLeadingZero=An non-zero IPv4 octet may not contain a leading zero.
+http.invalidLeadingZero=A non-zero IPv4 octet may not contain a leading zero.
http.invalidOctet=Invalid octet [{0}]. The valid range for IPv4 octets is 0 to
255.
http.invalidRequestTargetCharacter=Character [{0}] is not allowed and will
continue to be rejected.
http.invalidSegmentEndState=The state [{0}] is not valid for the end of a
segment.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/05: Back-port Korean updates
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 9cbd83750b1299521496ae0211b6caa02965f7bc
Author: Mark Thomas
AuthorDate: Wed Nov 6 12:09:25 2019 +
Back-port Korean updates
---
java/org/apache/tomcat/util/compat/LocalStrings_ko.properties | 2 ++
java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties | 1 -
webapps/docs/changelog.xml | 4
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
index d2c02eb..c24992f 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
@@ -14,6 +14,8 @@
# limitations under the License.
jre9Compat.invalidModuleUri=[{0}](으)로 제공된 모듈 URI는 JarScanner가 처리할 수 있는 URL로
변환될 수 없습니다.
+jre9Compat.javaPre9=Java 9 클래스가 발견되지 않습니다. Java 9 이전 버전에서 동작하고 있는 것으로 보입니다.
+jre9Compat.unexpected=Java 9 클래스들과 메소드들을 참조할 수 없습니다.
jreCompat.noApplicationProtocol=자바 런타임이 SSLEngine.getApplicationProtocol()을
지원하지 않습니다. 이 기능을 사용하려면 Java 9를 사용해야 합니다.
jreCompat.noApplicationProtocols=자바 런타임이
SSLParameters.setApplicationProtocols()을 지원하지 않습니다. 이 기능을 사용하려면 Java 9를 사용해야
합니다.
diff --git a/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties
b/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties
index ffcf3fd..02b04cc 100644
--- a/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties
@@ -15,4 +15,3 @@
modules.digesterParseError=레지스트리 데이터를 파싱하는 중 오류 발생
modules.readDescriptorsError=Descriptor들을 읽는 중 오류 발생
-
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a3b959c..7e20e16 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -151,6 +151,10 @@
Expand the coverage and quality of the French translations provided
with Apache Tomcat. (remm)
+
+Expand the coverage and quality 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] 03/05: Remove unnecessary blank line
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 a327dd74c58f491afeff566101c72512e140fc9f Author: Mark Thomas AuthorDate: Wed Nov 6 12:08:16 2019 + Remove unnecessary blank line --- java/org/apache/tomcat/util/modeler/LocalStrings_ja.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/java/org/apache/tomcat/util/modeler/LocalStrings_ja.properties b/java/org/apache/tomcat/util/modeler/LocalStrings_ja.properties index 21c9711..8ce4c81 100644 --- a/java/org/apache/tomcat/util/modeler/LocalStrings_ja.properties +++ b/java/org/apache/tomcat/util/modeler/LocalStrings_ja.properties @@ -15,4 +15,3 @@ modules.digesterParseError=レジストリデータの解析エラー modules.readDescriptorsError=ディスクリプタ読み取り中のエラー - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/05: Expand coverage and quality of Simplified Chinese translations
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 d4d994225bf16489ef5bcde1e5d0b399f030f625
Author: Mark Thomas
AuthorDate: Wed Nov 6 12:12:15 2019 +
Expand coverage and quality of Simplified Chinese translations
Contributions provided by rpo130, Mason Shen, leeyazhou, winsonzhao,
qingshi huang, Lay and Shucheng Hou.
---
java/javax/el/LocalStrings_zh_CN.properties| 4 +--
.../servlet/http/LocalStrings_zh_CN.properties | 1 +
.../authenticator/LocalStrings_zh_CN.properties| 7 +
.../jaspic/LocalStrings_zh_CN.properties | 1 +
.../connector/LocalStrings_zh_CN.properties| 9 ++
.../catalina/core/LocalStrings_zh_CN.properties| 32 ++
.../catalina/filters/LocalStrings_zh_CN.properties | 15 --
.../ha/deploy/LocalStrings_zh_CN.properties| 3 ++
.../ha/session/LocalStrings_zh_CN.properties | 10 +++
.../catalina/loader/LocalStrings_zh_CN.properties | 5
.../manager/host/LocalStrings_zh_CN.properties | 2 +-
.../catalina/mapper/LocalStrings_zh_CN.properties | 2 ++
.../catalina/mbeans/LocalStrings_zh_CN.properties | 2 ++
.../catalina/realm/LocalStrings_zh_CN.properties | 5
.../servlets/LocalStrings_zh_CN.properties | 2 ++
.../catalina/session/LocalStrings_zh_CN.properties | 8 ++
.../catalina/startup/LocalStrings_zh_CN.properties | 13 +
.../tribes/group/LocalStrings_zh_CN.properties | 4 +++
.../interceptors/LocalStrings_zh_CN.properties | 4 +++
.../membership/LocalStrings_zh_CN.properties | 11 +++-
.../tribes/tipis/LocalStrings_zh_CN.properties | 5
.../transport/bio/LocalStrings_zh_CN.properties| 4 +++
.../transport/nio/LocalStrings_zh_CN.properties| 5
.../tribes/util/LocalStrings_zh_CN.properties | 1 +
.../catalina/util/LocalStrings_zh_CN.properties| 6
.../catalina/valves/LocalStrings_zh_CN.properties | 15 ++
.../valves/rewrite}/LocalStrings_zh_CN.properties | 3 +-
.../webresources/LocalStrings_zh_CN.properties | 7 +
.../apache/coyote/LocalStrings_zh_CN.properties| 3 ++
.../coyote/ajp/LocalStrings_zh_CN.properties | 1 +
.../coyote/http11/LocalStrings_zh_CN.properties| 5
.../http11/filters/LocalStrings_zh_CN.properties | 1 +
.../http11/upgrade/LocalStrings_zh_CN.properties | 4 +++
.../coyote/http2/LocalStrings_zh_CN.properties | 17
.../jasper/resources/LocalStrings_zh_CN.properties | 31 ++---
.../apache/naming/LocalStrings_zh_CN.properties| 4 +++
.../naming/factory/LocalStrings_zh_CN.properties | 5
.../tomcat/util/LocalStrings_zh_CN.properties | 1 +
.../tomcat/util/buf/LocalStrings_zh_CN.properties | 5
.../util/compat/LocalStrings_zh_CN.properties | 2 ++
.../LocalStrings_zh_CN.properties | 3 +-
.../descriptor/web/LocalStrings_zh_CN.properties | 10 +++
.../tomcat/util/http/LocalStrings_zh_CN.properties | 5
.../util/http/parser/LocalStrings_zh_CN.properties | 3 ++
.../util/modeler/LocalStrings_zh_CN.properties | 1 -
.../tomcat/util/net/LocalStrings_zh_CN.properties | 19 -
.../util/net/jsse/LocalStrings_zh_CN.properties| 1 +
.../util/net/openssl/LocalStrings_zh_CN.properties | 4 +++
.../tomcat/util/scan/LocalStrings_zh_CN.properties | 1 +
.../tomcat/websocket/LocalStrings_zh_CN.properties | 17
.../websocket/pojo/LocalStrings_zh_CN.properties | 6
.../websocket/server/LocalStrings_zh_CN.properties | 6
webapps/docs/changelog.xml | 6
.../WEB-INF/classes/LocalStrings_zh_CN.properties | 1 +
54 files changed, 332 insertions(+), 16 deletions(-)
diff --git a/java/javax/el/LocalStrings_zh_CN.properties
b/java/javax/el/LocalStrings_zh_CN.properties
index 99ab703..7b409ee 100644
--- a/java/javax/el/LocalStrings_zh_CN.properties
+++ b/java/javax/el/LocalStrings_zh_CN.properties
@@ -28,7 +28,7 @@ expressionFactory.readFailed=无法读取[{0}]
importHandler.ambiguousImport=无法导入类[{0}]，因为它与已导入的[{1}]冲突
importHandler.ambiguousStaticImport=无法处理静态导入[{0}]，因为它与已导入的[{1}]冲突
importHandler.classNotFound=无法导入类[{0}]，因为无法找到它
-importHandler.invalidClass=类[{0}]必须是公共的和非抽象的，并且不能是接口
+importHandler.invalidClass=类[{0}]必须是公共的、非抽象的、非接口且（对于Java 9+）在一个导出包
importHandler.invalidClassNameForStatic=为 static import [{1}] 指定的类 [{0}] 不可用
importHandler.invalidStaticName=导入 [{0}] 的静态方法或字段名称必须包含类
importHandler.staticNotFound=导入[{2}]的类[{1}]中找不到静态导入[{0}]
@@ -43,7 +43,7 @@ propertyReadError=在类型[{0}]上读取[{1}]时出错
propertyWriteError=在类型[{0}]上写入[{1}]时出错
staticFieldELResolver.methodNotFound=在类[{1}]上找不到名为[{0}]的匹配的公共静态方法
-staticFieldELResolver.notFound=在类[{1}]上找不到名为[{0}]的公共静态字段
+staticFieldELResolver.notFound=（Java 9+导出）类[{1}]上找不到名为[{0}]的公共静态字段
staticFieldELRes
[tomcat] 02/05: Expand coverage of French translations
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 ff139be4fbe5f38b5ff3eddc419f4e4a9b14788a
Author: Mark Thomas
AuthorDate: Wed Nov 6 12:07:56 2019 +
Expand coverage of French translations
---
java/org/apache/tomcat/util/compat/LocalStrings_fr.properties | 2 ++
java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties | 1 -
webapps/docs/changelog.xml | 4
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
index 1f7543c..998e08b 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
@@ -14,6 +14,8 @@
# limitations under the License.
jre9Compat.invalidModuleUri=L''URI du module fournie [{0}] n''a pas pu être
convertie en URL pour être traitée par le JarScanner
+jre9Compat.javaPre9=Le code est considéré être exécuté sur une JVM antérieure
à Java 9 car la classe n'a pas été trouvée
+jre9Compat.unexpected=Impossible de créer les références vers les classes et
méthodes de Java 9
jreCompat.noApplicationProtocol=Le Java Runtime utilisé ne supporte pas
SSLEngine.getApplicationProtocol(). Il faut Java 9 pour utiliser cette option.
jreCompat.noApplicationProtocols=L'environnement Java ne supporte pas
SSLParameters.setApplicationProtocols(), cette fonctionnalité demande Java 9
diff --git a/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties
index 30d80ca..72e6018 100644
--- a/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties
@@ -15,4 +15,3 @@
modules.digesterParseError=Erreur lors de l'analyse des données du registre
modules.readDescriptorsError=Erreur lors de la lecture des descripteurs
-
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6a3e1ce..a3b959c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -147,6 +147,10 @@
63838: Suppress reflexive access warnings when running the
unit tests on the command line. (markt)
+
+Expand the coverage and quality 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] branch 8.5.x updated (7a35c15 -> d4d9942)
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 7a35c15 Correct entry so it makes sense
new 7cb3e16 Fix typos
new ff139be Expand coverage of French translations
new a327dd7 Remove unnecessary blank line
new 9cbd837 Back-port Korean updates
new d4d9942 Expand coverage and quality of Simplified Chinese translations
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:
java/javax/el/LocalStrings_zh_CN.properties| 4 +--
.../servlet/http/LocalStrings_zh_CN.properties | 1 +
.../authenticator/LocalStrings_zh_CN.properties| 7 +
.../jaspic/LocalStrings_zh_CN.properties | 1 +
.../connector/LocalStrings_zh_CN.properties| 9 ++
.../catalina/core/LocalStrings_zh_CN.properties| 32 ++
.../catalina/filters/LocalStrings_zh_CN.properties | 15 --
.../ha/deploy/LocalStrings_zh_CN.properties| 3 ++
.../ha/session/LocalStrings_zh_CN.properties | 10 +++
.../catalina/loader/LocalStrings_zh_CN.properties | 5
.../manager/host/LocalStrings_zh_CN.properties | 2 +-
.../catalina/mapper/LocalStrings_zh_CN.properties | 2 ++
.../catalina/mbeans/LocalStrings_zh_CN.properties | 2 ++
.../catalina/realm/LocalStrings_zh_CN.properties | 5
.../servlets/LocalStrings_zh_CN.properties | 2 ++
.../catalina/session/LocalStrings_zh_CN.properties | 8 ++
.../catalina/startup/LocalStrings_zh_CN.properties | 13 +
.../tribes/group/LocalStrings_zh_CN.properties | 4 +++
.../interceptors/LocalStrings_zh_CN.properties | 4 +++
.../membership/LocalStrings_zh_CN.properties | 11 +++-
.../catalina/tribes/tipis/LocalStrings.properties | 6 ++--
.../tribes/tipis/LocalStrings_zh_CN.properties | 5
.../transport/bio/LocalStrings_zh_CN.properties| 4 +++
.../transport/nio/LocalStrings_zh_CN.properties| 5
.../tribes/util/LocalStrings_zh_CN.properties | 1 +
.../catalina/util/LocalStrings_zh_CN.properties| 6
.../catalina/valves/LocalStrings_zh_CN.properties | 15 ++
.../rewrite/LocalStrings_zh_CN.properties} | 3 +-
.../webresources/LocalStrings_zh_CN.properties | 7 +
java/org/apache/coyote/LocalStrings.properties | 2 +-
.../apache/coyote/LocalStrings_zh_CN.properties| 3 ++
.../coyote/ajp/LocalStrings_zh_CN.properties | 1 +
.../coyote/http11/LocalStrings_zh_CN.properties| 5
.../http11/filters/LocalStrings_zh_CN.properties | 1 +
.../http11/upgrade/LocalStrings_zh_CN.properties | 4 +++
.../coyote/http2/LocalStrings_zh_CN.properties | 17
.../jasper/resources/LocalStrings_zh_CN.properties | 31 ++---
.../apache/naming/LocalStrings_zh_CN.properties| 4 +++
.../naming/factory/LocalStrings_zh_CN.properties | 5
.../tomcat/util/LocalStrings_zh_CN.properties | 1 +
.../tomcat/util/buf/LocalStrings_zh_CN.properties | 5
.../tomcat/util/compat/LocalStrings_fr.properties | 2 ++
.../tomcat/util/compat/LocalStrings_ko.properties | 2 ++
.../util/compat/LocalStrings_zh_CN.properties | 2 ++
.../util/descriptor}/LocalStrings_zh_CN.properties | 2 +-
.../descriptor/web/LocalStrings_zh_CN.properties | 10 +++
.../tomcat/util/http/LocalStrings_zh_CN.properties | 5
.../util/http/parser/LocalStrings.properties | 2 +-
.../util/http/parser/LocalStrings_zh_CN.properties | 3 ++
.../tomcat/util/modeler/LocalStrings_fr.properties | 1 -
.../tomcat/util/modeler/LocalStrings_ja.properties | 1 -
.../tomcat/util/modeler/LocalStrings_ko.properties | 1 -
.../util/modeler/LocalStrings_zh_CN.properties | 1 -
.../tomcat/util/net/LocalStrings_zh_CN.properties | 19 -
.../util/net/jsse/LocalStrings_zh_CN.properties| 1 +
.../util/net/openssl/LocalStrings_zh_CN.properties | 4 +++
.../tomcat/util/scan/LocalStrings_zh_CN.properties | 1 +
.../tomcat/websocket/LocalStrings_zh_CN.properties | 17
.../websocket/pojo/LocalStrings_zh_CN.properties | 6
.../websocket/server/LocalStrings_zh_CN.properties | 6
webapps/docs/changelog.xml | 14 ++
.../WEB-INF/classes/LocalStrings_zh_CN.properties | 1 +
62 files changed, 349 insertions(+), 23 deletions(-)
copy java/org/apache/catalina/{util/CharsetMapperDefault.properties =>
valves/rewrite/LocalStrings_zh_CN.properties} (93%)
copy java/org/apache/{catalina/ha/authenticator =>
tomcat/util/descriptor}/LocalStrings_zh_CN.properties (86%)
-
To unsubscribe, e-mail: dev-unsubsc
[tomcat] 04/06: Remove unnecessary blank line
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 974f4a322544ca8961d457ae147dc95923d8a6f3 Author: Mark Thomas AuthorDate: Wed Nov 6 12:27:55 2019 + Remove unnecessary blank line --- java/org/apache/tomcat/util/modeler/LocalStrings_ja.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/java/org/apache/tomcat/util/modeler/LocalStrings_ja.properties b/java/org/apache/tomcat/util/modeler/LocalStrings_ja.properties index 21c9711..8ce4c81 100644 --- a/java/org/apache/tomcat/util/modeler/LocalStrings_ja.properties +++ b/java/org/apache/tomcat/util/modeler/LocalStrings_ja.properties @@ -15,4 +15,3 @@ modules.digesterParseError=レジストリデータの解析エラー modules.readDescriptorsError=ディスクリプタ読み取り中のエラー - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/06: Expand coverage of French translations
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 c75cde985ebbdd0c41bfe32b2dae5a777c540706
Author: Mark Thomas
AuthorDate: Wed Nov 6 12:27:37 2019 +
Expand coverage of French translations
---
java/org/apache/tomcat/util/compat/LocalStrings_fr.properties | 2 ++
java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties | 1 -
webapps/docs/changelog.xml | 4
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
index d77ce3e..85ed3ad 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
@@ -14,3 +14,5 @@
# limitations under the License.
jre9Compat.invalidModuleUri=L''URI du module fournie [{0}] n''a pas pu être
convertie en URL pour être traitée par le JarScanner
+jre9Compat.javaPre9=Le code est considéré être exécuté sur une JVM antérieure
à Java 9 car la classe n'a pas été trouvée
+jre9Compat.unexpected=Impossible de créer les références vers les classes et
méthodes de Java 9
diff --git a/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties
index 30d80ca..72e6018 100644
--- a/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/modeler/LocalStrings_fr.properties
@@ -15,4 +15,3 @@
modules.digesterParseError=Erreur lors de l'analyse des données du registre
modules.readDescriptorsError=Erreur lors de la lecture des descripteurs
-
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 554e3e1..f8bdaec 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -156,6 +156,10 @@
63838: Suppress reflexive access warnings when running the
unit tests on the command line. (markt)
+
+Expand the coverage and quality 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: Fix typos
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 76bee12b436bb45dcd332a30c5897898d9aa98dc
Author: Mark Thomas
AuthorDate: Wed Nov 6 12:27:03 2019 +
Fix typos
---
java/org/apache/tomcat/util/compat/LocalStrings.properties | 2 +-
java/org/apache/tomcat/util/http/parser/LocalStrings.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings.properties
b/java/org/apache/tomcat/util/compat/LocalStrings.properties
index 1f671ba..99ff410 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings.properties
@@ -17,7 +17,7 @@ jre7Compat.javaPre7=Method not found so assuming code is
running on a pre-Java 7
jre7Compat.unexpected=Failed to create references to Java 7 classes and methods
jre8Compat.javaPre7=Class not found so assuming code is running on a pre-Java
7 JVM
-jre8Compat.javaPre8=Method not found so assuming code is running on a pre-Java
8 JVM
+jre8Compat.javaPre8=Class not found so assuming code is running on a pre-Java
8 JVM
jre8Compat.unexpected=Failed to create references to Java 8 classes and methods
jre9Compat.invalidModuleUri=The module URI provided [{0}] could not be
converted to a URL for the JarScanner to process
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
b/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
index e258d30..9f278a0 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
@@ -21,7 +21,7 @@ http.illegalCharacterIpv6=The character [{0}] is never valid
in an IPv6 address.
http.invalidCharacterDomain=The character [{0}] is not valid{1} a domain name.
http.invalidHextet=Invalid hextet. A hextet must consist of 4 or less hex
characters.
http.invalidIpv4Location=The IPv6 address contains an embedded IPv4 address at
an invalid location.
-http.invalidLeadingZero=An non-zero IPv4 octet may not contain a leading zero.
+http.invalidLeadingZero=A non-zero IPv4 octet may not contain a leading zero.
http.invalidOctet=Invalid octet [{0}]. The valid range for IPv4 octets is 0 to
255.
http.invalidRequestTargetCharacter=Character [{0}] is not allowed and will
continue to be rejected.
http.invalidSegmentEndState=The state [{0}] is not valid for the end of a
segment.
-
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 (c83abec -> 12ae895)
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 c83abec Fix a possible race condition
new f1f01a0 Fix ordering (due to case change)
new 76bee12 Fix typos
new c75cde9 Expand coverage of French translations
new 974f4a3 Remove unnecessary blank line
new f8181c0 Back-port Korean updates
new 12ae895 Expand coverage and quality of Simplified Chinese translations
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:
.../authenticator/LocalStrings_zh_CN.properties| 7 +
.../connector/LocalStrings_zh_CN.properties| 9 +++
.../catalina/core/LocalStrings_zh_CN.properties| 29
.../catalina/filters/LocalStrings_zh_CN.properties | 15 +--
.../ha/deploy/LocalStrings_zh_CN.properties| 3 +++
.../ha/session/LocalStrings_zh_CN.properties | 10 +++
.../catalina/loader/LocalStrings_zh_CN.properties | 4 +++
.../manager/host/LocalStrings_zh_CN.properties | 2 +-
.../catalina/mbeans/LocalStrings_zh_CN.properties | 2 ++
.../catalina/realm/LocalStrings_zh_CN.properties | 5
.../servlets/LocalStrings_zh_CN.properties | 2 ++
.../catalina/session/LocalStrings_zh_CN.properties | 8 ++
.../catalina/startup/LocalStrings_zh_CN.properties | 13 +
.../catalina/util/LocalStrings_zh_CN.properties| 6 +
.../catalina/valves/LocalStrings_zh_CN.properties | 14 ++
.../apache/coyote/LocalStrings_zh_CN.properties| 2 ++
.../coyote/ajp/LocalStrings_zh_CN.properties | 1 +
.../apache/coyote/http11/LocalStrings.properties | 2 +-
.../coyote/http11/LocalStrings_zh_CN.properties| 2 ++
.../http11/filters/LocalStrings_zh_CN.properties | 1 +
.../http11/upgrade/LocalStrings_zh_CN.properties | 1 +
.../jasper/resources/LocalStrings_zh_CN.properties | 31 +++---
.../apache/naming/LocalStrings_zh_CN.properties| 4 +++
.../naming/factory/LocalStrings_zh_CN.properties | 5
.../tomcat/util/LocalStrings_zh_CN.properties | 1 +
.../tomcat/util/compat/LocalStrings.properties | 2 +-
.../tomcat/util/compat/LocalStrings_fr.properties | 2 ++
.../tomcat/util/compat/LocalStrings_ko.properties | 2 ++
.../util/compat/LocalStrings_zh_CN.properties | 2 ++
.../util/descriptor}/LocalStrings_zh_CN.properties | 2 +-
.../tomcat/util/http/LocalStrings_zh_CN.properties | 5
.../util/http/parser/LocalStrings.properties | 2 +-
.../util/http/parser/LocalStrings_zh_CN.properties | 3 +++
.../tomcat/util/modeler/LocalStrings_fr.properties | 1 -
.../tomcat/util/modeler/LocalStrings_ja.properties | 1 -
.../tomcat/util/modeler/LocalStrings_ko.properties | 1 -
.../util/modeler/LocalStrings_zh_CN.properties | 1 -
.../tomcat/util/scan/LocalStrings_zh_CN.properties | 1 +
.../tomcat/websocket/LocalStrings_zh_CN.properties | 13 +
.../websocket/pojo/LocalStrings_zh_CN.properties | 6 +
.../websocket/server/LocalStrings_zh_CN.properties | 6 +
webapps/docs/changelog.xml | 14 ++
.../WEB-INF/classes/LocalStrings_zh_CN.properties | 1 +
43 files changed, 229 insertions(+), 15 deletions(-)
copy java/org/apache/{catalina/mbeans =>
tomcat/util/descriptor}/LocalStrings_zh_CN.properties (86%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/06: Expand coverage and quality of Simplified Chinese translations
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 12ae895e0a417b0626e02931c706bbc060f8b140
Author: Mark Thomas
AuthorDate: Wed Nov 6 12:29:36 2019 +
Expand coverage and quality of Simplified Chinese translations
Contributions provided by rpo130, Mason Shen, leeyazhou, winsonzhao,
qingshi huang, Lay and Shucheng Hou.
---
.../authenticator/LocalStrings_zh_CN.properties| 7 +
.../connector/LocalStrings_zh_CN.properties| 9 +++
.../catalina/core/LocalStrings_zh_CN.properties| 29
.../catalina/filters/LocalStrings_zh_CN.properties | 15 +--
.../ha/deploy/LocalStrings_zh_CN.properties| 3 +++
.../ha/session/LocalStrings_zh_CN.properties | 10 +++
.../catalina/loader/LocalStrings_zh_CN.properties | 4 +++
.../manager/host/LocalStrings_zh_CN.properties | 2 +-
.../catalina/mbeans/LocalStrings_zh_CN.properties | 2 ++
.../catalina/realm/LocalStrings_zh_CN.properties | 5
.../servlets/LocalStrings_zh_CN.properties | 2 ++
.../catalina/session/LocalStrings_zh_CN.properties | 8 ++
.../catalina/startup/LocalStrings_zh_CN.properties | 13 +
.../catalina/util/LocalStrings_zh_CN.properties| 6 +
.../catalina/valves/LocalStrings_zh_CN.properties | 14 ++
.../apache/coyote/LocalStrings_zh_CN.properties| 2 ++
.../coyote/ajp/LocalStrings_zh_CN.properties | 1 +
.../coyote/http11/LocalStrings_zh_CN.properties| 2 ++
.../http11/filters/LocalStrings_zh_CN.properties | 1 +
.../http11/upgrade/LocalStrings_zh_CN.properties | 1 +
.../jasper/resources/LocalStrings_zh_CN.properties | 31 +++---
.../apache/naming/LocalStrings_zh_CN.properties| 4 +++
.../naming/factory/LocalStrings_zh_CN.properties | 5
.../tomcat/util/LocalStrings_zh_CN.properties | 1 +
.../util/compat/LocalStrings_zh_CN.properties | 2 ++
.../util/descriptor}/LocalStrings_zh_CN.properties | 2 +-
.../tomcat/util/http/LocalStrings_zh_CN.properties | 5
.../util/http/parser/LocalStrings_zh_CN.properties | 3 +++
.../util/modeler/LocalStrings_zh_CN.properties | 1 -
.../tomcat/util/scan/LocalStrings_zh_CN.properties | 1 +
.../tomcat/websocket/LocalStrings_zh_CN.properties | 13 +
.../websocket/pojo/LocalStrings_zh_CN.properties | 6 +
.../websocket/server/LocalStrings_zh_CN.properties | 6 +
webapps/docs/changelog.xml | 6 +
.../WEB-INF/classes/LocalStrings_zh_CN.properties | 1 +
35 files changed, 214 insertions(+), 9 deletions(-)
diff --git
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index a157017..33cb87a 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -31,13 +31,20 @@ basicAuthenticator.invalidCharset=只允许值为null、空字符串或UTF-8
digestAuthenticator.cacheRemove=已从客户端 nonce
缓存中删除有效条目，以便为新条目腾出空间。重播攻击现在是可能的。为防止重播攻击的可能性，请降低nonceValidity或增加nonceCacheSize。此类型的进一步警告将被抑制5分钟。
+formAuthenticator.noErrorPage=没有为上下文[{0}]中的表单身份验证定义错误页
+
+singleSignOn.debug.associate=SSO将应用程序会话[{1}]与SSO会话[{0}]关联
singleSignOn.debug.cookieCheck=SSO检查SSO cookie
singleSignOn.debug.cookieNotFound=SSO没有找到SSO cookie
+singleSignOn.debug.deregisterFail=SSO撤销登记SSO会话[{0}]失败，因为缓存中不包含这个SSO会话
+singleSignOn.debug.hasPrincipal=找到以前经过身份验证的主体[{0}]
+singleSignOn.debug.invoke=SSO为[{0}]处理请求
singleSignOn.debug.principalCheck=SSO为SSO会话[{0}]寻找缓存的Principal
singleSignOn.debug.principalFound=SSO 找到了带着认证类型的缓存代理
singleSignOn.debug.removeSession=SSO 从 SSO session [{1}] 中删除应用程序会话 [{0}]
singleSignOn.debug.update=SSO 更新SSO 会话[{0}] 对认证 类型[{1}]
singleSignOn.sessionExpire.hostNotFound=因为 Host 丢失，SSO 无法使 session [{0}] 失效
singleSignOn.sessionExpire.managerError=由于会话管理器在检索会话时抛出异常，导致单点登录无法使会话[{0}]失效
+singleSignOn.sessionExpire.managerNotFound=SSO无法使会话[{0}]过期，因为找不到管理器
spnegoAuthenticator.authHeaderNoToken=客户端发送的协商授权 header 未包含 token
diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index 83f13a0..dc82134 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+coyoteAdapter.authorize=(:使用Tomcat的领域授权用户[{0}]
coyoteAdapter.checkRecycled.response=遇到非回收的相应并强行回收。
coyoteAdapter.debug=变量[{0}]的值为[{1}]。
coyoteAdapter.parsePathParam=无法使用编码[{0}]解析地址参数，url中的该地址参数将被忽略
@@ -21,14 +22,22 @@ coyoteConnector.invalidPort=连接器不能启动，因为指定的端口 [{0}]
coyoteConnector.parseBodyMethodNoTrace=方法TRACE禁止包含实体（详情查看RFC 2616 章节 9.6）
co
[tomcat] 01/06: Fix ordering (due to case change)
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 f1f01a0890853ee98622685cf1e81d51bf379357
Author: Mark Thomas
AuthorDate: Wed Nov 6 12:17:53 2019 +
Fix ordering (due to case change)
---
java/org/apache/coyote/http11/LocalStrings.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http11/LocalStrings.properties
b/java/org/apache/coyote/http11/LocalStrings.properties
index ad41849..292e2c1 100644
--- a/java/org/apache/coyote/http11/LocalStrings.properties
+++ b/java/org/apache/coyote/http11/LocalStrings.properties
@@ -13,10 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+http11Processor.contentEncodingParseFail=Failed to parse Content-Encoding
header when chekcing to see if compression was already in use
http11Processor.upgrade=An internal error has occurred as upgraded connections
should only be processed by the dedicated upgrade processor implementations
http11processor.comet.notsupported=The Comet protocol is not supported by this
connector
-http11Processor.contentEncodingParseFail=Failed to parse Content-Encoding
header when chekcing to see if compression was already in use
http11processor.fallToDebug=\n\
\ Note: further occurrences of HTTP request parsing errors will be logged at
DEBUG level.
http11processor.filter.error=Error intializing filter [{0}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/06: Back-port Korean updates
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 f8181c07eb0d3c0014e3154e7b48073101699ffa
Author: Mark Thomas
AuthorDate: Wed Nov 6 12:28:33 2019 +
Back-port Korean updates
---
java/org/apache/tomcat/util/compat/LocalStrings_ko.properties | 2 ++
java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties | 1 -
webapps/docs/changelog.xml | 4
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
index 05e0e91..4437a8c 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
@@ -14,3 +14,5 @@
# limitations under the License.
jre9Compat.invalidModuleUri=[{0}](으)로 제공된 모듈 URI는 JarScanner가 처리할 수 있는 URL로
변환될 수 없습니다.
+jre9Compat.javaPre9=Java 9 클래스가 발견되지 않습니다. Java 9 이전 버전에서 동작하고 있는 것으로 보입니다.
+jre9Compat.unexpected=Java 9 클래스들과 메소드들을 참조할 수 없습니다.
diff --git a/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties
b/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties
index ffcf3fd..02b04cc 100644
--- a/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/modeler/LocalStrings_ko.properties
@@ -15,4 +15,3 @@
modules.digesterParseError=레지스트리 데이터를 파싱하는 중 오류 발생
modules.readDescriptorsError=Descriptor들을 읽는 중 오류 발생
-
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f8bdaec..c85705f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -160,6 +160,10 @@
Expand the coverage and quality of the French translations provided
with Apache Tomcat. (remm)
+
+Expand the coverage and quality 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
[GitHub] [tomcat] markt-asf commented on issue #211: Fix semantic and punctuation in chinese
markt-asf commented on issue #211: Fix semantic and punctuation in chinese URL: https://github.com/apache/tomcat/pull/211#issuecomment-550292902 Thanks for the PR. Because we manage translations via POEditor, and have imports/exports set up to keep POEditor and the source repository in sync, it is much easier for us if translation fixes are provided by POEditor. I have transferred these changes to POEditor and will be importing them into Tomcat via that route. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix PR #211 via POEditor
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 2f4e1f2 Fix PR #211 via POEditor
2f4e1f2 is described below
commit 2f4e1f2b64bdf908d9fb1fae2c09598a3f11bae6
Author: Mark Thomas
AuthorDate: Wed Nov 6 12:50:03 2019 +
Fix PR #211 via POEditor
---
java/org/apache/catalina/filters/LocalStrings_zh_CN.properties | 7 ---
webapps/docs/changelog.xml | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
index d4b0bff..956688b 100644
--- a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
@@ -20,7 +20,7 @@ corsFilter.onlyHttp=CORS不支持非HTTP请求或响应
corsFilter.wrongType1=期望类型为[{0}]的HttpServletRequest对象
corsFilter.wrongType2=期望类型为[{0}]或[{1}]的HttpServletRequest对象
-csrfPrevention.invalidRandomClass=不能使用class [{0}]创建随机源.
+csrfPrevention.invalidRandomClass=不能使用class [{0}]创建随机源。
expiresFilter.invalidDurationNumber=指令[{1}]中的持续时间（数字）[{0}]无效
expiresFilter.noDurationFound=在指令[{0}]中找不到持续时间
@@ -37,9 +37,10 @@ filterbase.noSuchProperty=未为[{1}]类型的筛选器定义属性[{0}]
http.403=禁止访问指定资源 [{0}] 。
-httpHeaderSecurityFilter.clickjack.invalid=为防咔嗒顶部标题指定了无效值[{0}]
+httpHeaderSecurityFilter.clickjack.invalid=为防点击挟持的响应消息头指定了非法值 [{0}]
+httpHeaderSecurityFilter.committed=在进入HttpHeaderSecurityFilter的时候响应消息已经提交导致不能添加响应消息头
-remoteCidrFilter.noRemoteIp=客户端没有 IP 地址。请求被拒绝。
+remoteCidrFilter.noRemoteIp=客户端没有 IP 地址，请求被拒绝。
remoteIpFilter.invalidHostHeader=HTTP头 [{1}]中，为Host找到一个无效值 [{0}]
remoteIpFilter.invalidHostWithPort=HTTP头 [{1}]中的Host值 [{0}]包含一个被忽略的端口号
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5494849..0dfa3f2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -173,8 +173,8 @@
Expand the coverage and quality of the Simplified Chinese translations
provided with Apache Tomcat. Contributions provided by rpo130, Mason
-Shen, leeyazhou, winsonzhao, qingshi huang, Lay and Shucheng Hou.
-(markt)
+Shen, leeyazhou, winsonzhao, qingshi huang, Lay, Shucheng Hou and
+Yanming Zhou. (markt)
Expand the coverage and quality of the Brazilian Portuguese
translations
-
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: Fix PR #211 via POEditor
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 0f9f305 Fix PR #211 via POEditor
0f9f305 is described below
commit 0f9f3057217e170b73f199a90ec5b760cff7fd16
Author: Mark Thomas
AuthorDate: Wed Nov 6 12:50:03 2019 +
Fix PR #211 via POEditor
---
java/org/apache/catalina/filters/LocalStrings_zh_CN.properties | 7 ---
webapps/docs/changelog.xml | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
index d4b0bff..956688b 100644
--- a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
@@ -20,7 +20,7 @@ corsFilter.onlyHttp=CORS不支持非HTTP请求或响应
corsFilter.wrongType1=期望类型为[{0}]的HttpServletRequest对象
corsFilter.wrongType2=期望类型为[{0}]或[{1}]的HttpServletRequest对象
-csrfPrevention.invalidRandomClass=不能使用class [{0}]创建随机源.
+csrfPrevention.invalidRandomClass=不能使用class [{0}]创建随机源。
expiresFilter.invalidDurationNumber=指令[{1}]中的持续时间（数字）[{0}]无效
expiresFilter.noDurationFound=在指令[{0}]中找不到持续时间
@@ -37,9 +37,10 @@ filterbase.noSuchProperty=未为[{1}]类型的筛选器定义属性[{0}]
http.403=禁止访问指定资源 [{0}] 。
-httpHeaderSecurityFilter.clickjack.invalid=为防咔嗒顶部标题指定了无效值[{0}]
+httpHeaderSecurityFilter.clickjack.invalid=为防点击挟持的响应消息头指定了非法值 [{0}]
+httpHeaderSecurityFilter.committed=在进入HttpHeaderSecurityFilter的时候响应消息已经提交导致不能添加响应消息头
-remoteCidrFilter.noRemoteIp=客户端没有 IP 地址。请求被拒绝。
+remoteCidrFilter.noRemoteIp=客户端没有 IP 地址，请求被拒绝。
remoteIpFilter.invalidHostHeader=HTTP头 [{1}]中，为Host找到一个无效值 [{0}]
remoteIpFilter.invalidHostWithPort=HTTP头 [{1}]中的Host值 [{0}]包含一个被忽略的端口号
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d3099bb..4eb0788 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -167,8 +167,8 @@
Expand the coverage and quality of the Simplified Chinese translations
provided with Apache Tomcat. Contributions provided by rpo130, Mason
-Shen, leeyazhou, winsonzhao, qingshi huang, Lay and Shucheng Hou.
-(markt)
+Shen, leeyazhou, winsonzhao, qingshi huang, Lay, Shucheng Hou and
+Yanming Zhou. (markt)
-
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: Fix PR #211 via POEditor
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 7b841fa Fix PR #211 via POEditor
7b841fa is described below
commit 7b841fabe63af1fd3a3834128a132471e63e0a49
Author: Mark Thomas
AuthorDate: Wed Nov 6 12:50:03 2019 +
Fix PR #211 via POEditor
---
java/org/apache/catalina/filters/LocalStrings_zh_CN.properties | 7 ---
webapps/docs/changelog.xml | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
index d4b0bff..956688b 100644
--- a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
@@ -20,7 +20,7 @@ corsFilter.onlyHttp=CORS不支持非HTTP请求或响应
corsFilter.wrongType1=期望类型为[{0}]的HttpServletRequest对象
corsFilter.wrongType2=期望类型为[{0}]或[{1}]的HttpServletRequest对象
-csrfPrevention.invalidRandomClass=不能使用class [{0}]创建随机源.
+csrfPrevention.invalidRandomClass=不能使用class [{0}]创建随机源。
expiresFilter.invalidDurationNumber=指令[{1}]中的持续时间（数字）[{0}]无效
expiresFilter.noDurationFound=在指令[{0}]中找不到持续时间
@@ -37,9 +37,10 @@ filterbase.noSuchProperty=未为[{1}]类型的筛选器定义属性[{0}]
http.403=禁止访问指定资源 [{0}] 。
-httpHeaderSecurityFilter.clickjack.invalid=为防咔嗒顶部标题指定了无效值[{0}]
+httpHeaderSecurityFilter.clickjack.invalid=为防点击挟持的响应消息头指定了非法值 [{0}]
+httpHeaderSecurityFilter.committed=在进入HttpHeaderSecurityFilter的时候响应消息已经提交导致不能添加响应消息头
-remoteCidrFilter.noRemoteIp=客户端没有 IP 地址。请求被拒绝。
+remoteCidrFilter.noRemoteIp=客户端没有 IP 地址，请求被拒绝。
remoteIpFilter.invalidHostHeader=HTTP头 [{1}]中，为Host找到一个无效值 [{0}]
remoteIpFilter.invalidHostWithPort=HTTP头 [{1}]中的Host值 [{0}]包含一个被忽略的端口号
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index aa2ac78..0b50e22 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -158,8 +158,8 @@
Expand the coverage and quality of the Simplified Chinese translations
provided with Apache Tomcat. Contributions provided by rpo130, Mason
-Shen, leeyazhou, winsonzhao, qingshi huang, Lay and Shucheng Hou.
-(markt)
+Shen, leeyazhou, winsonzhao, qingshi huang, Lay, Shucheng Hou and
+Yanming Zhou. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on issue #211: Fix semantic and punctuation in chinese
markt-asf commented on issue #211: Fix semantic and punctuation in chinese URL: https://github.com/apache/tomcat/pull/211#issuecomment-550296924 Applied via POEditor This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #211: Fix semantic and punctuation in chinese
markt-asf closed pull request #211: Fix semantic and punctuation in chinese URL: https://github.com/apache/tomcat/pull/211 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on issue #222: EmbeddedServletOptions constructor has been refactored
markt-asf commented on issue #222: EmbeddedServletOptions constructor has been refactored URL: https://github.com/apache/tomcat/pull/222#issuecomment-550298013 This appears to be a purely cosmetic change. Such changes can make back-porting more difficult unless the change is back-ported to all currently supported versions. The change makes this class inconsistent with similar code throughout the Tomcat code base. Changes such as this carry the risk of introducing regressions. Unless a good reason can be provided for applying this, I am leaning towards closing this PR. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf merged pull request #212: Fix typo
markt-asf merged pull request #212: Fix typo URL: https://github.com/apache/tomcat/pull/212 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/04: Fix typo
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 31ebf2f75149eb0494007dc26057157b932ce001
Author: 康智冬
AuthorDate: Tue Oct 15 01:02:51 2019 +0800
Fix typo
---
java/javax/servlet/AsyncContext.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/javax/servlet/AsyncContext.java
b/java/javax/servlet/AsyncContext.java
index dd61fad..9d0c81d 100644
--- a/java/javax/servlet/AsyncContext.java
+++ b/java/javax/servlet/AsyncContext.java
@@ -100,7 +100,7 @@ public interface AsyncContext {
void setTimeout(long timeout);
/**
- * Get the current.
+ * Get the current timeout.
*
* @return The timeout in milliseconds. 0 or less indicates no timeout.
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/04: Fix typo
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 8ce79338f3c5eea8d4a43ef1bcb548685f774628 Author: 康智冬 AuthorDate: Mon Oct 14 13:19:41 2019 +0800 Fix typo fix typo --- java/org/apache/catalina/tribes/group/GroupChannel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/catalina/tribes/group/GroupChannel.java b/java/org/apache/catalina/tribes/group/GroupChannel.java index 64137c1..6177938 100644 --- a/java/org/apache/catalina/tribes/group/GroupChannel.java +++ b/java/org/apache/catalina/tribes/group/GroupChannel.java @@ -166,7 +166,7 @@ public class GroupChannel extends ChannelInterceptorBase * channel.addInterceptor(A); * channel.addInterceptor(C); * channel.addInterceptor(B); - * Will result in a interceptor stack like this: + * Will result in an interceptor stack like this: * A -> C -> B * The complete stack will look like this: * Channel -> A -> C -> B -> ChannelCoordinator - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/04: Fix typo
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 d8e336de2ca766b2984cca5876ff6851a13e6fcf Author: 康智冬 AuthorDate: Sat Oct 19 18:01:08 2019 +0800 Fix typo fix typo --- java/org/apache/tomcat/util/buf/package.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/buf/package.html b/java/org/apache/tomcat/util/buf/package.html index 718dc1c..e61b9b3 100644 --- a/java/org/apache/tomcat/util/buf/package.html +++ b/java/org/apache/tomcat/util/buf/package.html @@ -22,7 +22,7 @@ conversions, URL encodings, etc. Encoding is a critical operation for performance. There are few tricks in this package - the C2B and -B2C converters are caching a ISReader/OSWriter and keep everything allocated to do the conversions +B2C converters are caching an ISReader/OSWriter and keep everything allocated to do the conversions in any VM without any garbage. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (2f4e1f2 -> d3b4844)
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 2f4e1f2 Fix PR #211 via POEditor new 8ce7933 Fix typo new 31ebf2f Fix typo new d8e336d Fix typo new d3b4844 Remove redundant method for clean The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/javax/servlet/AsyncContext.java| 2 +- java/org/apache/catalina/core/StandardWrapperValve.java | 1 - java/org/apache/catalina/tribes/group/GroupChannel.java | 2 +- java/org/apache/tomcat/util/buf/package.html| 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/04: Remove redundant method for clean
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 d3b4844d07b76fdf8cd2ff7d28a6f6fe21ea0596
Author: 康智冬
AuthorDate: Mon Oct 21 01:25:16 2019 +0800
Remove redundant method for clean
---
java/org/apache/catalina/core/StandardWrapperValve.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java
b/java/org/apache/catalina/core/StandardWrapperValve.java
index f8b0703..8d2f54b 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -288,7 +288,6 @@ final class StandardWrapperValve
container.getLogger().error(sm.getString("standardWrapper.unloadException",
wrapper.getName()), e);
if (throwable == null) {
-throwable = e;
exception(request, response, e);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Remove unnecessary code
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 f77075a3320aa0f322a4c736d25c76a344f30218
Author: Mark Thomas
AuthorDate: Wed Nov 6 13:06:38 2019 +
Remove unnecessary code
---
java/org/apache/catalina/core/StandardWrapperValve.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java
b/java/org/apache/catalina/core/StandardWrapperValve.java
index 8a70250..be7e7e5 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -475,7 +475,6 @@ final class StandardWrapperValve
container.getLogger().error(sm.getString("standardWrapper.unloadException",
wrapper.getName()), e);
if (throwable == null) {
-throwable = e;
exception(request, response, e);
}
}
-
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 (0f9f305 -> f77075a)
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 0f9f305 Fix PR #211 via POEditor new 5fd4cf5 Fix typo new f77075a Remove unnecessary code The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/javax/servlet/AsyncContext.java| 2 +- java/org/apache/catalina/core/StandardWrapperValve.java | 1 - java/org/apache/catalina/tribes/group/GroupChannel.java | 2 +- java/org/apache/tomcat/util/buf/package.html| 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Fix typo
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 b5e740ecacfe51ae5eb21dea4a5b0b6f79fdbe05
Author: 康智冬
AuthorDate: Mon Oct 14 13:19:41 2019 +0800
Fix typo
---
java/javax/servlet/AsyncContext.java| 2 +-
java/org/apache/catalina/tribes/group/GroupChannel.java | 2 +-
java/org/apache/tomcat/util/buf/package.html| 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/javax/servlet/AsyncContext.java
b/java/javax/servlet/AsyncContext.java
index 45b3ebf..2ddc1e8 100644
--- a/java/javax/servlet/AsyncContext.java
+++ b/java/javax/servlet/AsyncContext.java
@@ -98,7 +98,7 @@ public interface AsyncContext {
void setTimeout(long timeout);
/**
- * Get the current.
+ * Get the current timeout.
*
* @return The timeout in milliseconds. 0 or less indicates no timeout.
*/
diff --git a/java/org/apache/catalina/tribes/group/GroupChannel.java
b/java/org/apache/catalina/tribes/group/GroupChannel.java
index 94759d5..e5535e7 100644
--- a/java/org/apache/catalina/tribes/group/GroupChannel.java
+++ b/java/org/apache/catalina/tribes/group/GroupChannel.java
@@ -154,7 +154,7 @@ public class GroupChannel extends ChannelInterceptorBase
* channel.addInterceptor(A);
* channel.addInterceptor(C);
* channel.addInterceptor(B);
- * Will result in a interceptor stack like this:
+ * Will result in an interceptor stack like this:
* A -> C -> B
* The complete stack will look like this:
* Channel -> A -> C -> B ->
ChannelCoordinator
diff --git a/java/org/apache/tomcat/util/buf/package.html
b/java/org/apache/tomcat/util/buf/package.html
index 718dc1c..e61b9b3 100644
--- a/java/org/apache/tomcat/util/buf/package.html
+++ b/java/org/apache/tomcat/util/buf/package.html
@@ -22,7 +22,7 @@ conversions, URL encodings, etc.
Encoding is a critical operation for performance. There are few tricks in this
package - the C2B and
-B2C converters are caching a ISReader/OSWriter and keep everything allocated
to do the conversions
+B2C converters are caching an ISReader/OSWriter and keep everything allocated
to do the conversions
in any VM without any garbage.
-
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 (7b841fa -> 7890094)
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 7b841fa Fix PR #211 via POEditor new b5e740e Fix typo new 7890094 Remove unnecessary code The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/javax/servlet/AsyncContext.java| 2 +- java/org/apache/catalina/core/StandardWrapperValve.java | 1 - java/org/apache/catalina/tribes/group/GroupChannel.java | 2 +- java/org/apache/tomcat/util/buf/package.html| 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Remove unnecessary code
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 7890094f2f7871ffb31ebdf0904172e1361c345d
Author: Mark Thomas
AuthorDate: Wed Nov 6 13:06:38 2019 +
Remove unnecessary code
---
java/org/apache/catalina/core/StandardWrapperValve.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java
b/java/org/apache/catalina/core/StandardWrapperValve.java
index ae7b319..ffcba85 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -287,7 +287,6 @@ final class StandardWrapperValve
container.getLogger().error(sm.getString("standardWrapper.unloadException",
wrapper.getName()), e);
if (throwable == null) {
-throwable = e;
exception(request, response, e);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Fix typo
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 5fd4cf5fbcc2a6fda5c091602168fdcb15e0f8a1
Author: 康智冬
AuthorDate: Mon Oct 14 13:19:41 2019 +0800
Fix typo
---
java/javax/servlet/AsyncContext.java| 2 +-
java/org/apache/catalina/tribes/group/GroupChannel.java | 2 +-
java/org/apache/tomcat/util/buf/package.html| 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/javax/servlet/AsyncContext.java
b/java/javax/servlet/AsyncContext.java
index 45b3ebf..2ddc1e8 100644
--- a/java/javax/servlet/AsyncContext.java
+++ b/java/javax/servlet/AsyncContext.java
@@ -98,7 +98,7 @@ public interface AsyncContext {
void setTimeout(long timeout);
/**
- * Get the current.
+ * Get the current timeout.
*
* @return The timeout in milliseconds. 0 or less indicates no timeout.
*/
diff --git a/java/org/apache/catalina/tribes/group/GroupChannel.java
b/java/org/apache/catalina/tribes/group/GroupChannel.java
index e758e90..d3eb103 100644
--- a/java/org/apache/catalina/tribes/group/GroupChannel.java
+++ b/java/org/apache/catalina/tribes/group/GroupChannel.java
@@ -125,7 +125,7 @@ public class GroupChannel extends ChannelInterceptorBase
implements ManagedChann
* channel.addInterceptor(A);
* channel.addInterceptor(C);
* channel.addInterceptor(B);
- * Will result in a interceptor stack like this:
+ * Will result in an interceptor stack like this:
* A -> C -> B
* The complete stack will look like this:
* Channel -> A -> C -> B ->
ChannelCoordinator
diff --git a/java/org/apache/tomcat/util/buf/package.html
b/java/org/apache/tomcat/util/buf/package.html
index 61f2c38..03c97d5 100644
--- a/java/org/apache/tomcat/util/buf/package.html
+++ b/java/org/apache/tomcat/util/buf/package.html
@@ -22,7 +22,7 @@ conversions, URL encodings, etc.
Encoding is a critical operation for performance. There are few tricks in this
package - the C2B and
-B2C converters are caching a ISReader/OSWriter and keep everything allocated
to do the conversions
+B2C converters are caching an ISReader/OSWriter and keep everything allocated
to do the conversions
in any VM without any garbage.
-
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: Improve clean-up after an OOME during request processing
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 846ff9a Improve clean-up after an OOME during request processing
846ff9a is described below
commit 846ff9afb4bd3c1fec582886fb183c83e1ca0b70
Author: Mark Thomas
AuthorDate: Mon May 13 20:10:13 2019 +0100
Improve clean-up after an OOME during request processing
---
.../apache/catalina/core/StandardWrapperValve.java | 77 +++---
java/org/apache/coyote/AbstractProtocol.java | 8 ++-
java/org/apache/coyote/LocalStrings.properties | 1 +
webapps/docs/changelog.xml | 4 ++
4 files changed, 50 insertions(+), 40 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java
b/java/org/apache/catalina/core/StandardWrapperValve.java
index ffcba85..c7b7590 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -253,50 +253,49 @@ final class StandardWrapperValve
context.getName()), e);
throwable = e;
exception(request, response, e);
-}
-
-// Release the filter chain (if any) for this request
-if (filterChain != null) {
-filterChain.release();
-}
-
-// Deallocate the allocated servlet instance
-try {
-if (servlet != null) {
-wrapper.deallocate(servlet);
+} finally {
+// Release the filter chain (if any) for this request
+if (filterChain != null) {
+filterChain.release();
}
-} catch (Throwable e) {
-ExceptionUtils.handleThrowable(e);
-
container.getLogger().error(sm.getString("standardWrapper.deallocateException",
- wrapper.getName()), e);
-if (throwable == null) {
-throwable = e;
-exception(request, response, e);
-}
-}
-// If this servlet has been marked permanently unavailable,
-// unload it and release this instance
-try {
-if ((servlet != null) &&
-(wrapper.getAvailable() == Long.MAX_VALUE)) {
-wrapper.unload();
-}
-} catch (Throwable e) {
-ExceptionUtils.handleThrowable(e);
-
container.getLogger().error(sm.getString("standardWrapper.unloadException",
- wrapper.getName()), e);
-if (throwable == null) {
-exception(request, response, e);
+// Deallocate the allocated servlet instance
+try {
+if (servlet != null) {
+wrapper.deallocate(servlet);
+}
+} catch (Throwable e) {
+ExceptionUtils.handleThrowable(e);
+
container.getLogger().error(sm.getString("standardWrapper.deallocateException",
+ wrapper.getName()), e);
+if (throwable == null) {
+throwable = e;
+exception(request, response, e);
+}
}
-}
-long t2=System.currentTimeMillis();
-long time=t2-t1;
-processingTime += time;
-if( time > maxTime) maxTime=time;
-if( time < minTime) minTime=time;
+// If this servlet has been marked permanently unavailable,
+// unload it and release this instance
+try {
+if ((servlet != null) &&
+(wrapper.getAvailable() == Long.MAX_VALUE)) {
+wrapper.unload();
+}
+} catch (Throwable e) {
+ExceptionUtils.handleThrowable(e);
+
container.getLogger().error(sm.getString("standardWrapper.unloadException",
+ wrapper.getName()), e);
+if (throwable == null) {
+exception(request, response, e);
+}
+}
+long t2=System.currentTimeMillis();
+long time=t2-t1;
+processingTime += time;
+if( time > maxTime) maxTime=time;
+if( time < minTime) minTime=time;
+}
}
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index be2bd40..684582f 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -945,7 +945,13 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
// Future developers: if you discover any other
// rare-but-nonfatal exceptions, catch them here, and log as
// above.
-catch (Throwable e) {
+
[tomcat] branch 7.0.x updated: Improve clean-up after an OOME during request processing
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 c88cf8f Improve clean-up after an OOME during request processing
c88cf8f is described below
commit c88cf8f1befbe29aafb38c5ee9d8a2e852801ac6
Author: Mark Thomas
AuthorDate: Mon May 13 20:10:13 2019 +0100
Improve clean-up after an OOME during request processing
---
.../apache/catalina/core/StandardWrapperValve.java | 167 ++---
java/org/apache/coyote/AbstractProtocol.java | 8 +-
java/org/apache/coyote/LocalStrings.properties | 1 +
webapps/docs/changelog.xml | 4 +
4 files changed, 94 insertions(+), 86 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java
b/java/org/apache/catalina/core/StandardWrapperValve.java
index be7e7e5..b621e12 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -268,57 +268,57 @@ final class StandardWrapperValve
context.getName()), e);
throwable = e;
exception(request, response, e);
-}
-
-// Release the filter chain (if any) for this request
-if (filterChain != null) {
-if (request.isComet()) {
-// If this is a Comet request, then the same chain will be
used for the
-// processing of all subsequent events.
-filterChain.reuse();
-} else {
-filterChain.release();
+} finally {
+// Release the filter chain (if any) for this request
+if (filterChain != null) {
+if (request.isComet()) {
+// If this is a Comet request, then the same chain will be
used for the
+// processing of all subsequent events.
+filterChain.reuse();
+} else {
+filterChain.release();
+}
}
-}
-// Deallocate the allocated servlet instance
-try {
-if (servlet != null) {
-wrapper.deallocate(servlet);
-}
-} catch (Throwable e) {
-ExceptionUtils.handleThrowable(e);
-
container.getLogger().error(sm.getString("standardWrapper.deallocateException",
- wrapper.getName()), e);
-if (throwable == null) {
-throwable = e;
-exception(request, response, e);
+// Deallocate the allocated servlet instance
+try {
+if (servlet != null) {
+wrapper.deallocate(servlet);
+}
+} catch (Throwable e) {
+ExceptionUtils.handleThrowable(e);
+
container.getLogger().error(sm.getString("standardWrapper.deallocateException",
+ wrapper.getName()), e);
+if (throwable == null) {
+throwable = e;
+exception(request, response, e);
+}
}
-}
-// If this servlet has been marked permanently unavailable,
-// unload it and release this instance
-try {
-if ((servlet != null) &&
-(wrapper.getAvailable() == Long.MAX_VALUE)) {
-wrapper.unload();
-}
-} catch (Throwable e) {
-ExceptionUtils.handleThrowable(e);
-
container.getLogger().error(sm.getString("standardWrapper.unloadException",
- wrapper.getName()), e);
-if (throwable == null) {
-throwable = e;
-exception(request, response, e);
+// If this servlet has been marked permanently unavailable,
+// unload it and release this instance
+try {
+if ((servlet != null) &&
+(wrapper.getAvailable() == Long.MAX_VALUE)) {
+wrapper.unload();
+}
+} catch (Throwable e) {
+ExceptionUtils.handleThrowable(e);
+
container.getLogger().error(sm.getString("standardWrapper.unloadException",
+ wrapper.getName()), e);
+if (throwable == null) {
+throwable = e;
+exception(request, response, e);
+}
}
-}
-long t2=System.currentTimeMillis();
-long time=t2-t1;
-processingTime += time;
-if( time > maxTime) maxTime=time;
-if( time < minTime) minTime=time;
+long t2=System.currentTimeMillis();
+long time=t2-t1;
+processingTime += time;
+if( time > maxTime) max
[tomcat] branch master updated: Move count down connections to the shared close
This is an automated email from the ASF dual-hosted git repository.
remm 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 f7e2dce Move count down connections to the shared close
f7e2dce is described below
commit f7e2dce31d495dc972605416fedf239df981a2c3
Author: remm
AuthorDate: Wed Nov 6 18:11:39 2019 +0100
Move count down connections to the shared close
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 1 -
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 1 -
java/org/apache/tomcat/util/net/NioEndpoint.java | 1 -
java/org/apache/tomcat/util/net/SocketWrapperBase.java | 1 +
4 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 6361756..0315075 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -791,7 +791,6 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
// are closed when calling stop() followed by start().
if (socket != 0) {
Socket.destroy(socket);
-countDownConnection();
}
}
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index afb8757..6ecba6a 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -917,7 +917,6 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint
}
try {
synchronized (getSocket()) {
-getEndpoint().countDownConnection();
if (getSocket().isOpen()) {
getSocket().close(true);
}
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index 2f4fb42..169fbfa 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -410,6 +410,7 @@ public abstract class SocketWrapperBase {
}
} finally {
getEndpoint().connections.remove(socket);
+getEndpoint().countDownConnection();
doClose();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63898] JSP EL generation is wrong when using newer version of Java 1.8 & tag class uses method overloading and isELIgnored="false
https://bz.apache.org/bugzilla/show_bug.cgi?id=63898 --- Comment #4 from Christopher Schultz --- (In reply to Mark Thomas from comment #3) > Anything is possible but it would require essentially re-implementing the > JavaBean Introspection code. The effort required seems out of proportion to > the size problem. Of course: yuck. Instead of: Method m = IntrospectionUtils.getTheOneTrueSetterMethod(...); Can we call: Method[] candidates = IntrospectionUtils.getTheListOfCandidateMethods(...); ... and then throw an error if candidates.length != 1? That would be a relatively minor change but catch lots of these errors. -- 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 63905] ErrorReportValve adds CSS even if both showReport and showServerInfo are set to false
https://bz.apache.org/bugzilla/show_bug.cgi?id=63905 --- Comment #4 from Christopher Schultz --- Or we could just drop the CSS because... who cares? If the response entity is ErrorError then it's fine. No styling is necessary for such a minimal page. -- 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 63898] JSP EL generation is wrong when using newer version of Java 1.8 & tag class uses method overloading and isELIgnored="false
https://bz.apache.org/bugzilla/show_bug.cgi?id=63898 --- Comment #5 from Mark Thomas --- No we can't, because - as per the spec - we are using the JavaBeans introspection machinery, not our own IntrospectionUtils. -- 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 63905] ErrorReportValve adds CSS even if both showReport and showServerInfo are set to false
https://bz.apache.org/bugzilla/show_bug.cgi?id=63905 --- Comment #5 from Mark Thomas --- (In reply to Michael Osipov from comment #3) > (In reply to Mark Thomas from comment #2) > > For the record: > > > > The CSS was removed when showServerInfo and showReport are both false for > > debatable security reasons as part of bug 58383. > > Are you certain? That does not look related?! Sorry typo, bug 56383 -- 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 63898] JSP EL generation is wrong when using newer version of Java 1.8 & tag class uses method overloading and isELIgnored="false
https://bz.apache.org/bugzilla/show_bug.cgi?id=63898
--- Comment #6 from Konstantin Kolinko ---
1. (In reply to jeffrey.lobello from comment #0)
> Here's an example tag class
>
> public void setValue(final String value) {
> }
> public void setValue(final Object value) {
> }
And there is no "getValue()" method for this pair?
2. Note that the JavaBeans specification allows to bypass the introspection
logic in java.beans.Introspector and explicitly provide a description for one's
bean.
That is done by creating a class named FooBeanInfo for a bean class named Foo.
I think that a possible workaround for the OP is to create such a class.
3. (In reply to Christopher Schultz from comment #2)
> Is there scope for Tomcat to either (a) pick the "best" method (based upon
> type-agreement) or (b) detect a conflict and throw an error?
In OP's case the attribute type is explicitly declared as "java.lang.Object" in
a TLD file for the tag library. There is an explicit mismatch with the method
returned by introspection. It is not a question of choosing the "best" method.
BTW, I think that the relevant code in Jasper is the TagHandlerInfo class
declared in org/apache/jasper/compiler/Generator.java. See its constructor that
does the introspection. See calls to its getSetterMethod() method, such as
m = handlerInfo.getSetterMethod(localName);
if (m == null) { (... - reporting an error) }
c = m.getParameterTypes();
Technically, the name of c[0] class could be compared as string with the value
of javax.servlet.jsp.tagext.TagAttributeInfo.getTypeName(), but
a) There are likely to be some edge cases.
b) What do we do with the result? Generate an error?
In OP's case the web application is failing. If I understand correctly it
compiles successfully, but fails at run time? If so, implementing an explicit
check will make it to fail at compile time.
--
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 63904] Apache http (with mod_jk to tomcat) randomly return empty response
https://bz.apache.org/bugzilla/show_bug.cgi?id=63904 --- Comment #2 from Yosep Stephen --- I don't see any problem with the timeout settings. Here are Tomcat 8.0.35 Setting used: And here are the mod_jk settings: worker.accuratea1.host=10.10.17.6 worker.accuratea1.port=8610 worker.accuratea1.lbfactor=1 worker.accuratea1.socket_connect_timeout=5000 worker.accuratea1.ping_mode=A worker.accuratea1.ping_timeout=1 Where is the user group I can use to submit the discussion? Thanks for the response, really appreciate it. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
