[Bug 65102] Build fails due to a lacking component
https://bz.apache.org/bugzilla/show_bug.cgi?id=65102 --- Comment #6 from Mark Thomas --- An alternative work-around appears to be changing base-apache.loc.1 to use https rather than http. You can probably argue that as a security improvement. Still looking into the root cause of this difference in behaviour. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] michael-o commented on a change in pull request #401: Add support for unix domain sockets (APR Protocol)
michael-o commented on a change in pull request #401:
URL: https://github.com/apache/tomcat/pull/401#discussion_r564327293
##
File path: java/org/apache/tomcat/util/net/AprEndpoint.java
##
@@ -287,6 +312,9 @@ public int getSendfileCount() {
@Override
public void bind() throws Exception {
+int family;
+String hostname = null;
Review comment:
Leave it that way for consistency, maybe a comment above would help to
clarify.
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
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] michael-o commented on a change in pull request #401: Add support for unix domain sockets (APR Protocol)
michael-o commented on a change in pull request #401:
URL: https://github.com/apache/tomcat/pull/401#discussion_r564327772
##
File path: test/org/apache/tomcat/jni/TestUnixDomainSocketServer.java
##
@@ -0,0 +1,240 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jni;
+
+import java.util.concurrent.CountDownLatch;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+
+/*
+ * Tests for unix domain sockets.
+ *
+ * While System.nanotime() is available and may have a resolution of ~100ns on
+ * some platforms, those same platforms do not use as precise a timer for
socket
+ * timeouts. Therefore, a much larger error margin (100ms) is used.
+ *
+ * It is known that this larger error margin is required for Windows 10. It may
+ * be worth revisiting the choice of error margin once that platform is no
+ * longer supported.
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x onwards to only those components required to provide
+ * OpenSSL integration with the NIO and NIO2 connectors.
+ */
+@Deprecated
+public class TestUnixDomainSocketServer extends AbstractJniTest {
+
+ private static final String PATH = System.getProperty("java.io.tmpdir")
+ System.getProperty("file.separator") + "tomcat.socket";
Review comment:
Indentation?
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
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65102] Build fails due to a lacking component
https://bz.apache.org/bugzilla/show_bug.cgi?id=65102 --- Comment #7 from Mark Thomas --- https://bz.apache.org/bugzilla/show_bug.cgi?id=65105 The latest Tomcat source has already worked around this 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 65102] Build fails due to a lacking component
https://bz.apache.org/bugzilla/show_bug.cgi?id=65102 --- Comment #8 from piotrw --- So why don't you just restore the 1.2.3 on your mirrors and leave the source bundle as it is? Why can't you host it together with 1.2.4 for one month longer? -- 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: DNS caching prevents running nodes to discover new pods. The new pods know about the already ready pods and try to join the cluster connecting to the running pods, so u
This is an automated email from the ASF dual-hosted git repository.
jfclere 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 838287e DNS caching prevents running nodes to discover new pods. The
new pods know about the already ready pods and try to join the cluster
connecting to the running pods, so use accept() to add the new pods.
838287e is described below
commit 838287e7d62d8992949f394e40717f68b75b133b
Author: Jean-Frederic Clere
AuthorDate: Tue Jan 26 10:23:15 2021 +0100
DNS caching prevents running nodes to discover new pods.
The new pods know about the already ready pods and try to
join the cluster connecting to the running pods, so use accept() to add the
new pods.
---
.../membership/cloud/DNSMembershipProvider.java| 51 +-
1 file changed, 50 insertions(+), 1 deletion(-)
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
b/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
index 551aaec..5095b35 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
@@ -18,9 +18,11 @@
package org.apache.catalina.tribes.membership.cloud;
import java.io.IOException;
+import java.io.Serializable;
import java.net.InetAddress;
import java.net.URLEncoder;
import java.net.UnknownHostException;
+import java.util.Arrays;
import java.util.ArrayList;
import java.util.List;
@@ -157,4 +159,51 @@ public class DNSMembershipProvider extends
CloudMembershipProvider {
return members.toArray(new Member[0]);
}
-}
\ No newline at end of file
+
+@Override
+public boolean accept(Serializable msg, Member sender) {
+// check is the sender is in the member list.
+boolean found = false;
+Member[] members = membership.getMembers();
+if (members != null) {
+for (Member member : members) {
+ if (Arrays.equals(sender.getHost(), sender.getHost()) &&
sender.getPort() == member.getPort()) {
+found = true;
+break;
+}
+}
+}
+if (!found) {
+// add it and it's thread
+MemberImpl member = new MemberImpl();
+member.setHost(sender.getHost());
+member.setPort(sender.getPort());
+byte[] host = sender.getHost();
+int i = 0;
+StringBuilder buf = new StringBuilder();
+buf.append(host[i++] & 0xff);
+ for (; i
[tomcat] branch master updated: Refactor to reduce code duplication
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 ae050b7 Refactor to reduce code duplication
ae050b7 is described below
commit ae050b72d6d3929084aece5dc15009e2583e87ce
Author: remm
AuthorDate: Tue Jan 26 11:27:20 2021 +0100
Refactor to reduce code duplication
This is a workaround for DNS caching which would make the updates fail.
The Kubernetes provider which uses the API seems more dependable
overall, although it requires enabling the necessary access permission.
---
.../membership/cloud/CloudMembershipProvider.java | 60 --
.../membership/cloud/DNSMembershipProvider.java| 31 ---
webapps/docs/changelog.xml | 8 +++
3 files changed, 49 insertions(+), 50 deletions(-)
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
index 3c6315d..319d130 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
@@ -127,38 +127,12 @@ public abstract class CloudMembershipProvider extends
MembershipProviderBase imp
Member[] announcedMembers = fetchMembers();
// Add new members or refresh the members in the membership
for (Member member : announcedMembers) {
-if (membership.memberAlive(member)) {
-if (log.isDebugEnabled()) {
-log.debug("Member added: " + member);
-}
-Runnable r = () -> {
-String name = Thread.currentThread().getName();
-try {
-
Thread.currentThread().setName("CloudMembership-memberAdded");
-membershipListener.memberAdded(member);
-} finally {
-Thread.currentThread().setName(name);
-}
-};
-executor.execute(r);
-}
+updateMember(member, true);
}
// Remove non refreshed members from the membership
Member[] expired = membership.expire(expirationTime);
for (Member member : expired) {
-if (log.isDebugEnabled()) {
-log.debug("Member disappeared: " + member);
-}
-Runnable r = () -> {
-String name = Thread.currentThread().getName();
-try {
-
Thread.currentThread().setName("CloudMembership-memberDisappeared");
-membershipListener.memberDisappeared(member);
-} finally {
-Thread.currentThread().setName(name);
-}
-};
-executor.execute(r);
+updateMember(member, false);
}
}
@@ -168,6 +142,36 @@ public abstract class CloudMembershipProvider extends
MembershipProviderBase imp
*/
protected abstract Member[] fetchMembers();
+/**
+ * Add or remove specified member.
+ * @param member the member to add
+ * @param add true if the member is added, false otherwise
+ */
+protected void updateMember(Member member, boolean add) {
+if (add && !membership.memberAlive(member)) {
+return;
+}
+if (log.isDebugEnabled()) {
+String message = add ? "Member added: " + member : "Member
disappeared: " + member;
+log.debug(message);
+}
+Runnable r = () -> {
+String name = Thread.currentThread().getName();
+try {
+String threadName = add ? "CloudMembership-memberAdded" :
"CloudMembership-memberDisappeared";
+Thread.currentThread().setName(threadName);
+if (add) {
+membershipListener.memberAdded(member);
+} else {
+membershipListener.memberDisappeared(member);
+}
+} finally {
+Thread.currentThread().setName(name);
+}
+};
+executor.execute(r);
+}
+
@Override
public void messageReceived(Serializable msg, Member sender) {
}
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
b/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
index 5095b35..543820b 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
@@ -22,8 +22,8 @@ import java.io.Serializable;
import java.net.InetAddress;
import java.net.URLEncoder;
import java.net.UnknownHostException;
-import java.util
[tomcat] branch 9.0.x updated (c691827 -> 766f662)
This is an automated email from the ASF dual-hosted git repository. remm pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from c691827 Ensure Windows signing uses sha256 hash new 8c9885f DNS caching prevents running nodes to discover new pods. The new pods know about the already ready pods and try to join the cluster connecting to the running pods, so use accept() to add the new pods. new 766f662 Refactor to reduce code duplication 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: .../membership/cloud/CloudMembershipProvider.java | 60 -- .../membership/cloud/DNSMembershipProvider.java| 38 +- webapps/docs/changelog.xml | 8 +++ 3 files changed, 77 insertions(+), 29 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Refactor to reduce code duplication
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 766f6625a87ab5cee998eac3280f1100c37379ee
Author: remm
AuthorDate: Tue Jan 26 11:27:20 2021 +0100
Refactor to reduce code duplication
This is a workaround for DNS caching which would make the updates fail.
The Kubernetes provider which uses the API seems more dependable
overall, although it requires enabling the necessary access permission.
---
.../membership/cloud/CloudMembershipProvider.java | 60 --
.../membership/cloud/DNSMembershipProvider.java| 31 ---
webapps/docs/changelog.xml | 8 +++
3 files changed, 49 insertions(+), 50 deletions(-)
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
index 3c6315d..319d130 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
@@ -127,38 +127,12 @@ public abstract class CloudMembershipProvider extends
MembershipProviderBase imp
Member[] announcedMembers = fetchMembers();
// Add new members or refresh the members in the membership
for (Member member : announcedMembers) {
-if (membership.memberAlive(member)) {
-if (log.isDebugEnabled()) {
-log.debug("Member added: " + member);
-}
-Runnable r = () -> {
-String name = Thread.currentThread().getName();
-try {
-
Thread.currentThread().setName("CloudMembership-memberAdded");
-membershipListener.memberAdded(member);
-} finally {
-Thread.currentThread().setName(name);
-}
-};
-executor.execute(r);
-}
+updateMember(member, true);
}
// Remove non refreshed members from the membership
Member[] expired = membership.expire(expirationTime);
for (Member member : expired) {
-if (log.isDebugEnabled()) {
-log.debug("Member disappeared: " + member);
-}
-Runnable r = () -> {
-String name = Thread.currentThread().getName();
-try {
-
Thread.currentThread().setName("CloudMembership-memberDisappeared");
-membershipListener.memberDisappeared(member);
-} finally {
-Thread.currentThread().setName(name);
-}
-};
-executor.execute(r);
+updateMember(member, false);
}
}
@@ -168,6 +142,36 @@ public abstract class CloudMembershipProvider extends
MembershipProviderBase imp
*/
protected abstract Member[] fetchMembers();
+/**
+ * Add or remove specified member.
+ * @param member the member to add
+ * @param add true if the member is added, false otherwise
+ */
+protected void updateMember(Member member, boolean add) {
+if (add && !membership.memberAlive(member)) {
+return;
+}
+if (log.isDebugEnabled()) {
+String message = add ? "Member added: " + member : "Member
disappeared: " + member;
+log.debug(message);
+}
+Runnable r = () -> {
+String name = Thread.currentThread().getName();
+try {
+String threadName = add ? "CloudMembership-memberAdded" :
"CloudMembership-memberDisappeared";
+Thread.currentThread().setName(threadName);
+if (add) {
+membershipListener.memberAdded(member);
+} else {
+membershipListener.memberDisappeared(member);
+}
+} finally {
+Thread.currentThread().setName(name);
+}
+};
+executor.execute(r);
+}
+
@Override
public void messageReceived(Serializable msg, Member sender) {
}
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
b/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
index 5095b35..543820b 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
@@ -22,8 +22,8 @@ import java.io.Serializable;
import java.net.InetAddress;
import java.net.URLEncoder;
import java.net.UnknownHostException;
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.apache.catalina.tribes.Member;
@@ -162,19 +162,19 @@
[tomcat] 01/02: DNS caching prevents running nodes to discover new pods. The new pods know about the already ready pods and try to join the cluster connecting to the running pods, so use accept() to a
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 8c9885f1a64d576e2e8684c7307d49efc7143a23
Author: Jean-Frederic Clere
AuthorDate: Tue Jan 26 10:23:15 2021 +0100
DNS caching prevents running nodes to discover new pods.
The new pods know about the already ready pods and try to
join the cluster connecting to the running pods, so use accept() to add the
new pods.
---
.../membership/cloud/DNSMembershipProvider.java| 51 +-
1 file changed, 50 insertions(+), 1 deletion(-)
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
b/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
index 551aaec..5095b35 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
@@ -18,9 +18,11 @@
package org.apache.catalina.tribes.membership.cloud;
import java.io.IOException;
+import java.io.Serializable;
import java.net.InetAddress;
import java.net.URLEncoder;
import java.net.UnknownHostException;
+import java.util.Arrays;
import java.util.ArrayList;
import java.util.List;
@@ -157,4 +159,51 @@ public class DNSMembershipProvider extends
CloudMembershipProvider {
return members.toArray(new Member[0]);
}
-}
\ No newline at end of file
+
+@Override
+public boolean accept(Serializable msg, Member sender) {
+// check is the sender is in the member list.
+boolean found = false;
+Member[] members = membership.getMembers();
+if (members != null) {
+for (Member member : members) {
+ if (Arrays.equals(sender.getHost(), sender.getHost()) &&
sender.getPort() == member.getPort()) {
+found = true;
+break;
+}
+}
+}
+if (!found) {
+// add it and it's thread
+MemberImpl member = new MemberImpl();
+member.setHost(sender.getHost());
+member.setPort(sender.getPort());
+byte[] host = sender.getHost();
+int i = 0;
+StringBuilder buf = new StringBuilder();
+buf.append(host[i++] & 0xff);
+ for (; i
[Bug 65102] Build fails due to a lacking component
https://bz.apache.org/bugzilla/show_bug.cgi?id=65102 --- Comment #9 from Mark Thomas --- ASF policy requires that the primary download site only contains the latest version to reduce the space requirements for mirrors (they sync from the primary download site). All ASF releases will always be available from the ASF archive site. -- 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 (ae050b7 -> c01057b)
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 ae050b7 Refactor to reduce code duplication
new 6e239b4 Import updated French translations
new 7a4fb45 Import updated Korean translations
new 405039c Import new and updated translations for Brazilian Portuguese
new 42d0b92 Update Russian translations
new c01057b Update 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/org/apache/catalina/connector/LocalStrings_ru.properties | 3 +++
java/org/apache/catalina/core/LocalStrings_pt_BR.properties | 4
java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties| 2 +-
.../org/apache/catalina/manager/LocalStrings_pt_BR.properties | 2 ++
java/org/apache/catalina/manager/LocalStrings_ru.properties | 4 ++--
.../catalina/manager/host/LocalStrings_pt_BR.properties | 3 +++
java/org/apache/catalina/realm/LocalStrings_pt_BR.properties | 2 ++
.../org/apache/catalina/session/LocalStrings_pt_BR.properties | 1 +
java/org/apache/catalina/session/LocalStrings_ru.properties | 2 +-
.../org/apache/catalina/session/LocalStrings_zh_CN.properties | 1 +
.../org/apache/catalina/startup/LocalStrings_pt_BR.properties | 2 ++
.../tribes/group/interceptors/LocalStrings_pt_BR.properties | 7 ---
.../catalina/tribes/tipis/LocalStrings_pt_BR.properties | 3 +++
java/org/apache/catalina/util/LocalStrings_ru.properties | 2 +-
java/org/apache/catalina/valves/LocalStrings_fr.properties| 1 +
java/org/apache/catalina/valves/LocalStrings_ko.properties| 1 +
java/org/apache/catalina/valves/LocalStrings_pt_BR.properties | 1 +
.../{catalina/connector => coyote}/LocalStrings_ru.properties | 2 +-
java/org/apache/coyote/ajp/LocalStrings_pt_BR.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_ru.properties | 1 +
.../org/apache/jasper/resources/LocalStrings_pt_BR.properties | 1 +
java/org/apache/jasper/resources/LocalStrings_ru.properties | 4
.../http11/upgrade => naming}/LocalStrings_ru.properties | 2 +-
.../deploy => naming/factory}/LocalStrings_pt_BR.properties | 2 +-
java/org/apache/tomcat/util/LocalStrings_ru.properties| 2 +-
java/org/apache/tomcat/util/compat/LocalStrings_fr.properties | 4
java/org/apache/tomcat/util/compat/LocalStrings_ko.properties | 4
.../util/descriptor/web}/LocalStrings_ru.properties | 2 +-
.../util/http/parser/LocalStrings_ru.properties} | 2 +-
java/org/apache/tomcat/util/net/LocalStrings_pt_BR.properties | 1 +
java/org/apache/tomcat/util/net/LocalStrings_ru.properties| 2 +-
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 3 +++
.../websocket/pojo}/LocalStrings_pt_BR.properties | 2 +-
webapps/docs/changelog.xml| 11 ++-
34 files changed, 70 insertions(+), 18 deletions(-)
copy java/org/apache/{catalina/connector => coyote}/LocalStrings_ru.properties
(85%)
copy java/org/apache/{coyote/http11/upgrade =>
naming}/LocalStrings_ru.properties (90%)
copy java/org/apache/{catalina/deploy =>
naming/factory}/LocalStrings_pt_BR.properties (84%)
copy java/org/apache/{catalina/connector =>
tomcat/util/descriptor/web}/LocalStrings_ru.properties (87%)
copy java/org/apache/{catalina/core/RestrictedFilters.properties =>
tomcat/util/http/parser/LocalStrings_ru.properties} (94%)
copy java/org/apache/{catalina/deploy =>
tomcat/websocket/pojo}/LocalStrings_pt_BR.properties (88%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/05: Update 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 c01057b833ef834327ef577a7686b832bcedc9e5
Author: Mark Thomas
AuthorDate: Tue Jan 26 11:40:04 2021 +
Update Chinese translations
---
java/org/apache/catalina/session/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 3 +++
webapps/docs/changelog.xml | 3 ++-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
index fc09078..0b31b7c 100644
--- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
@@ -20,6 +20,7 @@ dataSourceStore.checkConnectionSQLException=发生 SQL 异常 [{0}]
dataSourceStore.close=关闭数据库连接[{0}]时发生异常
dataSourceStore.commitSQLException=关闭前提交连接的SQLException
dataSourceStore.loading=正在从数据库[{1}]加载会话[{0}]
+dataSourceStore.missingDataSource=没有可用的数据源
dataSourceStore.missingDataSourceName=没有给出有效的 JNDI 名称。
dataSourceStore.removing=正在删除数据库{1}上的会话{0}]
dataSourceStore.saving=保存Session [{0}] 到数据库 [{1}]
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 159c72e..b5c32c8 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -154,6 +154,9 @@ socket.apr.write.error=将数据写入APR/native socket[{1}]时出现意外错
socket.closed=与此连接关联的套接字已关闭。
socket.sslreneg=重新协商SSL连接时出现异常
+socketWrapper.readTimeout=读取超时
+socketWrapper.writeTimeout=写入超时
+
sslHostConfig.certificate.notype=指定了多个证书，并且至少有一个证书缺少必需的属性类型
sslHostConfig.certificateVerificationInvalid=证书认证值[{0}]未识别
sslHostConfig.fileNotFound=配置文件 [{0}] 不存在
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 26b448a..eb17437 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -220,7 +220,8 @@
-Improvements to Chinese translations. Provided by leeyazhou. (markt)
+Improvements to Chinese translations. Provided by leeyazhou and Yi
Shen.
+(markt)
Improvements to French translations. (remm)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/05: Import new and updated translations for Brazilian Portuguese
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 405039c29f5df7c6bbce002a58c8a1dcb41854a5
Author: Mark Thomas
AuthorDate: Tue Jan 26 11:35:54 2021 +
Import new and updated translations for Brazilian Portuguese
---
java/org/apache/catalina/core/LocalStrings_pt_BR.properties| 4
java/org/apache/catalina/manager/LocalStrings_pt_BR.properties | 2 ++
.../org/apache/catalina/manager/host/LocalStrings_pt_BR.properties | 3 +++
java/org/apache/catalina/realm/LocalStrings_pt_BR.properties | 2 ++
java/org/apache/catalina/session/LocalStrings_pt_BR.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_pt_BR.properties | 2 ++
.../tribes/group/interceptors/LocalStrings_pt_BR.properties| 7 ---
.../org/apache/catalina/tribes/tipis/LocalStrings_pt_BR.properties | 3 +++
java/org/apache/catalina/valves/LocalStrings_pt_BR.properties | 1 +
java/org/apache/coyote/ajp/LocalStrings_pt_BR.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings_pt_BR.properties | 1 +
.../{coyote/ajp => naming/factory}/LocalStrings_pt_BR.properties | 2 +-
java/org/apache/tomcat/util/net/LocalStrings_pt_BR.properties | 1 +
.../host => tomcat/websocket/pojo}/LocalStrings_pt_BR.properties | 3 +--
webapps/docs/changelog.xml | 4
15 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_pt_BR.properties
b/java/org/apache/catalina/core/LocalStrings_pt_BR.properties
index 6782781..82e2ed5 100644
--- a/java/org/apache/catalina/core/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/core/LocalStrings_pt_BR.properties
@@ -24,6 +24,10 @@ defaultInstanceManager.restrictedListenersResource=Arquivo
de propriedades de li
filterChain.filter=Filtro de execuçõ lançou uma exceção
+naming.wsdlFailed=Falha ao buscar arquivo wsdl [{0}].
+
standardContext.listenerStart=Exceção ao enviar evento de contexto iniciado
para instância listener da classe [{0}]
standardContext.loginConfig.errorWarning=AVISO: Página de erro de formulário
[{0}] precisa iniciar com "/" no Servle 2.4
standardContext.securityConstraint.mixHttpMethod=Não é permitido misturar
e na mesma coleção de recursos web
+
+standardWrapper.unloading=Impossível alocar servlet [{0}] pois está sendo
descarregado.
diff --git a/java/org/apache/catalina/manager/LocalStrings_pt_BR.properties
b/java/org/apache/catalina/manager/LocalStrings_pt_BR.properties
index da6495c..4babdbc 100644
--- a/java/org/apache/catalina/manager/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_pt_BR.properties
@@ -19,3 +19,5 @@ htmlManagerServlet.serverIPAddress=Endereço IP
managerServlet.copyError=Não foi possível copiar o arquivo de configuração do
caminho [{0}]
managerServlet.deployed=OK - Instalada aplicação no path de contexto [{0}]
+managerServlet.mkdirFail=FALHA - Incapaz de criar o diretório [{0}]
+managerServlet.resourcesAll=Recursos de todos os tipos, listados.
diff --git
a/java/org/apache/catalina/manager/host/LocalStrings_pt_BR.properties
b/java/org/apache/catalina/manager/host/LocalStrings_pt_BR.properties
index 9a414e6..eaaa194 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_pt_BR.properties
@@ -13,5 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+hostManagerServlet.managerXml=FALHA - Não foi possível instalar manager.xml
+
htmlHostManagerServlet.addHost=Host
+htmlHostManagerServlet.addManager=Aplicativo gerenciador.
htmlHostManagerServlet.hostName=Host
diff --git a/java/org/apache/catalina/realm/LocalStrings_pt_BR.properties
b/java/org/apache/catalina/realm/LocalStrings_pt_BR.properties
index 2d4903a..8ad30ad 100644
--- a/java/org/apache/catalina/realm/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_pt_BR.properties
@@ -19,5 +19,7 @@ jaasMemoryLoginModule.unknownAuthenticationMethod=Método de
autenticação desc
lockOutRealm.authLockedUser=Foi feita uma tentativa de autenticação do usuário
já bloqueado [{0}]
+memoryRealm.loadExist=Arquivo de banco de dados de memória [{0}] ilegível.
+
realmBase.authenticateFailure=Usuário [{0}] NÃO autenticado
realmBase.createUsernameRetriever.ClassCastException=Classe [{0}} não é um
X509UsernameRetriever
diff --git a/java/org/apache/catalina/session/LocalStrings_pt_BR.properties
b/java/org/apache/catalina/session/LocalStrings_pt_BR.properties
index 879a9d9..459885e 100644
--- a/java/org/apache/catalina/session/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/session/LocalStrings_pt_BR.properties
@@ -16,3 +16,4 @@
persistentManager.isLoadedError=Erro ao checar ser a sessão [{0}] foi
carre
[tomcat] 01/05: Import updated 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 6e239b4c3c522635ed76e723958c02011815e387
Author: Mark Thomas
AuthorDate: Tue Jan 26 11:29:13 2021 +
Import updated French translations
---
java/org/apache/catalina/valves/LocalStrings_fr.properties| 1 +
java/org/apache/tomcat/util/compat/LocalStrings_fr.properties | 4
2 files changed, 5 insertions(+)
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties
b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index 459fa2c..a55269a 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -18,6 +18,7 @@ accessLogValve.closeFail=Échec de fermeture du fichier de
journal d'accès
accessLogValve.deleteFail=Impossible d''effacer l''ancien journal d''accès
[{0}]
accessLogValve.invalidLocale=Impossible de définir les paramètres régionaux
sur [{0}]
accessLogValve.invalidPortType=Type de port [{0}] invalide, utilisation du
port (local) de serveur
+accessLogValve.invalidRemoteAddressType=Le type [{0}] d’adresse distante est
invalide, l''adresse distante classique sera utilisée et non celle du pair
accessLogValve.openDirFail=Echec de création du répertoire [{0}] pour les
journaux d''accès
accessLogValve.openFail=Echec à l''ouverture du journal d''accès [{0}]
accessLogValve.renameFail=Échec de renommage du journal d''accès de [{0}] en
[{1}]
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
index 998e08b..cfb8a96 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
@@ -13,9 +13,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+jre16Compat.javaPre16=Le code est considéré être exécuté sur une JVM
antérieure à Java 16 car la classe n'a pas été trouvée
+jre16Compat.unexpected=Impossible de créer les références vers les classes et
méthodes de Java 16
+
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
+jreCompat.noUnixDomainSocket=L'environnement Java ne supporte pas les sockets
de domaine de Unix, cette fonctionnalité demande Java 16
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/05: Import updated Korean 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 7a4fb457532864b0913c8a64e4c1b85d885c7963
Author: Mark Thomas
AuthorDate: Tue Jan 26 11:30:56 2021 +
Import updated Korean translations
---
java/org/apache/catalina/valves/LocalStrings_ko.properties| 1 +
java/org/apache/tomcat/util/compat/LocalStrings_ko.properties | 4
2 files changed, 5 insertions(+)
diff --git a/java/org/apache/catalina/valves/LocalStrings_ko.properties
b/java/org/apache/catalina/valves/LocalStrings_ko.properties
index 4a46de4..55502ce 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ko.properties
@@ -18,6 +18,7 @@ accessLogValve.closeFail=접근 로그 파일을 닫지 못했습니다.
accessLogValve.deleteFail=이전 접근 로그 파일 [{0}]을(를) 삭제하지 못했습니다.
accessLogValve.invalidLocale=로케일을 [{0}](으)로 설정하지 못했습니다.
accessLogValve.invalidPortType=유효하지 않은 포트 타입 [{0}]. 서버 (로컬) 포트를 사용합니다.
+accessLogValve.invalidRemoteAddressType=유효하지 않은 원격 주소 타입 [{0}]. Peer가 아닌 원격
주소로 간주합니다.
accessLogValve.openDirFail=접근 로그 파일(들)을 위한 디렉토리 [{0}]을(를) 생성하지 못했습니다.
accessLogValve.openFail=접근 로그 파일 [{0}]을(를) 열지 못했습니다.
accessLogValve.renameFail=접근 로그 파일을 [{0}]에서 [{1}](으)로 이름을 변경하지 못했습니다.
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
index c24992f..b5666eb 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
@@ -13,9 +13,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+jre16Compat.javaPre16=클래스가 발견되지 않습니다. 자바 16 이전의 JVM에서 실행 중인 것으로 보입니다.
+jre16Compat.unexpected=자바 16 클래스들과 메소드들을 참조할 수 없습니다.
+
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를 사용해야
합니다.
+jreCompat.noUnixDomainSocket=자바 런타임이 Unix 도메인 소켓을 지원하지 않습니다. 이 기능을 사용하려면 자바
16을 사용해야 합니다.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/05: Update Russian 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 42d0b92d63bcd4a6a5dbb73315f558c13fab2857
Author: Mark Thomas
AuthorDate: Tue Jan 26 11:38:04 2021 +
Update Russian translations
---
java/org/apache/catalina/connector/LocalStrings_ru.properties | 3 +++
java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties| 2 +-
java/org/apache/catalina/manager/LocalStrings_ru.properties | 4 ++--
java/org/apache/catalina/session/LocalStrings_ru.properties | 2 +-
java/org/apache/catalina/util/LocalStrings_ru.properties | 2 +-
.../apache/{catalina/connector => coyote}/LocalStrings_ru.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_ru.properties | 1 +
java/org/apache/jasper/resources/LocalStrings_ru.properties | 4
.../apache/{catalina/connector => naming}/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/util/LocalStrings_ru.properties| 2 +-
.../util/descriptor/web}/LocalStrings_ru.properties | 2 +-
.../connector => tomcat/util/http/parser}/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/util/net/LocalStrings_ru.properties| 2 +-
webapps/docs/changelog.xml| 4
14 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties
b/java/org/apache/catalina/connector/LocalStrings_ru.properties
index 9cf2f86..7aacaec 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ru.properties
@@ -14,3 +14,6 @@
# limitations under the License.
coyoteAdapter.debug=Переменная [{0}] имеет значение [{1}]
+
+coyoteConnector.invalidEncoding=\n\
+Кодировка [{0}] не распознана JRE. Коннектор продолжит использовать [{1}]
diff --git a/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
b/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
index 08673fa..9d21e49 100644
--- a/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ReplicationValve.filter.failure=Не возможно скомпилировать фильтрr=[{0}]
+ReplicationValve.filter.failure=Не возможно скомпилировать фильтр=[{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties
b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index 386b452..afa1e9d 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -118,7 +118,7 @@ htmlManagerServlet.title=Управление веб-приложениями To
managerServlet.alreadyContext=ОШИБКА - Приложение уже существует на пути [{0}]
managerServlet.certsNotAvailable=Информация о сертификате не может быть
получена во время работы
managerServlet.deleteFail=ОШИБКА - Не удалось удалить [{0}].
-managerServlet.deployFailed=ОШИБКА - Не удалось развернуть приложение на
контекстом пути [{0}]
+managerServlet.deployFailed=ОШИБКА - Не удалось развернуть приложение на
контекстном пути [{0}]
managerServlet.deployed=OK - Приложение успешно развёрнуто в контекстном пути
[{0}]
managerServlet.deployedButNotStarted=ОШИБКА - Приложение было развёрнуто в
контекстном пути [{0}], но не стартовало
managerServlet.exception=ОШИБКА - Встретилось исключение [{0}]
@@ -158,7 +158,7 @@ managerServlet.sslConnectorTrustedCerts=OK - Информация о
довер
managerServlet.sslReload=OK - Перезагрузка конфигурации TLS для [{0}]
managerServlet.sslReloadAll=OK - Перезагрузка конфигурации TLS для всех
виртуальных хостов TLS
managerServlet.sslReloadFail=ОШИБКА - Не удалось перезагрузить конфигурацию TLS
-managerServlet.startFailed=ОШИБКА - Application at context path [{0}] could
not be started
+managerServlet.startFailed=ОШИБКА - Приложение по контекстному пути [{0}] не
запустилось
managerServlet.started=OK - Запущено приложение по пути контекста [{0}]
managerServlet.stopped=OK - Остановлено приложение по пути контекста [{0}]
managerServlet.storeConfig.noMBean=ОШИБКА - Нет StoreConfig MBean,
зарегистрированный на [{0}]
diff --git a/java/org/apache/catalina/session/LocalStrings_ru.properties
b/java/org/apache/catalina/session/LocalStrings_ru.properties
index 0e3ed52..ffb181a 100644
--- a/java/org/apache/catalina/session/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-dataSourceStore.connectError=Не возможно подключиться к базе данных [{0}]
+managerBase.contextNull=Перед использованием Менеджера контексту необходимо
присвоить
[tomcat] branch master updated: Standardise use of '
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 0e9451d Standardise use of '
0e9451d is described below
commit 0e9451d21753225950a5c3be209b49507f71ea7f
Author: Mark Thomas
AuthorDate: Tue Jan 26 11:47:32 2021 +
Standardise use of '
---
java/org/apache/catalina/valves/LocalStrings_fr.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties
b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index a55269a..01eb334 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -18,7 +18,7 @@ accessLogValve.closeFail=Échec de fermeture du fichier de
journal d'accès
accessLogValve.deleteFail=Impossible d''effacer l''ancien journal d''accès
[{0}]
accessLogValve.invalidLocale=Impossible de définir les paramètres régionaux
sur [{0}]
accessLogValve.invalidPortType=Type de port [{0}] invalide, utilisation du
port (local) de serveur
-accessLogValve.invalidRemoteAddressType=Le type [{0}] d’adresse distante est
invalide, l''adresse distante classique sera utilisée et non celle du pair
+accessLogValve.invalidRemoteAddressType=Le type [{0}] d''adresse distante est
invalide, l''adresse distante classique sera utilisée et non celle du pair
accessLogValve.openDirFail=Echec de création du répertoire [{0}] pour les
journaux d''accès
accessLogValve.openFail=Echec à l''ouverture du journal d''accès [{0}]
accessLogValve.renameFail=Échec de renommage du journal d''accès de [{0}] en
[{1}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated (766f662 -> 2f71d3b)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 766f662 Refactor to reduce code duplication
new 1f4133f Backport updates to French translations
new c60d006 Backport updates to Korean translations
new 96a9cc1 Improvements to Brazilian Portuguese translations
new e4e2db5 Improvements to Russian translations
new 2f71d3b Improvements to 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/org/apache/catalina/connector/LocalStrings_ru.properties | 3 +++
java/org/apache/catalina/core/LocalStrings_pt_BR.properties | 4
java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties| 2 +-
.../org/apache/catalina/manager/LocalStrings_pt_BR.properties | 2 ++
java/org/apache/catalina/manager/LocalStrings_ru.properties | 4 ++--
.../catalina/manager/host/LocalStrings_pt_BR.properties | 3 +++
java/org/apache/catalina/realm/LocalStrings_pt_BR.properties | 2 ++
.../org/apache/catalina/session/LocalStrings_pt_BR.properties | 1 +
java/org/apache/catalina/session/LocalStrings_ru.properties | 2 ++
.../org/apache/catalina/startup/LocalStrings_pt_BR.properties | 2 ++
.../tribes/group/interceptors/LocalStrings_pt_BR.properties | 7 ---
.../catalina/tribes/tipis/LocalStrings_pt_BR.properties | 3 +++
java/org/apache/catalina/util/LocalStrings_ru.properties | 2 +-
java/org/apache/catalina/valves/LocalStrings_fr.properties| 1 +
java/org/apache/catalina/valves/LocalStrings_ko.properties| 1 +
java/org/apache/catalina/valves/LocalStrings_pt_BR.properties | 1 +
.../{catalina/connector => coyote}/LocalStrings_ru.properties | 2 +-
java/org/apache/coyote/ajp/LocalStrings_pt_BR.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_ru.properties | 1 +
.../org/apache/jasper/resources/LocalStrings_pt_BR.properties | 1 +
java/org/apache/jasper/resources/LocalStrings_ru.properties | 4
.../{catalina/connector => naming}/LocalStrings_ru.properties | 2 +-
.../jaspic => naming/factory}/LocalStrings_pt_BR.properties | 2 +-
java/org/apache/tomcat/util/LocalStrings_ru.properties| 2 +-
java/org/apache/tomcat/util/compat/LocalStrings_fr.properties | 4
java/org/apache/tomcat/util/compat/LocalStrings_ko.properties | 4
.../util/descriptor/web}/LocalStrings_ru.properties | 2 +-
.../util/http/parser/LocalStrings_ru.properties} | 3 +--
java/org/apache/tomcat/util/net/LocalStrings_pt_BR.properties | 1 +
java/org/apache/tomcat/util/net/LocalStrings_ru.properties| 2 +-
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 3 +++
.../websocket/pojo}/LocalStrings_pt_BR.properties | 2 +-
webapps/docs/changelog.xml| 11 ++-
33 files changed, 70 insertions(+), 18 deletions(-)
copy java/org/apache/{catalina/connector => coyote}/LocalStrings_ru.properties
(85%)
copy java/org/apache/{catalina/connector => naming}/LocalStrings_ru.properties
(90%)
copy java/org/apache/{catalina/authenticator/jaspic =>
naming/factory}/LocalStrings_pt_BR.properties (84%)
copy java/org/apache/{catalina/connector =>
tomcat/util/descriptor/web}/LocalStrings_ru.properties (87%)
copy java/org/apache/{catalina/util/CharsetMapperDefault.properties =>
tomcat/util/http/parser/LocalStrings_ru.properties} (94%)
copy java/org/apache/{catalina/deploy =>
tomcat/websocket/pojo}/LocalStrings_pt_BR.properties (88%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/05: Improvements to Russian translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e4e2db516d7078064e4ebf918de341f513f0d517
Author: Mark Thomas
AuthorDate: Tue Jan 26 11:53:42 2021 +
Improvements to Russian translations
---
java/org/apache/catalina/connector/LocalStrings_ru.properties | 3 +++
java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties| 2 +-
java/org/apache/catalina/manager/LocalStrings_ru.properties | 4 ++--
java/org/apache/catalina/session/LocalStrings_ru.properties | 2 ++
java/org/apache/catalina/util/LocalStrings_ru.properties | 2 +-
.../apache/{catalina/connector => coyote}/LocalStrings_ru.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_ru.properties | 1 +
java/org/apache/jasper/resources/LocalStrings_ru.properties | 4
.../apache/{catalina/connector => naming}/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/util/LocalStrings_ru.properties| 2 +-
.../util/descriptor/web}/LocalStrings_ru.properties | 2 +-
.../connector => tomcat/util/http/parser}/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/util/net/LocalStrings_ru.properties| 2 +-
webapps/docs/changelog.xml| 4 ++--
14 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties
b/java/org/apache/catalina/connector/LocalStrings_ru.properties
index 9cf2f86..7aacaec 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ru.properties
@@ -14,3 +14,6 @@
# limitations under the License.
coyoteAdapter.debug=Переменная [{0}] имеет значение [{1}]
+
+coyoteConnector.invalidEncoding=\n\
+Кодировка [{0}] не распознана JRE. Коннектор продолжит использовать [{1}]
diff --git a/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
b/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
index 08673fa..9d21e49 100644
--- a/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ReplicationValve.filter.failure=Не возможно скомпилировать фильтрr=[{0}]
+ReplicationValve.filter.failure=Не возможно скомпилировать фильтр=[{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties
b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index 386b452..afa1e9d 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -118,7 +118,7 @@ htmlManagerServlet.title=Управление веб-приложениями To
managerServlet.alreadyContext=ОШИБКА - Приложение уже существует на пути [{0}]
managerServlet.certsNotAvailable=Информация о сертификате не может быть
получена во время работы
managerServlet.deleteFail=ОШИБКА - Не удалось удалить [{0}].
-managerServlet.deployFailed=ОШИБКА - Не удалось развернуть приложение на
контекстом пути [{0}]
+managerServlet.deployFailed=ОШИБКА - Не удалось развернуть приложение на
контекстном пути [{0}]
managerServlet.deployed=OK - Приложение успешно развёрнуто в контекстном пути
[{0}]
managerServlet.deployedButNotStarted=ОШИБКА - Приложение было развёрнуто в
контекстном пути [{0}], но не стартовало
managerServlet.exception=ОШИБКА - Встретилось исключение [{0}]
@@ -158,7 +158,7 @@ managerServlet.sslConnectorTrustedCerts=OK - Информация о
довер
managerServlet.sslReload=OK - Перезагрузка конфигурации TLS для [{0}]
managerServlet.sslReloadAll=OK - Перезагрузка конфигурации TLS для всех
виртуальных хостов TLS
managerServlet.sslReloadFail=ОШИБКА - Не удалось перезагрузить конфигурацию TLS
-managerServlet.startFailed=ОШИБКА - Application at context path [{0}] could
not be started
+managerServlet.startFailed=ОШИБКА - Приложение по контекстному пути [{0}] не
запустилось
managerServlet.started=OK - Запущено приложение по пути контекста [{0}]
managerServlet.stopped=OK - Остановлено приложение по пути контекста [{0}]
managerServlet.storeConfig.noMBean=ОШИБКА - Нет StoreConfig MBean,
зарегистрированный на [{0}]
diff --git a/java/org/apache/catalina/session/LocalStrings_ru.properties
b/java/org/apache/catalina/session/LocalStrings_ru.properties
index badde70..2f43bf3 100644
--- a/java/org/apache/catalina/session/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ru.properties
@@ -14,3 +14,5 @@
# limitations under the License.
JDBCStore.connectError=Не возможно подключиться к базе данных [{0}]
+
+managerBase.contextNull=Перед использованием Менеджера контексту необходимо
присвоить не пустое значение
diff --git a/java/org/apache/catalina/util/Loca
[tomcat] 01/05: Backport updates to French translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1f4133fe722286c04607f1f54621311d54342261
Author: Mark Thomas
AuthorDate: Tue Jan 26 11:49:50 2021 +
Backport updates to French translations
---
java/org/apache/catalina/valves/LocalStrings_fr.properties| 1 +
java/org/apache/tomcat/util/compat/LocalStrings_fr.properties | 4
2 files changed, 5 insertions(+)
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties
b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index 459fa2c..01eb334 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -18,6 +18,7 @@ accessLogValve.closeFail=Échec de fermeture du fichier de
journal d'accès
accessLogValve.deleteFail=Impossible d''effacer l''ancien journal d''accès
[{0}]
accessLogValve.invalidLocale=Impossible de définir les paramètres régionaux
sur [{0}]
accessLogValve.invalidPortType=Type de port [{0}] invalide, utilisation du
port (local) de serveur
+accessLogValve.invalidRemoteAddressType=Le type [{0}] d''adresse distante est
invalide, l''adresse distante classique sera utilisée et non celle du pair
accessLogValve.openDirFail=Echec de création du répertoire [{0}] pour les
journaux d''accès
accessLogValve.openFail=Echec à l''ouverture du journal d''accès [{0}]
accessLogValve.renameFail=Échec de renommage du journal d''accès de [{0}] en
[{1}]
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
index 998e08b..cfb8a96 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_fr.properties
@@ -13,9 +13,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+jre16Compat.javaPre16=Le code est considéré être exécuté sur une JVM
antérieure à Java 16 car la classe n'a pas été trouvée
+jre16Compat.unexpected=Impossible de créer les références vers les classes et
méthodes de Java 16
+
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
+jreCompat.noUnixDomainSocket=L'environnement Java ne supporte pas les sockets
de domaine de Unix, cette fonctionnalité demande Java 16
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/05: Improvements to Brazilian Portuguese translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 96a9cc1fb285e0be3e14d96b43879bc65816f36a
Author: Mark Thomas
AuthorDate: Tue Jan 26 11:52:56 2021 +
Improvements to Brazilian Portuguese translations
---
java/org/apache/catalina/core/LocalStrings_pt_BR.properties | 4
java/org/apache/catalina/manager/LocalStrings_pt_BR.properties| 2 ++
.../apache/catalina/manager/host/LocalStrings_pt_BR.properties| 3 +++
java/org/apache/catalina/realm/LocalStrings_pt_BR.properties | 2 ++
java/org/apache/catalina/session/LocalStrings_pt_BR.properties| 1 +
java/org/apache/catalina/startup/LocalStrings_pt_BR.properties| 2 ++
.../tribes/group/interceptors/LocalStrings_pt_BR.properties | 7 ---
.../apache/catalina/tribes/tipis/LocalStrings_pt_BR.properties| 3 +++
java/org/apache/catalina/valves/LocalStrings_pt_BR.properties | 1 +
java/org/apache/coyote/ajp/LocalStrings_pt_BR.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings_pt_BR.properties| 1 +
.../{coyote/ajp => naming/factory}/LocalStrings_pt_BR.properties | 2 +-
java/org/apache/tomcat/util/net/LocalStrings_pt_BR.properties | 1 +
.../host => tomcat/websocket/pojo}/LocalStrings_pt_BR.properties | 3 +--
webapps/docs/changelog.xml| 8
15 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_pt_BR.properties
b/java/org/apache/catalina/core/LocalStrings_pt_BR.properties
index 6782781..82e2ed5 100644
--- a/java/org/apache/catalina/core/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/core/LocalStrings_pt_BR.properties
@@ -24,6 +24,10 @@ defaultInstanceManager.restrictedListenersResource=Arquivo
de propriedades de li
filterChain.filter=Filtro de execuçõ lançou uma exceção
+naming.wsdlFailed=Falha ao buscar arquivo wsdl [{0}].
+
standardContext.listenerStart=Exceção ao enviar evento de contexto iniciado
para instância listener da classe [{0}]
standardContext.loginConfig.errorWarning=AVISO: Página de erro de formulário
[{0}] precisa iniciar com "/" no Servle 2.4
standardContext.securityConstraint.mixHttpMethod=Não é permitido misturar
e na mesma coleção de recursos web
+
+standardWrapper.unloading=Impossível alocar servlet [{0}] pois está sendo
descarregado.
diff --git a/java/org/apache/catalina/manager/LocalStrings_pt_BR.properties
b/java/org/apache/catalina/manager/LocalStrings_pt_BR.properties
index da6495c..4babdbc 100644
--- a/java/org/apache/catalina/manager/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_pt_BR.properties
@@ -19,3 +19,5 @@ htmlManagerServlet.serverIPAddress=Endereço IP
managerServlet.copyError=Não foi possível copiar o arquivo de configuração do
caminho [{0}]
managerServlet.deployed=OK - Instalada aplicação no path de contexto [{0}]
+managerServlet.mkdirFail=FALHA - Incapaz de criar o diretório [{0}]
+managerServlet.resourcesAll=Recursos de todos os tipos, listados.
diff --git
a/java/org/apache/catalina/manager/host/LocalStrings_pt_BR.properties
b/java/org/apache/catalina/manager/host/LocalStrings_pt_BR.properties
index 9a414e6..eaaa194 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_pt_BR.properties
@@ -13,5 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+hostManagerServlet.managerXml=FALHA - Não foi possível instalar manager.xml
+
htmlHostManagerServlet.addHost=Host
+htmlHostManagerServlet.addManager=Aplicativo gerenciador.
htmlHostManagerServlet.hostName=Host
diff --git a/java/org/apache/catalina/realm/LocalStrings_pt_BR.properties
b/java/org/apache/catalina/realm/LocalStrings_pt_BR.properties
index 2d4903a..8ad30ad 100644
--- a/java/org/apache/catalina/realm/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_pt_BR.properties
@@ -19,5 +19,7 @@ jaasMemoryLoginModule.unknownAuthenticationMethod=Método de
autenticação desc
lockOutRealm.authLockedUser=Foi feita uma tentativa de autenticação do usuário
já bloqueado [{0}]
+memoryRealm.loadExist=Arquivo de banco de dados de memória [{0}] ilegível.
+
realmBase.authenticateFailure=Usuário [{0}] NÃO autenticado
realmBase.createUsernameRetriever.ClassCastException=Classe [{0}} não é um
X509UsernameRetriever
diff --git a/java/org/apache/catalina/session/LocalStrings_pt_BR.properties
b/java/org/apache/catalina/session/LocalStrings_pt_BR.properties
index 879a9d9..459885e 100644
--- a/java/org/apache/catalina/session/LocalStrings_pt_BR.properties
+++ b/java/org/apache/catalina/session/LocalStrings_pt_BR.properties
@@ -16,3 +16,4 @@
persistentManager.isLoadedError=Erro ao checar ser a sessão [{0}] foi
carregada na memória
persis
[tomcat] 05/05: Improvements to Chinese translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2f71d3ba4ca5de129f865e310c0d43f7cfa66f89
Author: Mark Thomas
AuthorDate: Tue Jan 26 11:54:11 2021 +
Improvements to Chinese translations
---
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 3 +++
webapps/docs/changelog.xml| 3 ++-
2 files changed, 5 insertions(+), 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 159c72e..b5c32c8 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -154,6 +154,9 @@ socket.apr.write.error=将数据写入APR/native socket[{1}]时出现意外错
socket.closed=与此连接关联的套接字已关闭。
socket.sslreneg=重新协商SSL连接时出现异常
+socketWrapper.readTimeout=读取超时
+socketWrapper.writeTimeout=写入超时
+
sslHostConfig.certificate.notype=指定了多个证书，并且至少有一个证书缺少必需的属性类型
sslHostConfig.certificateVerificationInvalid=证书认证值[{0}]未识别
sslHostConfig.fileNotFound=配置文件 [{0}] 不存在
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cc29de5..5b8a41a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -220,7 +220,8 @@
-Improvements to Chinese translations. Provided by leeyazhou. (markt)
+Improvements to Chinese translations. Provided by leeyazhouand Yi Shen.
+(markt)
Improvements to French translations. (remm)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/05: Backport updates to Korean translations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c60d00620e1021453deaad4c8069b646a9595ac7
Author: Mark Thomas
AuthorDate: Tue Jan 26 11:50:26 2021 +
Backport updates to Korean translations
---
java/org/apache/catalina/valves/LocalStrings_ko.properties| 1 +
java/org/apache/tomcat/util/compat/LocalStrings_ko.properties | 4
2 files changed, 5 insertions(+)
diff --git a/java/org/apache/catalina/valves/LocalStrings_ko.properties
b/java/org/apache/catalina/valves/LocalStrings_ko.properties
index 4a46de4..55502ce 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ko.properties
@@ -18,6 +18,7 @@ accessLogValve.closeFail=접근 로그 파일을 닫지 못했습니다.
accessLogValve.deleteFail=이전 접근 로그 파일 [{0}]을(를) 삭제하지 못했습니다.
accessLogValve.invalidLocale=로케일을 [{0}](으)로 설정하지 못했습니다.
accessLogValve.invalidPortType=유효하지 않은 포트 타입 [{0}]. 서버 (로컬) 포트를 사용합니다.
+accessLogValve.invalidRemoteAddressType=유효하지 않은 원격 주소 타입 [{0}]. Peer가 아닌 원격
주소로 간주합니다.
accessLogValve.openDirFail=접근 로그 파일(들)을 위한 디렉토리 [{0}]을(를) 생성하지 못했습니다.
accessLogValve.openFail=접근 로그 파일 [{0}]을(를) 열지 못했습니다.
accessLogValve.renameFail=접근 로그 파일을 [{0}]에서 [{1}](으)로 이름을 변경하지 못했습니다.
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
index c24992f..b5666eb 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_ko.properties
@@ -13,9 +13,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+jre16Compat.javaPre16=클래스가 발견되지 않습니다. 자바 16 이전의 JVM에서 실행 중인 것으로 보입니다.
+jre16Compat.unexpected=자바 16 클래스들과 메소드들을 참조할 수 없습니다.
+
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를 사용해야
합니다.
+jreCompat.noUnixDomainSocket=자바 런타임이 Unix 도메인 소켓을 지원하지 않습니다. 이 기능을 사용하려면 자바
16을 사용해야 합니다.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new de001c2 Fix typo de001c2 is described below commit de001c2b258c6f8cc3487ac292bc0bc16c45f3e3 Author: Mark Thomas AuthorDate: Tue Jan 26 11:59:45 2021 + Fix typo --- 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 5b8a41a..8b13143 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -220,7 +220,7 @@ -Improvements to Chinese translations. Provided by leeyazhouand Yi Shen. +Improvements to Chinese translations. Provided by leeyazhou and Yi Shen. (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 (f12339c -> f0976b0)
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 f12339c Ensure Windows signing uses sha256 hash
new e50d45a Backport French translations
new 1d44d30 Back-port Korean translations
new 8d299fa Backport improvements to Russian translations
new f0976b0 Back-port updates to Chinese translations
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/org/apache/catalina/connector/LocalStrings_ru.properties | 3 +++
java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties | 2 +-
java/org/apache/catalina/manager/LocalStrings_ru.properties| 4 ++--
java/org/apache/catalina/session/LocalStrings_ru.properties| 2 ++
java/org/apache/catalina/util/LocalStrings_ru.properties | 2 +-
java/org/apache/catalina/valves/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/valves/LocalStrings_ko.properties | 1 +
.../apache/{catalina/ha/tcp => coyote}/LocalStrings_ru.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_ru.properties| 1 +
java/org/apache/jasper/resources/LocalStrings_ru.properties| 4
.../{coyote/http11/upgrade => naming}/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/util/LocalStrings_ru.properties | 2 +-
.../tcp => tomcat/util/descriptor/web}/LocalStrings_ru.properties | 2 +-
.../util/http/parser/LocalStrings_ru.properties} | 1 +
java/org/apache/tomcat/util/net/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 3 +++
webapps/docs/changelog.xml | 7 ++-
17 files changed, 31 insertions(+), 10 deletions(-)
copy java/org/apache/{catalina/ha/tcp => coyote}/LocalStrings_ru.properties
(85%)
copy java/org/apache/{coyote/http11/upgrade =>
naming}/LocalStrings_ru.properties (90%)
copy java/org/apache/{catalina/ha/tcp =>
tomcat/util/descriptor/web}/LocalStrings_ru.properties (87%)
copy java/org/apache/{catalina/core/RestrictedListeners.properties =>
tomcat/util/http/parser/LocalStrings_ru.properties} (94%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/04: Backport 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 e50d45a56c6b371f74870ffc48059b5a0ffe0ede
Author: Mark Thomas
AuthorDate: Tue Jan 26 11:57:21 2021 +
Backport French translations
---
java/org/apache/catalina/valves/LocalStrings_fr.properties | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties
b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index 1c56a74..bafd479 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -18,6 +18,7 @@ accessLogValve.closeFail=Échec de fermeture du fichier de
journal d'accès
accessLogValve.deleteFail=Impossible d''effacer l''ancien journal d''accès
[{0}]
accessLogValve.invalidLocale=Impossible de définir les paramètres régionaux
sur [{0}]
accessLogValve.invalidPortType=Type de port [{0}] invalide, utilisation du
port (local) de serveur
+accessLogValve.invalidRemoteAddressType=Le type [{0}] d''adresse distante est
invalide, l''adresse distante classique sera utilisée et non celle du pair
accessLogValve.openDirFail=Echec de création du répertoire [{0}] pour les
journaux d''accès
accessLogValve.openFail=Echec à l''ouverture du journal d''accès [{0}]
accessLogValve.renameFail=Échec de renommage du journal d''accès de [{0}] en
[{1}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/04: Back-port updates to 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 f0976b0279f1ecd6d4409ebab58fc2fef6b48236
Author: Mark Thomas
AuthorDate: Tue Jan 26 11:59:35 2021 +
Back-port updates to Chinese translations
---
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 3 +++
webapps/docs/changelog.xml| 3 ++-
2 files changed, 5 insertions(+), 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 00a8524..08ab3df 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -131,6 +131,9 @@ socket.apr.write.error=将数据写入APR/native socket[{1}]时出现意外错
socket.closed=与此连接关联的套接字已关闭。
socket.sslreneg=重新协商SSL连接时出现异常
+socketWrapper.readTimeout=读取超时
+socketWrapper.writeTimeout=写入超时
+
sslHostConfig.certificate.notype=指定了多个证书，并且至少有一个证书缺少必需的属性类型
sslHostConfig.certificateVerificationInvalid=证书认证值[{0}]未识别
sslHostConfig.fileNotFound=配置文件 [{0}] 不存在
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 88d3b8e..5f2734d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -209,7 +209,8 @@
-Improvements to Chinese translations. Provided by leeyazhou. (markt)
+Improvements to Chinese translations. Provided by leeyazhou and Yi
Shen.
+(markt)
Improvements to French translations. (remm)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/04: Back-port Korean 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 1d44d30321bedc11e80553a2a0e87eec714ba044
Author: Mark Thomas
AuthorDate: Tue Jan 26 11:57:42 2021 +
Back-port Korean translations
---
java/org/apache/catalina/valves/LocalStrings_ko.properties | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/catalina/valves/LocalStrings_ko.properties
b/java/org/apache/catalina/valves/LocalStrings_ko.properties
index 48a04ed..bd8918f 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ko.properties
@@ -18,6 +18,7 @@ accessLogValve.closeFail=접근 로그 파일을 닫지 못했습니다.
accessLogValve.deleteFail=이전 접근 로그 파일 [{0}]을(를) 삭제하지 못했습니다.
accessLogValve.invalidLocale=로케일을 [{0}](으)로 설정하지 못했습니다.
accessLogValve.invalidPortType=유효하지 않은 포트 타입 [{0}]. 서버 (로컬) 포트를 사용합니다.
+accessLogValve.invalidRemoteAddressType=유효하지 않은 원격 주소 타입 [{0}]. Peer가 아닌 원격
주소로 간주합니다.
accessLogValve.openDirFail=접근 로그 파일(들)을 위한 디렉토리 [{0}]을(를) 생성하지 못했습니다.
accessLogValve.openFail=접근 로그 파일 [{0}]을(를) 열지 못했습니다.
accessLogValve.renameFail=접근 로그 파일을 [{0}]에서 [{1}](으)로 이름을 변경하지 못했습니다.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/04: Backport improvements to Russian 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 8d299fa514e465169cecb6418982c06ccc31e01c
Author: Mark Thomas
AuthorDate: Tue Jan 26 11:58:16 2021 +
Backport improvements to Russian translations
---
java/org/apache/catalina/connector/LocalStrings_ru.properties | 3 +++
java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties| 2 +-
java/org/apache/catalina/manager/LocalStrings_ru.properties | 4 ++--
java/org/apache/catalina/session/LocalStrings_ru.properties | 2 ++
java/org/apache/catalina/util/LocalStrings_ru.properties | 2 +-
.../apache/{catalina/connector => coyote}/LocalStrings_ru.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_ru.properties | 1 +
java/org/apache/jasper/resources/LocalStrings_ru.properties | 4
.../apache/{catalina/connector => naming}/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/util/LocalStrings_ru.properties| 2 +-
.../util/descriptor/web}/LocalStrings_ru.properties | 2 +-
.../connector => tomcat/util/http/parser}/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/util/net/LocalStrings_ru.properties| 2 +-
webapps/docs/changelog.xml| 4
14 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/catalina/connector/LocalStrings_ru.properties
b/java/org/apache/catalina/connector/LocalStrings_ru.properties
index 9cf2f86..7aacaec 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ru.properties
@@ -14,3 +14,6 @@
# limitations under the License.
coyoteAdapter.debug=Переменная [{0}] имеет значение [{1}]
+
+coyoteConnector.invalidEncoding=\n\
+Кодировка [{0}] не распознана JRE. Коннектор продолжит использовать [{1}]
diff --git a/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
b/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
index 08673fa..9d21e49 100644
--- a/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ReplicationValve.filter.failure=Не возможно скомпилировать фильтрr=[{0}]
+ReplicationValve.filter.failure=Не возможно скомпилировать фильтр=[{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties
b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index 0cd21dd..237ca9a 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -117,7 +117,7 @@ htmlManagerServlet.title=Управление веб-приложениями To
managerServlet.alreadyContext=ОШИБКА - Приложение уже существует на пути [{0}]
managerServlet.certsNotAvailable=Информация о сертификате не может быть
получена во время работы
managerServlet.deleteFail=ОШИБКА - Не удалось удалить [{0}].
-managerServlet.deployFailed=ОШИБКА - Не удалось развернуть приложение на
контекстом пути [{0}]
+managerServlet.deployFailed=ОШИБКА - Не удалось развернуть приложение на
контекстном пути [{0}]
managerServlet.deployed=OK - Приложение успешно развёрнуто в контекстном пути
[{0}]
managerServlet.deployedButNotStarted=ОШИБКА - Приложение было развёрнуто в
контекстном пути [{0}], но не стартовало
managerServlet.exception=ОШИБКА - Встретилось исключение [{0}]
@@ -157,7 +157,7 @@ managerServlet.sslConnectorTrustedCerts=OK - Информация о
довер
managerServlet.sslReload=OK - Перезагрузка конфигурации TLS для [{0}]
managerServlet.sslReloadAll=OK - Перезагрузка конфигурации TLS для всех
виртуальных хостов TLS
managerServlet.sslReloadFail=ОШИБКА - Не удалось перезагрузить конфигурацию TLS
-managerServlet.startFailed=ОШИБКА - Application at context path [{0}] could
not be started
+managerServlet.startFailed=ОШИБКА - Приложение по контекстному пути [{0}] не
запустилось
managerServlet.started=OK - Запущено приложение по пути контекста [{0}]
managerServlet.stopped=OK - Остановлено приложение по пути контекста [{0}]
managerServlet.storeConfig.noMBean=ОШИБКА - Нет StoreConfig MBean,
зарегистрированный на [{0}]
diff --git a/java/org/apache/catalina/session/LocalStrings_ru.properties
b/java/org/apache/catalina/session/LocalStrings_ru.properties
index badde70..2f43bf3 100644
--- a/java/org/apache/catalina/session/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ru.properties
@@ -14,3 +14,5 @@
# limitations under the License.
JDBCStore.connectError=Не возможно подключиться к базе данных [{0}]
+
+managerBase.contextNull=Перед использованием Менеджера контексту необходимо
присвоить не пустое значение
diff --git a/java/org/apache/catalina/
[Bug 65102] Build fails due to a lacking component
https://bz.apache.org/bugzilla/show_bug.cgi?id=65102 --- Comment #10 from mgrigorov --- Would it be a good idea to download the dependencies from Maven Central instead of the Apache download site ? https://repo1.maven.org/maven2/commons-daemon/commons-daemon/ I am not suggesting to switch to Ant+Ivy! -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] minfrin commented on a change in pull request #401: Add support for unix domain sockets (APR Protocol)
minfrin commented on a change in pull request #401:
URL: https://github.com/apache/tomcat/pull/401#discussion_r564480667
##
File path: test/org/apache/tomcat/jni/TestUnixDomainSocketServer.java
##
@@ -0,0 +1,240 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jni;
+
+import java.util.concurrent.CountDownLatch;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+
+/*
+ * Tests for unix domain sockets.
+ *
+ * While System.nanotime() is available and may have a resolution of ~100ns on
+ * some platforms, those same platforms do not use as precise a timer for
socket
+ * timeouts. Therefore, a much larger error margin (100ms) is used.
+ *
+ * It is known that this larger error margin is required for Windows 10. It may
+ * be worth revisiting the choice of error margin once that platform is no
+ * longer supported.
+ *
+ * @deprecated The scope of the APR/Native Library will be reduced in Tomcat
+ * 10.1.x onwards to only those components required to provide
+ * OpenSSL integration with the NIO and NIO2 connectors.
+ */
+@Deprecated
+public class TestUnixDomainSocketServer extends AbstractJniTest {
+
+ private static final String PATH = System.getProperty("java.io.tmpdir")
+ System.getProperty("file.separator") + "tomcat.socket";
Review comment:
Fixed.
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
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] minfrin commented on a change in pull request #401: Add support for unix domain sockets (APR Protocol)
minfrin commented on a change in pull request #401:
URL: https://github.com/apache/tomcat/pull/401#discussion_r564480836
##
File path: java/org/apache/tomcat/util/net/AprEndpoint.java
##
@@ -287,6 +312,9 @@ public int getSendfileCount() {
@Override
public void bind() throws Exception {
+int family;
+String hostname = null;
Review comment:
I've added a comment to be clear.
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
-
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: Back-port updates to Russian 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
The following commit(s) were added to refs/heads/7.0.x by this push:
new a2536ab Back-port updates to Russian translations
a2536ab is described below
commit a2536ab826cf57158b653fb27071cb1c6aa5c524
Author: Mark Thomas
AuthorDate: Tue Jan 26 12:48:32 2021 +
Back-port updates to Russian translations
---
java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties| 2 +-
java/org/apache/catalina/manager/LocalStrings_ru.properties | 4 ++--
java/org/apache/catalina/util/LocalStrings_ru.properties | 2 +-
java/org/apache/jasper/resources/LocalStrings_ru.properties | 4
.../org/apache/{catalina/ha/tcp => naming}/LocalStrings_ru.properties | 2 +-
java/org/apache/tomcat/util/LocalStrings_ru.properties| 2 +-
webapps/docs/changelog.xml| 4
7 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
b/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
index 08673fa..9d21e49 100644
--- a/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ReplicationValve.filter.failure=Не возможно скомпилировать фильтрr=[{0}]
+ReplicationValve.filter.failure=Не возможно скомпилировать фильтр=[{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties
b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index dbcff6e..70546dd 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -105,7 +105,7 @@ htmlManagerServlet.title=Управление веб-приложениями To
managerServlet.alreadyContext=ОШИБКА - Приложение уже существует на пути [{0}]
managerServlet.deleteFail=ОШИБКА - Не удалось удалить [{0}].
-managerServlet.deployFailed=ОШИБКА - Не удалось развернуть приложение на
контекстом пути [{0}]
+managerServlet.deployFailed=ОШИБКА - Не удалось развернуть приложение на
контекстном пути [{0}]
managerServlet.deployed=OK - Приложение успешно развёрнуто в контекстном пути
[{0}]
managerServlet.deployedButNotStarted=ОШИБКА - Приложение было развёрнуто в
контекстном пути [{0}], но не стартовало
managerServlet.exception=ОШИБКА - Встретилось исключение [{0}]
@@ -138,7 +138,7 @@ managerServlet.sessions=OK - Информация о сеансах прилож
managerServlet.sessiontimeout=Неактивные [{0}] минут: [{1}] сеанс(ов)
managerServlet.sessiontimeout.expired=Неактивные [{0}] минут: [{1}] сеанс(ов)
были завершены
managerServlet.sessiontimeout.unlimited=Неограниченное время: [{0}] сеансов
-managerServlet.startFailed=ОШИБКА - Application at context path [{0}] could
not be started
+managerServlet.startFailed=ОШИБКА - Приложение по контекстному пути [{0}] не
запустилось
managerServlet.started=OK - Запущено приложение по пути контекста [{0}]
managerServlet.stopped=OK - Остановлено приложение по пути контекста [{0}]
managerServlet.threaddump=OK - JVM thread dump
diff --git a/java/org/apache/catalina/util/LocalStrings_ru.properties
b/java/org/apache/catalina/util/LocalStrings_ru.properties
index 803ec1f..1a64b87 100644
--- a/java/org/apache/catalina/util/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/util/LocalStrings_ru.properties
@@ -15,4 +15,4 @@
extensionValidator.extension-not-found-error=ExtensionValidator[{0}][{1}]:
требуемое расширение [{2}] не найдено.
-introspection.classLoadFailed=Не возможно закрузить класс [{0}]
+introspection.classLoadFailed=Не возможно загрузить класс [{0}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_ru.properties
b/java/org/apache/jasper/resources/LocalStrings_ru.properties
index 11b5982..d821574 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ru.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ru.properties
@@ -20,8 +20,12 @@ jsp.error.attribute.noequal=Необходим символ равенства
jsp.error.data.file.processing=Ошибка при обработке файла [{0}]
jsp.error.el.template.deferred=#{...} не допускается в тексте шаблона
jsp.error.fallback.invalidUse=jsp:fallback должен быть прямым потомком
jsp:plugin
+jsp.error.invalid.tagdir=Директория файла тегов [{0}] не начинается с
"/WEB-INF/tags"
jsp.error.jspbody.required=Для указания тела тега для [{0}] должно быть
использовано jsp: body если используется jsp: attribute.
+jsp.error.jspelement.missing.name=Обязательный атрибут 'name' в XML-стиле
отсутствует
jsp.error.outputfolder=Не указана выходная папка
jsp.error.parse.xml=XML файл [{0}] содержит ошибки
jsp.error.unknown_attribute_type=Неизвестный тип [{1}] для атрибута [{0}]
jsp.exception=Произошла
[Bug 65106] New: ConfigFileLoader cannot properly handle file url running with SecurityManager on openjdk 1.8
https://bz.apache.org/bugzilla/show_bug.cgi?id=65106
Bug ID: 65106
Summary: ConfigFileLoader cannot properly handle file url
running with SecurityManager on openjdk 1.8
Product: Tomcat 8
Version: 8.5.61
Hardware: PC
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: j.no...@quadient.com
Target Milestone:
Created attachment 37718
--> https://bz.apache.org/bugzilla/attachment.cgi?id=37718&action=edit
zip file with screens
spring-boot 1.5.22 creates instance of Http11NioProtocol with certificate
keystore file defined with file url. Images set-url.png, set-url2.png.
When it reaches ConfigFileLoader, location is not absolute so it puts
catalina_base before file url creating "c:/tmp/catalina/file:/c:/tmp/my.jks".
Check if it is file throws AccessControlException (access denied
("java.io.FilePermission" "C:\tmp\120\a\catalina\file:\C:\tmp\120\key.jks"
"read")
). And it is impossible to create such a policy for SecurityManager.
- ConfigFileLoader.png
- ConfigFileLoader.png
- exception.png
getInputStream method can handle file url but when using SecurityManager under
zulu, correto.
Oracle java 1.8 works correctly. SecurityManager has no complains about such
weird path. Just openjdks have problem.
Fails on
- zulu openjdk newer - zulu8.42.0.23-ca-jdk8.0.232-win_x64
- correto 1.8.0_282
```
public static InputStream getInputStream(String location) throws IOException
{
File f = new File(location);
if (!f.isAbsolute()) {
f = new File(CATALINA_BASE_FILE, location);
}
if (f.isFile()) {
return new FileInputStream(f);
} else {
URI uri = getURI(location);
try {
URL url = uri.toURL();
return url.openConnection().getInputStream();
} catch (IllegalArgumentException var4) {
throw new
IOException(sm.getString("configFileLoader.cannotObtainURL", new
Object[]{location}), var4);
}
}
}
```
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch master updated: Ensure Windows signing uses sha256 hash
On 25/01/2021 15:04, Christopher Schultz wrote: > Mark, > > On 1/24/21 04:44, ma...@apache.org wrote: >> This is an automated email from the ASF dual-hosted git repository. >> >> markt pushed a commit to branch master >> in repository https://gitbox.apache.org/repos/asf/tomcat.git >> >> >> The following commit(s) were added to refs/heads/master by this push: >> new 7bb9eec Ensure Windows signing uses sha256 hash >> 7bb9eec is described below >> >> commit 7bb9eeced9522058796c3dfdc759e3f5eedb258d >> Author: Mark Thomas >> AuthorDate: Sun Jan 24 09:42:06 2021 + >> >> Ensure Windows signing uses sha256 hash >> --- >> build.xml | 4 >> 1 file changed, 4 insertions(+) >> >> diff --git a/build.xml b/build.xml >> index 32142c8..be0f1da 100644 >> --- a/build.xml >> +++ b/build.xml >> @@ -2575,6 +2575,8 @@ skip.installer property in build.properties" /> >> >> >> >> + >> + > > I see there is a /sha1 option on the command as well. Does that mean > that SHA1 is also being performed? No. > Is it required? Yes. It is how we ID the certificate /key to sign with. > We abandoned SHA-1 (and SHA-256 for that matter) for the signatures we > put on our web sites some time ago. Is it possible to use SHA-512 for > these signatures as well? A quick hunt around the internet suggests using SHA-512 signatures should be possible. However, that was with a local key. The DigiCert signing using a custom library to access the keys remotely. Let me run a test... Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65106] ConfigFileLoader cannot properly handle file url running with SecurityManager on openjdk 1.8
https://bz.apache.org/bugzilla/show_bug.cgi?id=65106 Remy Maucherat changed: What|Removed |Added OS||All --- Comment #1 from Remy Maucherat --- Ok, after checking the javadoc, I can see that isAbsolute is a safe call (no security check) but isFile is not. Wrapping with a try/catch could be reasonable, however it would also hide the exception when it is legitimate and useful to have. -- 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 (0e9451d -> 600a3ac)
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 0e9451d Standardise use of ' add 600a3ac Fix a SpotBugs warning - log an message when permission setting fails No new revisions were added by this update. Summary of changes: java/org/apache/tomcat/util/net/LocalStrings.properties | 3 +++ java/org/apache/tomcat/util/net/NioEndpoint.java| 12 +--- 2 files changed, 12 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix a SpotBugs warning - log an message when permission setting fails
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 9ebeda2 Fix a SpotBugs warning - log an message when permission
setting fails
9ebeda2 is described below
commit 9ebeda2df488803d61b371c0cc36db83fe04f197
Author: Mark Thomas
AuthorDate: Tue Jan 26 13:54:52 2021 +
Fix a SpotBugs warning - log an message when permission setting fails
---
java/org/apache/tomcat/util/net/LocalStrings.properties | 3 +++
java/org/apache/tomcat/util/net/NioEndpoint.java| 12 +---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index bcf697c..257f4bf 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -97,6 +97,9 @@ endpoint.nio.keyProcessingError=Error processing selection key
endpoint.nio.latchMustBeZero=Latch must be at count zero or null
endpoint.nio.nullLatch=Latch cannot be null
endpoint.nio.nullSocketChannel=Invalid null socket channel while processing
poller event
+endpoint.nio.perms.execFail=Failed to set execute permissions for Unix domain
socket [{0}]
+endpoint.nio.perms.readFail=Failed to set read permissions for Unix domain
socket [{0}]
+endpoint.nio.perms.writeFail=Failed to set write permissions for Unix domain
socket [{0}]
endpoint.nio.pollerEventError=Error processing poller event
endpoint.nio.registerFail=Failed to register socket with selector from poller
endpoint.nio.selectorCloseFail=Failed to close selector when closing the poller
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 4ccfd4f..86e377d 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -272,9 +272,15 @@ public class NioEndpoint extends
AbstractJsseEndpoint
Files.setAttribute(path, attrs.name(), attrs.value());
} else {
java.io.File file = path.toFile();
-file.setReadable(true, false);
-file.setWritable(true, false);
-file.setExecutable(false, false);
+if (!file.setReadable(true, false)) {
+log.warn(sm.getString("endpoint.nio.perms.readFail",
path));
+}
+if (!file.setWritable(true, false)) {
+log.warn(sm.getString("endpoint.nio.perms.writeFail",
path));
+}
+if (!file.setExecutable(false, false)) {
+log.warn(sm.getString("endpoint.nio.perms.execFail",
path));
+}
}
}
} else {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Update false positives
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 956dfbd Update false positives 956dfbd is described below commit 956dfbdab59350b698eac5448dd9dde9730ae4b7 Author: Mark Thomas AuthorDate: Tue Jan 26 14:01:47 2021 + Update false positives --- res/findbugs/filter-false-positives.xml | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml index e4b6005..e47e128 100644 --- a/res/findbugs/filter-false-positives.xml +++ b/res/findbugs/filter-false-positives.xml @@ -392,6 +392,12 @@ + + + + + + @@ -1007,9 +1013,9 @@ - - - + + +
Re: [tomcat] branch 9.0.x updated: Fix a SpotBugs warning - log an message when permission setting fails
On Tue, Jan 26, 2021 at 2:56 PM wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> markt pushed a commit to branch 9.0.x
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/9.0.x by this push:
> new 9ebeda2 Fix a SpotBugs warning - log an message when permission
> setting fails
> 9ebeda2 is described below
>
> commit 9ebeda2df488803d61b371c0cc36db83fe04f197
> Author: Mark Thomas
> AuthorDate: Tue Jan 26 13:54:52 2021 +
>
> Fix a SpotBugs warning - log an message when permission setting fails
>
Actually, the "else" seems useless at the moment and should be dropped
altogether.
Rémy
> ---
> java/org/apache/tomcat/util/net/LocalStrings.properties | 3 +++
> java/org/apache/tomcat/util/net/NioEndpoint.java| 12 +---
> 2 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
> b/java/org/apache/tomcat/util/net/LocalStrings.properties
> index bcf697c..257f4bf 100644
> --- a/java/org/apache/tomcat/util/net/LocalStrings.properties
> +++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
> @@ -97,6 +97,9 @@ endpoint.nio.keyProcessingError=Error processing
> selection key
> endpoint.nio.latchMustBeZero=Latch must be at count zero or null
> endpoint.nio.nullLatch=Latch cannot be null
> endpoint.nio.nullSocketChannel=Invalid null socket channel while
> processing poller event
> +endpoint.nio.perms.execFail=Failed to set execute permissions for Unix
> domain socket [{0}]
> +endpoint.nio.perms.readFail=Failed to set read permissions for Unix
> domain socket [{0}]
> +endpoint.nio.perms.writeFail=Failed to set write permissions for Unix
> domain socket [{0}]
> endpoint.nio.pollerEventError=Error processing poller event
> endpoint.nio.registerFail=Failed to register socket with selector from
> poller
> endpoint.nio.selectorCloseFail=Failed to close selector when closing the
> poller
> diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
> b/java/org/apache/tomcat/util/net/NioEndpoint.java
> index 4ccfd4f..86e377d 100644
> --- a/java/org/apache/tomcat/util/net/NioEndpoint.java
> +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
> @@ -272,9 +272,15 @@ public class NioEndpoint extends
> AbstractJsseEndpoint
> Files.setAttribute(path, attrs.name(),
> attrs.value());
> } else {
> java.io.File file = path.toFile();
> -file.setReadable(true, false);
> -file.setWritable(true, false);
> -file.setExecutable(false, false);
> +if (!file.setReadable(true, false)) {
> +
> log.warn(sm.getString("endpoint.nio.perms.readFail", path));
> +}
> +if (!file.setWritable(true, false)) {
> +
> log.warn(sm.getString("endpoint.nio.perms.writeFail", path));
> +}
> +if (!file.setExecutable(false, false)) {
> +
> log.warn(sm.getString("endpoint.nio.perms.execFail", path));
> +}
> }
> }
> } else {
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
[tomcat] branch 9.0.x updated: Update false positives
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new b5ea86a Update false positives b5ea86a is described below commit b5ea86a6d8d0deb6f11ce921151df9f37bd175db Author: Mark Thomas AuthorDate: Tue Jan 26 14:01:47 2021 + Update false positives --- res/findbugs/filter-false-positives.xml | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml index 9b8b32a..bcc56ba 100644 --- a/res/findbugs/filter-false-positives.xml +++ b/res/findbugs/filter-false-positives.xml @@ -415,6 +415,12 @@ + + + + + + @@ -1027,9 +1033,9 @@ - - - + + +
Re: [tomcat] branch 9.0.x updated: Fix a SpotBugs warning - log an message when permission setting fails
On 26/01/2021 14:06, Rémy Maucherat wrote:
> On Tue, Jan 26, 2021 at 2:56 PM wrote:
>
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> markt pushed a commit to branch 9.0.x
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>
>>
>> The following commit(s) were added to refs/heads/9.0.x by this push:
>> new 9ebeda2 Fix a SpotBugs warning - log an message when permission
>> setting fails
>> 9ebeda2 is described below
>>
>> commit 9ebeda2df488803d61b371c0cc36db83fe04f197
>> Author: Mark Thomas
>> AuthorDate: Tue Jan 26 13:54:52 2021 +
>>
>> Fix a SpotBugs warning - log an message when permission setting fails
>>
>
> Actually, the "else" seems useless at the moment and should be dropped
> altogether.
I can do that as I am in the area. Worth logging if attrs is null?
Mark
>
> Rémy
>
>
>> ---
>> java/org/apache/tomcat/util/net/LocalStrings.properties | 3 +++
>> java/org/apache/tomcat/util/net/NioEndpoint.java| 12 +---
>> 2 files changed, 12 insertions(+), 3 deletions(-)
>>
>> diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
>> b/java/org/apache/tomcat/util/net/LocalStrings.properties
>> index bcf697c..257f4bf 100644
>> --- a/java/org/apache/tomcat/util/net/LocalStrings.properties
>> +++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
>> @@ -97,6 +97,9 @@ endpoint.nio.keyProcessingError=Error processing
>> selection key
>> endpoint.nio.latchMustBeZero=Latch must be at count zero or null
>> endpoint.nio.nullLatch=Latch cannot be null
>> endpoint.nio.nullSocketChannel=Invalid null socket channel while
>> processing poller event
>> +endpoint.nio.perms.execFail=Failed to set execute permissions for Unix
>> domain socket [{0}]
>> +endpoint.nio.perms.readFail=Failed to set read permissions for Unix
>> domain socket [{0}]
>> +endpoint.nio.perms.writeFail=Failed to set write permissions for Unix
>> domain socket [{0}]
>> endpoint.nio.pollerEventError=Error processing poller event
>> endpoint.nio.registerFail=Failed to register socket with selector from
>> poller
>> endpoint.nio.selectorCloseFail=Failed to close selector when closing the
>> poller
>> diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
>> b/java/org/apache/tomcat/util/net/NioEndpoint.java
>> index 4ccfd4f..86e377d 100644
>> --- a/java/org/apache/tomcat/util/net/NioEndpoint.java
>> +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
>> @@ -272,9 +272,15 @@ public class NioEndpoint extends
>> AbstractJsseEndpoint
>> Files.setAttribute(path, attrs.name(),
>> attrs.value());
>> } else {
>> java.io.File file = path.toFile();
>> -file.setReadable(true, false);
>> -file.setWritable(true, false);
>> -file.setExecutable(false, false);
>> +if (!file.setReadable(true, false)) {
>> +
>> log.warn(sm.getString("endpoint.nio.perms.readFail", path));
>> +}
>> +if (!file.setWritable(true, false)) {
>> +
>> log.warn(sm.getString("endpoint.nio.perms.writeFail", path));
>> +}
>> +if (!file.setExecutable(false, false)) {
>> +
>> log.warn(sm.getString("endpoint.nio.perms.execFail", path));
>> +}
>> }
>> }
>> } else {
>>
>>
>> -
>> 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
Re: [tomcat] branch 9.0.x updated: Fix a SpotBugs warning - log an message when permission setting fails
On Tue, Jan 26, 2021 at 3:11 PM Mark Thomas wrote:
> On 26/01/2021 14:06, Rémy Maucherat wrote:
> > On Tue, Jan 26, 2021 at 2:56 PM wrote:
> >
> >> This is an automated email from the ASF dual-hosted git repository.
> >>
> >> markt pushed a commit to branch 9.0.x
> >> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> >>
> >>
> >> The following commit(s) were added to refs/heads/9.0.x by this push:
> >> new 9ebeda2 Fix a SpotBugs warning - log an message when
> permission
> >> setting fails
> >> 9ebeda2 is described below
> >>
> >> commit 9ebeda2df488803d61b371c0cc36db83fe04f197
> >> Author: Mark Thomas
> >> AuthorDate: Tue Jan 26 13:54:52 2021 +
> >>
> >> Fix a SpotBugs warning - log an message when permission setting
> fails
> >>
> >
> > Actually, the "else" seems useless at the moment and should be dropped
> > altogether.
>
> I can do that as I am in the area. Worth logging if attrs is null?
>
The result cannot be null, it could only throw an exception. I didn't
translate the code for the PR very accurately, actually they wanted to set
the default permissions when getUnixDomainSocketPathPermissions() is null.
So we'll see later if that is really needed (I think the user could do it
since it could be sensitive).
Rémy
>
> Mark
>
> >
> > Rémy
> >
> >
> >> ---
> >> java/org/apache/tomcat/util/net/LocalStrings.properties | 3 +++
> >> java/org/apache/tomcat/util/net/NioEndpoint.java| 12
> +---
> >> 2 files changed, 12 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
> >> b/java/org/apache/tomcat/util/net/LocalStrings.properties
> >> index bcf697c..257f4bf 100644
> >> --- a/java/org/apache/tomcat/util/net/LocalStrings.properties
> >> +++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
> >> @@ -97,6 +97,9 @@ endpoint.nio.keyProcessingError=Error processing
> >> selection key
> >> endpoint.nio.latchMustBeZero=Latch must be at count zero or null
> >> endpoint.nio.nullLatch=Latch cannot be null
> >> endpoint.nio.nullSocketChannel=Invalid null socket channel while
> >> processing poller event
> >> +endpoint.nio.perms.execFail=Failed to set execute permissions for Unix
> >> domain socket [{0}]
> >> +endpoint.nio.perms.readFail=Failed to set read permissions for Unix
> >> domain socket [{0}]
> >> +endpoint.nio.perms.writeFail=Failed to set write permissions for Unix
> >> domain socket [{0}]
> >> endpoint.nio.pollerEventError=Error processing poller event
> >> endpoint.nio.registerFail=Failed to register socket with selector from
> >> poller
> >> endpoint.nio.selectorCloseFail=Failed to close selector when closing
> the
> >> poller
> >> diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
> >> b/java/org/apache/tomcat/util/net/NioEndpoint.java
> >> index 4ccfd4f..86e377d 100644
> >> --- a/java/org/apache/tomcat/util/net/NioEndpoint.java
> >> +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
> >> @@ -272,9 +272,15 @@ public class NioEndpoint extends
> >> AbstractJsseEndpoint
> >> Files.setAttribute(path, attrs.name(),
> >> attrs.value());
> >> } else {
> >> java.io.File file = path.toFile();
> >> -file.setReadable(true, false);
> >> -file.setWritable(true, false);
> >> -file.setExecutable(false, false);
> >> +if (!file.setReadable(true, false)) {
> >> +
> >> log.warn(sm.getString("endpoint.nio.perms.readFail", path));
> >> +}
> >> +if (!file.setWritable(true, false)) {
> >> +
> >> log.warn(sm.getString("endpoint.nio.perms.writeFail", path));
> >> +}
> >> +if (!file.setExecutable(false, false)) {
> >> +
> >> log.warn(sm.getString("endpoint.nio.perms.execFail", path));
> >> +}
> >> }
> >> }
> >> } else {
> >>
> >>
> >> -
> >> 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 9.0.x updated: Update false positives
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new c4413ee Update false positives c4413ee is described below commit c4413ee4d9d8c2a3e9029b39dee997afb53ec633 Author: Mark Thomas AuthorDate: Tue Jan 26 14:15:23 2021 + Update false positives --- res/findbugs/filter-false-positives.xml | 14 ++ 1 file changed, 14 insertions(+) diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml index bcc56ba..7cb9dd8 100644 --- a/res/findbugs/filter-false-positives.xml +++ b/res/findbugs/filter-false-positives.xml @@ -445,6 +445,20 @@ + + + + + + + + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch 9.0.x updated: Fix a SpotBugs warning - log an message when permission setting fails
On 26/01/2021 14:15, Rémy Maucherat wrote: > On Tue, Jan 26, 2021 at 3:11 PM Mark Thomas wrote: > >> On 26/01/2021 14:06, Rémy Maucherat wrote: >>> On Tue, Jan 26, 2021 at 2:56 PM wrote: >>> This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 9ebeda2 Fix a SpotBugs warning - log an message when >> permission setting fails 9ebeda2 is described below commit 9ebeda2df488803d61b371c0cc36db83fe04f197 Author: Mark Thomas AuthorDate: Tue Jan 26 13:54:52 2021 + Fix a SpotBugs warning - log an message when permission setting >> fails >>> >>> Actually, the "else" seems useless at the moment and should be dropped >>> altogether. >> >> I can do that as I am in the area. Worth logging if attrs is null? >> > > The result cannot be null, it could only throw an exception. I didn't > translate the code for the PR very accurately, actually they wanted to set > the default permissions when getUnixDomainSocketPathPermissions() is null. > So we'll see later if that is really needed (I think the user could do it > since it could be sensitive). OK. I'll clean it up on that basis. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65102] Build fails due to a lacking component
https://bz.apache.org/bugzilla/show_bug.cgi?id=65102 --- Comment #11 from Christopher Schultz --- There's always the "ASF releases are immutable" problem. This is not a release fro distant history, so it would be good to find a way to allow 9.0.41 source distribution to build if at all possible. Switching download sites can't be done because the URLs are already baked-into the source release. Is it at all possible to fix this on the server-side? I think probably not, as the problem is with a failure to redirect properly. How about a fix in the ant side (cf bug #65105). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch master updated: Standardise use of '
Mark,
On 1/26/21 06:48, ma...@apache.org wrote:
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 0e9451d Standardise use of '
0e9451d is described below
commit 0e9451d21753225950a5c3be209b49507f71ea7f
Author: Mark Thomas
AuthorDate: Tue Jan 26 11:47:32 2021 +
Standardise use of '
Is this worth adding to the checkstyle rules?
Removing "dumb quotes" is a bit of a personal crusade of mine.
-chris
---
java/org/apache/catalina/valves/LocalStrings_fr.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties
b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index a55269a..01eb334 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -18,7 +18,7 @@ accessLogValve.closeFail=Échec de fermeture du fichier de
journal d'accès
accessLogValve.deleteFail=Impossible d''effacer l''ancien journal d''accès
[{0}]
accessLogValve.invalidLocale=Impossible de définir les paramètres régionaux
sur [{0}]
accessLogValve.invalidPortType=Type de port [{0}] invalide, utilisation du
port (local) de serveur
-accessLogValve.invalidRemoteAddressType=Le type [{0}] d’adresse distante est
invalide, l''adresse distante classique sera utilisée et non celle du pair
+accessLogValve.invalidRemoteAddressType=Le type [{0}] d''adresse distante est
invalide, l''adresse distante classique sera utilisée et non celle du pair
accessLogValve.openDirFail=Echec de création du répertoire [{0}] pour les
journaux d''accès
accessLogValve.openFail=Echec à l''ouverture du journal d''accès [{0}]
accessLogValve.renameFail=Échec de renommage du journal d''accès de [{0}] en
[{1}]
-
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: Simplify. attrs is never null
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 8706f88 Simplify. attrs is never null
8706f88 is described below
commit 8706f885a61ef38a1607e5fd9ead900928e97bf1
Author: Mark Thomas
AuthorDate: Tue Jan 26 14:28:59 2021 +
Simplify. attrs is never null
---
java/org/apache/tomcat/util/net/LocalStrings.properties | 3 ---
java/org/apache/tomcat/util/net/NioEndpoint.java| 15 +--
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 257f4bf..bcf697c 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -97,9 +97,6 @@ endpoint.nio.keyProcessingError=Error processing selection key
endpoint.nio.latchMustBeZero=Latch must be at count zero or null
endpoint.nio.nullLatch=Latch cannot be null
endpoint.nio.nullSocketChannel=Invalid null socket channel while processing
poller event
-endpoint.nio.perms.execFail=Failed to set execute permissions for Unix domain
socket [{0}]
-endpoint.nio.perms.readFail=Failed to set read permissions for Unix domain
socket [{0}]
-endpoint.nio.perms.writeFail=Failed to set write permissions for Unix domain
socket [{0}]
endpoint.nio.pollerEventError=Error processing poller event
endpoint.nio.registerFail=Failed to register socket with selector from poller
endpoint.nio.selectorCloseFail=Failed to close selector when closing the poller
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 4345ed0..5ce6398 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -211,20 +211,7 @@ public class NioEndpoint extends
AbstractJsseEndpoint
FileAttribute> attrs =
PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString(getUnixDomainSocketPathPermissions()));
Path path = Paths.get(getUnixDomainSocketPath());
-if (attrs != null) {
-Files.setAttribute(path, attrs.name(), attrs.value());
-} else {
-java.io.File file = path.toFile();
-if (!file.setReadable(true, false)) {
-log.warn(sm.getString("endpoint.nio.perms.readFail",
path));
-}
-if (!file.setWritable(true, false)) {
-log.warn(sm.getString("endpoint.nio.perms.writeFail",
path));
-}
-if (!file.setExecutable(false, false)) {
-log.warn(sm.getString("endpoint.nio.perms.execFail",
path));
-}
-}
+Files.setAttribute(path, attrs.name(), attrs.value());
}
} else {
serverSock = ServerSocketChannel.open();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Simplify. attrs is never null
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 62de4af Simplify. attrs is never null
62de4af is described below
commit 62de4affadae8e8f0589afe8721d1a99f4c8c7aa
Author: Mark Thomas
AuthorDate: Tue Jan 26 14:28:59 2021 +
Simplify. attrs is never null
---
java/org/apache/tomcat/util/net/LocalStrings.properties | 3 ---
java/org/apache/tomcat/util/net/NioEndpoint.java| 15 +--
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 257f4bf..bcf697c 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -97,9 +97,6 @@ endpoint.nio.keyProcessingError=Error processing selection key
endpoint.nio.latchMustBeZero=Latch must be at count zero or null
endpoint.nio.nullLatch=Latch cannot be null
endpoint.nio.nullSocketChannel=Invalid null socket channel while processing
poller event
-endpoint.nio.perms.execFail=Failed to set execute permissions for Unix domain
socket [{0}]
-endpoint.nio.perms.readFail=Failed to set read permissions for Unix domain
socket [{0}]
-endpoint.nio.perms.writeFail=Failed to set write permissions for Unix domain
socket [{0}]
endpoint.nio.pollerEventError=Error processing poller event
endpoint.nio.registerFail=Failed to register socket with selector from poller
endpoint.nio.selectorCloseFail=Failed to close selector when closing the poller
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 86e377d..bb63718 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -268,20 +268,7 @@ public class NioEndpoint extends
AbstractJsseEndpoint
FileAttribute> attrs =
PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString(getUnixDomainSocketPathPermissions()));
Path path = Paths.get(getUnixDomainSocketPath());
-if (attrs != null) {
-Files.setAttribute(path, attrs.name(), attrs.value());
-} else {
-java.io.File file = path.toFile();
-if (!file.setReadable(true, false)) {
-log.warn(sm.getString("endpoint.nio.perms.readFail",
path));
-}
-if (!file.setWritable(true, false)) {
-log.warn(sm.getString("endpoint.nio.perms.writeFail",
path));
-}
-if (!file.setExecutable(false, false)) {
-log.warn(sm.getString("endpoint.nio.perms.execFail",
path));
-}
-}
+Files.setAttribute(path, attrs.name(), attrs.value());
}
} else {
serverSock = ServerSocketChannel.open();
-
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: Update false positives
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 5ace871 Update false positives 5ace871 is described below commit 5ace87126fd3c635d1436655258b75f379c4 Author: Mark Thomas AuthorDate: Tue Jan 26 14:26:52 2021 + Update false positives --- res/findbugs/filter-false-positives.xml | 34 + 1 file changed, 34 insertions(+) diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml index 19aab07..da428e8 100644 --- a/res/findbugs/filter-false-positives.xml +++ b/res/findbugs/filter-false-positives.xml @@ -301,6 +301,12 @@ + + + + + + @@ -431,6 +437,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix cut and paste oops
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 464b15b Fix cut and paste oops
464b15b is described below
commit 464b15b4a3a1837d6ea63f19718ee477de53e706
Author: remm
AuthorDate: Tue Jan 26 16:22:02 2021 +0100
Fix cut and paste oops
---
.../apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
b/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
index 543820b..965a684 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
@@ -167,7 +167,7 @@ public class DNSMembershipProvider extends
CloudMembershipProvider {
Member[] members = membership.getMembers();
if (members != null) {
for (Member member : members) {
-if (Arrays.equals(sender.getHost(), sender.getHost())
+if (Arrays.equals(sender.getHost(), member.getHost())
&& sender.getPort() == member.getPort()) {
found = true;
break;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix cut and paste oops
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new fd19dcc Fix cut and paste oops
fd19dcc is described below
commit fd19dccc20b2e72099d2205316a8c644b39d2cd5
Author: remm
AuthorDate: Tue Jan 26 16:22:02 2021 +0100
Fix cut and paste oops
---
.../apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
b/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
index 543820b..965a684 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
@@ -167,7 +167,7 @@ public class DNSMembershipProvider extends
CloudMembershipProvider {
Member[] members = membership.getMembers();
if (members != null) {
for (Member member : members) {
-if (Arrays.equals(sender.getHost(), sender.getHost())
+if (Arrays.equals(sender.getHost(), member.getHost())
&& sender.getPort() == member.getPort()) {
found = true;
break;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] minfrin commented on pull request #401: Add support for unix domain sockets (APR Protocol)
minfrin commented on pull request #401: URL: https://github.com/apache/tomcat/pull/401#issuecomment-767632095 In theory 96e241c should do the trick, can you confirm this is ready to merge? 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 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] michael-o commented on pull request #401: Add support for unix domain sockets (APR Protocol)
michael-o commented on pull request #401: URL: https://github.com/apache/tomcat/pull/401#issuecomment-767651363 For me yes, but I want Rémy give a chance to do his improvements on top. 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 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Update code signing to use SHA-512
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 fa3a9dc Update code signing to use SHA-512 fa3a9dc is described below commit fa3a9dc142eb83f1129e5018a6cce53c282b05b2 Author: Mark Thomas AuthorDate: Tue Jan 26 16:33:51 2021 + Update code signing to use SHA-512 --- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index be0f1da..6c9bc10 100644 --- a/build.xml +++ b/build.xml @@ -2576,7 +2576,7 @@ skip.installer property in build.properties" /> - + http://timestamp.digicert.com"/> @@ -2608,7 +2608,7 @@ skip.installer property in build.properties" /> - + http://timestamp.digicert.com"/> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Update code signing to use SHA-512
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new b31f73d Update code signing to use SHA-512 b31f73d is described below commit b31f73dd440e8d0b001f1b0345fd449502df7b04 Author: Mark Thomas AuthorDate: Tue Jan 26 16:33:51 2021 + Update code signing to use SHA-512 --- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 74df762..a7fad4d 100644 --- a/build.xml +++ b/build.xml @@ -2567,7 +2567,7 @@ skip.installer property in build.properties" /> - + http://timestamp.digicert.com"/> @@ -2599,7 +2599,7 @@ skip.installer property in build.properties" /> - + http://timestamp.digicert.com"/> - 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: Update code signing to use SHA-512
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 410e03f Update code signing to use SHA-512 410e03f is described below commit 410e03f9bec8940328c510244ddb48d207cd1dc4 Author: Mark Thomas AuthorDate: Tue Jan 26 16:33:51 2021 + Update code signing to use SHA-512 --- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 4c8bd89..1738091 100644 --- a/build.xml +++ b/build.xml @@ -2251,7 +2251,7 @@ skip.installer property in build.properties" /> - + http://timestamp.digicert.com"/> @@ -2283,7 +2283,7 @@ skip.installer property in build.properties" /> - + http://timestamp.digicert.com"/> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Update code signing to use SHA-512
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 e514985 Update code signing to use SHA-512 e514985 is described below commit e514985b0a6ae634c3a8724e4379f1bd4bcbd7d2 Author: Mark Thomas AuthorDate: Tue Jan 26 16:33:51 2021 + Update code signing to use SHA-512 --- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index c597118..68602ab 100644 --- a/build.xml +++ b/build.xml @@ -2395,7 +2395,7 @@ skip.installer property in build.properties" /> - + http://timestamp.digicert.com"/> @@ -2427,7 +2427,7 @@ skip.installer property in build.properties" /> - + http://timestamp.digicert.com"/> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Tagging 10.0.x, 9.0.x and 8.5.x
Hi all, It currently looks like I'll be in a position to start tagging the next set of releases tomorrow morning. That means the release is likely to occur formerly right at the start of February. This means that the January release will be effectively skipped and this release will be the February release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch master updated: Ensure Windows signing uses sha256 hash
On 26/01/2021 13:20, Mark Thomas wrote: > On 25/01/2021 15:04, Christopher Schultz wrote: >> I see there is a /sha1 option on the command as well. Does that mean >> that SHA1 is also being performed? > > No. > >> Is it required? > > Yes. It is how we ID the certificate /key to sign with. > >> We abandoned SHA-1 (and SHA-256 for that matter) for the signatures we >> put on our web sites some time ago. Is it possible to use SHA-512 for >> these signatures as well? > > A quick hunt around the internet suggests using SHA-512 signatures > should be possible. However, that was with a local key. The DigiCert > signing using a custom library to access the keys remotely. Let me run a > test... Yep. That worked. Thanks for spotting this. I've updated the build scripts. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch master updated: Ensure Windows signing uses sha256 hash
Mark, On 1/26/21 14:10, Mark Thomas wrote: On 26/01/2021 13:20, Mark Thomas wrote: On 25/01/2021 15:04, Christopher Schultz wrote: I see there is a /sha1 option on the command as well. Does that mean that SHA1 is also being performed? No. Is it required? Yes. It is how we ID the certificate /key to sign with. We abandoned SHA-1 (and SHA-256 for that matter) for the signatures we put on our web sites some time ago. Is it possible to use SHA-512 for these signatures as well? A quick hunt around the internet suggests using SHA-512 signatures should be possible. However, that was with a local key. The DigiCert signing using a custom library to access the keys remotely. Let me run a test... Yep. That worked. Thanks for spotting this. I've updated the build scripts. ;) -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] rmaucher commented on pull request #401: Add support for unix domain sockets (APR Protocol)
rmaucher commented on pull request #401: URL: https://github.com/apache/tomcat/pull/401#issuecomment-767860861 I don't plan any improvements or changes at this time. 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 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] michael-o commented on pull request #401: Add support for unix domain sockets (APR Protocol)
michael-o commented on pull request #401: URL: https://github.com/apache/tomcat/pull/401#issuecomment-767869298 Alright, I will merge this this week. 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 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Update NSIS to version 3.06.1. Update build script to create an Unicode installer. See https://nsis.sourceforge.io/Docs/Chapter1.html#intro-unicode
This is an automated email from the ASF dual-hosted git repository.
kkolinko 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 654e01e Update NSIS to version 3.06.1. Update build script to create
an Unicode installer. See
https://nsis.sourceforge.io/Docs/Chapter1.html#intro-unicode
654e01e is described below
commit 654e01edd2c884af8456be08466f830ab9163dec
Author: Konstantin Kolinko
AuthorDate: Wed Jan 27 07:09:23 2021 +0300
Update NSIS to version 3.06.1.
Update build script to create an Unicode installer.
See https://nsis.sourceforge.io/Docs/Chapter1.html#intro-unicode
---
build.properties.default | 4 ++--
res/tomcat.nsi | 2 ++
webapps/docs/changelog.xml | 4
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 4819376..ccdfc01 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -156,10 +156,10 @@
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-nativ
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1i-win32-bin.zip
# - NSIS, version 3.0 or later -
-nsis.version=3.04
+nsis.version=3.06.1
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=434e89380742d415ca9b91676cb92540|ed241f7384f4e59d84b9a62c71d1f6955b6a719a
+nsis.checksum.value=15a0bb6e74be90ef4f11fa7befd0399a|f188416fe435cad991adbdc2e3eedc482a68fa75
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
nsis.arch.dir=x86-unicode/
diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 0bdeec2..3f92c83 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -15,6 +15,8 @@
; Tomcat script for Nullsoft Installer
+Unicode true
+
!ifdef UNINSTALLONLY
OutFile "tempinstaller.exe"
!else
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index eb17437..e4f6181 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -259,6 +259,10 @@
Improvements to Russian translations. Provided by Polina and Azat.
(markt)
+
+Update the NSIS Installer used to build the Windows installer to
version
+3.06.1. (kkolinko)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5651 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] 654e01edd2c884af8456be08466f830ab9163dec Blamelist: Konstantin Kolinko BUILD FAILED: failed compile Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: buildbot failure in on tomcat-trunk
On 27/01/2021 04:51, build...@apache.org wrote: > The Buildbot has detected a new failure on builder tomcat-trunk while > building tomcat. Full details are available at: > https://ci.apache.org/builders/tomcat-trunk/builds/5651 > > 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] 654e01edd2c884af8456be08466f830ab9163dec > Blamelist: Konstantin Kolinko > > BUILD FAILED: failed compile This is because the CI system uses NSIS 2.something to work around an incompatibility with NSIS 3 and wine. That was a while ago. I guess it is worth checking if the issue still exists as a first step in deciding how to handle this. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
