[Bug 64565] New: Tomcat not able to kill jdbs session from V$Session

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64565

Bug ID: 64565
   Summary: Tomcat not able to kill jdbs session from V$Session
   Product: Tomcat 9
   Version: unspecified
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Servlet
  Assignee: dev@tomcat.apache.org
  Reporter: devidutt...@gmail.com
  Target Milestone: -

Tomcat not able to kill jdbs session from V$Session.

Observed that, few Queries getting struck with GC Buffer Busy acquire and
RedByOtherSession wait events,
 Same queries getting completed very fast in another Node.
After Stopping problematic Node or killing sessions, Issue has been resolved.
 Due to queries getting struck in database, Application is creating multiple
database sessions and resulting Tomcat service/Application page getting hanged.

-- 
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: Issue building tomcat 8.5.56

[Mark Thomas]

On 30/06/2020 04:47, Cesar Hernandez wrote:
> Hi!,
> 
> 
> I'm able to checkout 8.5.56 tag and have a successful: ant
> But I'm getting the following errors [1] after running:  ant test

We would need to see the individual test files to understand each of
those failures.

> I notice that in the build.properties.default there are some  Build
> control flags [2] related for NIO and NIO2, but by checking the Travis
> file I don't see those flags are been set to false during CI runs [3]

Travis is not the primary CI. Travis is being used to test architectures
we don't have as easy access to. The primary CI is at ci.apache.org

> It seems that during Travis build the project
> https://github.com/apache/tomcat-native is also compiled [4] but I
> wonder if I actually need to compile this tomcat-native or if there is
> something else I'm missing that is preventing me to have a successful
> build with all tests passing ok?

Tomcat Native is required to test the APR/Native Connector. The tests
run for each connector but if Tomcat Native is not present the tests
don't run for the APR/Native Connectot. It won't trigger failures.

> My environment:
> - OSX 10.15.5 
> - java version "1.7.0_79"
>  Java(TM) SE Runtime Environment (build 1.7.0_79-b15)
>  Java HotSpot(TM) 64-Bit Server VM (build 24.79-b02, mixed mode)
> - javac 1.7.0_79
> - Apache Ant(TM) version 1.9.9 compiled on February 2 2017
> - Git TAG checkout
> 8.5.56: 
> https://github.com/apache/tomcat/tree/4560d2f5a49965f73ed07cb879f17d9c096c9d13
> 
> 
> 
> [1]
>  [concat] Testsuites with failed tests:
>    [concat] TEST-org.apache.catalina.loader.TestPermissions.NIO.txt
>    [concat] TEST-org.apache.catalina.loader.TestPermissions.NIO2.txt

There are no such tests in the Tomcat source tree nor can I find any
record of such tests. What eaxcatly is running here?

>    [concat]
> TEST-org.apache.catalina.session.TestStandardSessionIntegration.NIO.txt
>    [concat]
> TEST-org.apache.catalina.session.TestStandardSessionIntegration.NIO2.txt
>    [concat]
> TEST-org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.NIO.txt
>    [concat]
> TEST-org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.NIO2.txt
>    [concat]
> TEST-org.apache.catalina.tribes.group.TestGroupChannelStartStop.NIO.txt
>    [concat]
> TEST-org.apache.catalina.tribes.group.TestGroupChannelStartStop.NIO2.txt
>    [concat]
> TEST-org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.NIO.txt
>    [concat]
> TEST-org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.NIO2.txt
>    [concat]
> TEST-org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.NIO.txt
>    [concat]
> TEST-org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.NIO2.txt

Tribes related tests are sensitive to the availability of multicast
networking. From memory, OSX had an issue with that by default.

Use org.apache.catalina.tribes.TesterMulticast to help diagnose.


>    [concat] TEST-org.apache.coyote.http11.TestHttp11Processor.NIO.txt
>    [concat] TEST-org.apache.coyote.http11.TestHttp11Processor.NIO2.txt

Failures in those tests are unusual.

>    [concat] TEST-org.apache.coyote.http2.TestHttp2Section_5_3.NIO.txt

This one might be a timing issue in the test.

>    [concat]
> TEST-org.apache.tomcat.util.digester.TestDigesterPermissions.NIO.txt
>    [concat]
> TEST-org.apache.tomcat.util.digester.TestDigesterPermissions.NIO2.txt

There are no such tests in the Tomcat source tree nor can I find any
record of such tests.

>    [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO.txt
>    [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO2.txt
>    [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO.txt
>    [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO2.txt
>    [concat] TEST-org.apache.tomcat.util.net.TestSsl.NIO.txt
>    [concat] TEST-org.apache.tomcat.util.net.TestSsl.NIO2.txt
>    [concat]
> TEST-org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO.txt
>    [concat]
> TEST-org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO2.txt
>    [concat]
> TEST-org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfigurationParser.NIO.txt
>    [concat]
> TEST-org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfigurationParser.NIO2.txt

The SSL tests are sensitive to the OpenSSL version present on the
system. Patched versions of OpenSSL tend to trigger failures because the
behaviour doesn't match the reported version number.

>    [concat]
> TEST-org.apache.tomcat.websocket.TestWebSocketFrameClientSSL.NIO.txt
>    [concat]
> TEST-org.apache.tomcat.websocket.TestWebSocketFrameClientSSL.NIO2.txt
>    [concat]
> TEST-org.apache.tomcat.websocket.TestWsWebSocketContainer.NIO.txt
>    [concat]
> TEST-org.apache.tomcat.websocket.TestWsWebSocketContainer.NIO2.txt

I'd recommend identifying the source of the mystery tests first. It
looks like what you are testing is not the Apache Tomcat source code.

Mark

-

[Bug 64565] Tomcat not able to kill jdbs session from V$Session

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64565

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 OS||All
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
Bugzilla is not a support forum.

The issue described is an application issue, not a Tomcat one.

On both cases, the correct location to see help is the Apache Tomcat users
mailing list.
http://tomcat.apache.org/lists.html#tomcat-users

-- 
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: Import updated French translations from POEditor

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 6a9b3f7  Import updated French translations from POEditor
6a9b3f7 is described below

commit 6a9b3f7f68e75c1b86a187949987963176a1eb4f
Author: Mark Thomas 
AuthorDate: Tue Jun 30 11:12:53 2020 +0100

Import updated French translations from POEditor
---
 java/org/apache/catalina/session/LocalStrings_fr.properties| 1 +
 java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties | 4 
 webapps/docs/changelog.xml | 4 
 3 files changed, 9 insertions(+)

diff --git a/java/org/apache/catalina/session/LocalStrings_fr.properties 
b/java/org/apache/catalina/session/LocalStrings_fr.properties
index b2fca5f..a4a88c3 100644
--- a/java/org/apache/catalina/session/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/session/LocalStrings_fr.properties
@@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=Impossible d''ouvrir la DataSource 
JNDI [{0}]
 fileStore.createFailed=Impossible de créer le répertoire [{0}] pour stocker 
les données de session
 fileStore.deleteFailed=Impossible d''effacer le fichier [{0}] qui empêche la 
création du support de stockage de sessions
 fileStore.deleteSessionFailed=Impossible d''effacer le fichier [{0}] qui 
n''est plus nécessaire
+fileStore.invalid=Fichier de persistance [{0}] invalide pour la session avec 
id [{1}]
 fileStore.loading=Chargement de la Session [{0}] depuis le fichier [{1}]
 fileStore.removing=Retrait de la Session [{0}] du fichier [{1}]
 fileStore.saving=Sauvegarde de la Session [{0}] vers le fichier [{1}]
diff --git a/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties 
b/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties
index aac8da4..110661d 100644
--- a/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties
@@ -13,6 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+quotedStringTokenizer.tokenizeError=Erreur de découpage du texte [{0}] après 
la position [{1}] en utilisant le mode [{2}]
+
+rewriteMap.tooManyParameters=Cette map ne supporte pas plusieurs paramètres
+
 rewriteValve.closeError=Erreur lors de la fermeture de la configuration
 rewriteValve.invalidFlags=Indicateur invalide dans [{0}] indicateurs [{1}]
 rewriteValve.invalidLine=Ligne invalide [{0}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c5708d3..58a3acd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -194,6 +194,10 @@
 64544: Add built libs to the bnd classpath for 
introspection.
 Pull request provided by Raymond Augé. (markt)
   
+  
+Improve the quality and expand the coverage of the French translations
+provided with Apache Tomcat. (remm)
+  
 
   
 


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

[tomcat] branch master updated: Extend the list of keys known to differ between versions

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new f0d9610  Extend the list of keys known to differ between versions
f0d9610 is described below

commit f0d96103734495d458d7412306dcbd6058413fd8
Author: Mark Thomas 
AuthorDate: Tue Jun 30 11:27:42 2020 +0100

Extend the list of keys known to differ between versions
---
 java/org/apache/tomcat/buildutil/translate/BackportEnglish.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java 
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index 739db0e..618e46b 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -35,6 +35,7 @@ public class BackportEnglish extends BackportBase {
 public static void main(String... args) throws IOException {
 // Exclude keys known to be different between 10.0.x and 9.0.x
 
keysToExclude.add("java.org.apache.catalina.connector.zzz.coyoteConnector.notAsciiSuperset");
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.error.jsproot.version.invalid");
 
 BackportEnglish backport = new BackportEnglish(args);
 backport.execute();


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

[tomcat] 01/02: Import updated French translations from POEditor

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 11cf65ad089b48ae3ee7adf3b6e6e80bfa39a699
Author: Mark Thomas 
AuthorDate: Tue Jun 30 11:26:49 2020 +0100

Import updated French translations from POEditor
---
 java/org/apache/catalina/session/LocalStrings_fr.properties| 1 +
 java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties | 4 
 webapps/docs/changelog.xml | 4 
 3 files changed, 9 insertions(+)

diff --git a/java/org/apache/catalina/session/LocalStrings_fr.properties 
b/java/org/apache/catalina/session/LocalStrings_fr.properties
index b2fca5f..a4a88c3 100644
--- a/java/org/apache/catalina/session/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/session/LocalStrings_fr.properties
@@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=Impossible d''ouvrir la DataSource 
JNDI [{0}]
 fileStore.createFailed=Impossible de créer le répertoire [{0}] pour stocker 
les données de session
 fileStore.deleteFailed=Impossible d''effacer le fichier [{0}] qui empêche la 
création du support de stockage de sessions
 fileStore.deleteSessionFailed=Impossible d''effacer le fichier [{0}] qui 
n''est plus nécessaire
+fileStore.invalid=Fichier de persistance [{0}] invalide pour la session avec 
id [{1}]
 fileStore.loading=Chargement de la Session [{0}] depuis le fichier [{1}]
 fileStore.removing=Retrait de la Session [{0}] du fichier [{1}]
 fileStore.saving=Sauvegarde de la Session [{0}] vers le fichier [{1}]
diff --git a/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties 
b/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties
index aac8da4..110661d 100644
--- a/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties
@@ -13,6 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+quotedStringTokenizer.tokenizeError=Erreur de découpage du texte [{0}] après 
la position [{1}] en utilisant le mode [{2}]
+
+rewriteMap.tooManyParameters=Cette map ne supporte pas plusieurs paramètres
+
 rewriteValve.closeError=Erreur lors de la fermeture de la configuration
 rewriteValve.invalidFlags=Indicateur invalide dans [{0}] indicateurs [{1}]
 rewriteValve.invalidLine=Ligne invalide [{0}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ac97228..e75f367 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -180,6 +180,10 @@
 64544: Add built libs to the bnd classpath for 
introspection.
 Pull request provided by Raymond Augé. (markt)
   
+  
+Improve the quality and expand the coverage of the French translations
+provided with Apache Tomcat. (remm)
+  
 
   
 


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

[tomcat] branch 9.0.x updated (47d7674 -> e2ce6a9)

[markt]

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 47d7674  Fix path
 new 11cf65a  Import updated French translations from POEditor
 new e2ce6a9  Extend the list of keys known to differ between versions

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/session/LocalStrings_fr.properties| 1 +
 java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties | 4 
 java/org/apache/tomcat/buildutil/translate/BackportEnglish.java| 1 +
 webapps/docs/changelog.xml | 4 
 4 files changed, 10 insertions(+)


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

[tomcat] 02/02: Extend the list of keys known to differ between versions

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit e2ce6a9ced7205cf7997ffc05332b2dfc1ec167b
Author: Mark Thomas 
AuthorDate: Tue Jun 30 11:27:42 2020 +0100

Extend the list of keys known to differ between versions
---
 java/org/apache/tomcat/buildutil/translate/BackportEnglish.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java 
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index 023aa3f..31b279b 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -37,6 +37,7 @@ public class BackportEnglish extends BackportBase {
 
keysToExclude.add("java.org.apache.catalina.manager.zzz.htmlManagerServlet.deployPath");
 
keysToExclude.add("java.org.apache.catalina.mbeans.zzz.jmxRemoteLifecycleListener.deprecated");
 
keysToExclude.add("java.org.apache.catalina.startup.zzz.catalina.stopServer.connectException");
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.error.jsproot.version.invalid");
 keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.usage");
 
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webfrg.header");
 
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webxml.header");


-
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 (64781c1 -> 3003d7b)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


from 64781c1  Fix BZ 64560 Don't clear DeltaRequest when changing session ID
 new f059c04  Import updated French translations from POEditor
 new 3003d7b  Correct order

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/session/LocalStrings_fr.properties| 1 +
 java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties | 2 ++
 java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties| 6 +++---
 java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties| 6 +++---
 java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties| 6 +++---
 java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties | 6 +++---
 webapps/docs/changelog.xml | 4 
 7 files changed, 19 insertions(+), 12 deletions(-)


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

[tomcat] 02/02: Correct order

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 3003d7b2cebd72d5c5add650637a5b00b084bc8b
Author: Mark Thomas 
AuthorDate: Tue Jun 30 11:32:28 2020 +0100

Correct order
---
 java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties| 6 +++---
 java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties| 6 +++---
 java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties| 6 +++---
 java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
index 98f523b..ed9a7ee 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jsseUtil.excludeProtocol=Le protocole SSL [{0}] qui est supporté par ce JRE a 
été exclu des protocoles disponibles dans Tomcat
-jsseUtil.noDefaultProtocols=Impossible de déterminer un défaut pour 
sslEnabledProtocols de [{0}], indiquez une valeur explicite pour permettre le 
démarrage du connecteur
-
 jsseSupport.certTranslationError=Erreur lors de la traduction du certificat 
[{0}]
 jsseSupport.clientCertError=Echec de l'obtention d'un certificat de la part du 
client
 
+jsseUtil.excludeProtocol=Le protocole SSL [{0}] qui est supporté par ce JRE a 
été exclu des protocoles disponibles dans Tomcat
+jsseUtil.noDefaultProtocols=Impossible de déterminer un défaut pour 
sslEnabledProtocols de [{0}], indiquez une valeur explicite pour permettre le 
démarrage du connecteur
+
 pemFile.noMultiPrimes=Le certificat PKCS#1 est dans un format mutli-prime et 
Java ne fournit pas d'API pour construire une clé privée RSA à partir de ce 
format
 pemFile.notValidRFC5915=La fichier de clé fourni ne se conforme pas à la RFC 
5915
 pemFile.parseError=Impossible de parser la clé de [{0}]
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties 
b/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
index 24066d2..b0b83b0 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jsseUtil.excludeProtocol=JRE は SSL プロトコル [{0}] に対応しています。しかし Tomcat 
の利用可能プロトコルからは除外されています。
-jsseUtil.noDefaultProtocols=sslEnableProtocols 
の既定値を取得できません。コネクターを開始できるよう明示的に値を設定してください。
-
 jsseSupport.certTranslationError=証明書の翻訳中にエラーが発生しました[{0}]
 jsseSupport.clientCertError=クライアント証明書を取得中のエラー
 
+jsseUtil.excludeProtocol=JRE は SSL プロトコル [{0}] に対応しています。しかし Tomcat 
の利用可能プロトコルからは除外されています。
+jsseUtil.noDefaultProtocols=sslEnableProtocols 
の既定値を取得できません。コネクターを開始できるよう明示的に値を設定してください。
+
 pemFile.noMultiPrimes=PKCS#1 証明書は multi-prime RSA フォーマットですが、Java 
はそのようなフォーマットに対する RSA 秘密鍵を構築する API を提供していません
 pemFile.notValidRFC5915=与えられたキーファイルは RFC 5915 に準拠していません
 pemFile.parseError=秘密鍵ファイル [{0}] を解析できませんでした。
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties 
b/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties
index 822dbf8..1882888 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jsseUtil.excludeProtocol=이 JRE에서 지원되는 해당 SSL 프로토콜 [{0}]이(가), Tomcat의 가용 프로토콜 
목록에서 제외되어 있습니다.
-jsseUtil.noDefaultProtocols=sslEnabledProtocols의 기본값을 결정할 수 없습니다. Connector가 
제대로 시작되는지 보증하려면 명시적으로 값을 설정하십시오.
-
 jsseSupport.certTranslationError=인증서 [{0}]에 대한 인증서 변환을 하는 중 오류 발생
 jsseSupport.clientCertError=클라이언트로부터 인증서를 구하려 시도하는 중 오류 발생
 
+jsseUtil.excludeProtocol=이 JRE에서 지원되는 해당 SSL 프로토콜 [{0}]이(가), Tomcat의 가용 프로토콜 
목록에서 제외되어 있습니다.
+jsseUtil.noDefaultProtocols=sslEnabledProtocols의 기본값을 결정할 수 없습니다. Connector가 
제대로 시작되는지 보증하려면 명시적으로 값을 설정하십시오.
+
 pemFile.noMultiPrimes=해당 PKCS#1 인증서는 multi-prime 포맷으로 되어 있는데, 자바는 해당 포맷으로부터 
RSA 개인 키 객체를 생성할 API를 제공하지 않습니다.
 pemFile.notValidRFC5915=제공된 키는 RFC 5915를 따르지 않습니다
 pemFile.parseError=[{0}](으)로부터 키를 파싱할 수 없습니다.
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties 
b/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties
index 19095ec..fc763bb 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jsseUtil.exclud

[tomcat] 01/02: Import updated French translations from POEditor

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit f059c048397e391b205419985dc1b3d13bf431c2
Author: Mark Thomas 
AuthorDate: Tue Jun 30 11:32:18 2020 +0100

Import updated French translations from POEditor
---
 java/org/apache/catalina/session/LocalStrings_fr.properties| 1 +
 java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties | 2 ++
 webapps/docs/changelog.xml | 4 
 3 files changed, 7 insertions(+)

diff --git a/java/org/apache/catalina/session/LocalStrings_fr.properties 
b/java/org/apache/catalina/session/LocalStrings_fr.properties
index b2fca5f..a4a88c3 100644
--- a/java/org/apache/catalina/session/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/session/LocalStrings_fr.properties
@@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=Impossible d''ouvrir la DataSource 
JNDI [{0}]
 fileStore.createFailed=Impossible de créer le répertoire [{0}] pour stocker 
les données de session
 fileStore.deleteFailed=Impossible d''effacer le fichier [{0}] qui empêche la 
création du support de stockage de sessions
 fileStore.deleteSessionFailed=Impossible d''effacer le fichier [{0}] qui 
n''est plus nécessaire
+fileStore.invalid=Fichier de persistance [{0}] invalide pour la session avec 
id [{1}]
 fileStore.loading=Chargement de la Session [{0}] depuis le fichier [{1}]
 fileStore.removing=Retrait de la Session [{0}] du fichier [{1}]
 fileStore.saving=Sauvegarde de la Session [{0}] vers le fichier [{1}]
diff --git a/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties 
b/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties
index aac8da4..f2dc9f7 100644
--- a/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/rewrite/LocalStrings_fr.properties
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+quotedStringTokenizer.tokenizeError=Erreur de découpage du texte [{0}] après 
la position [{1}] en utilisant le mode [{2}]
+
 rewriteValve.closeError=Erreur lors de la fermeture de la configuration
 rewriteValve.invalidFlags=Indicateur invalide dans [{0}] indicateurs [{1}]
 rewriteValve.invalidLine=Ligne invalide [{0}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c92a982..1ba0273 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -144,6 +144,10 @@
 64522: Package jars in effective dependency order. Pull
 request provided by Raymond Augé. (markt)
   
+  
+Improve the quality and expand the coverage of the French translations
+provided with Apache Tomcat. (remm)
+  
 
   
 


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

[tomcat] branch 7.0.x updated (22da96f -> 3d23880)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


from 22da96f  Fix BZ 64560 Don't clear DeltaRequest when changing session ID
 new 9c5c9ee  Import updated French translations from POEditor
 new 3d23880  Align Chinese translations with 8.5.x

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 4 
 java/org/apache/catalina/session/LocalStrings_fr.properties | 1 +
 webapps/docs/changelog.xml  | 4 
 3 files changed, 9 insertions(+)


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

[tomcat] 01/02: Import updated French translations from POEditor

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 9c5c9eeff8043e1618a3839dc0a95e0d9082f6dc
Author: Mark Thomas 
AuthorDate: Tue Jun 30 11:39:44 2020 +0100

Import updated French translations from POEditor
---
 java/org/apache/catalina/session/LocalStrings_fr.properties | 1 +
 webapps/docs/changelog.xml  | 4 
 2 files changed, 5 insertions(+)

diff --git a/java/org/apache/catalina/session/LocalStrings_fr.properties 
b/java/org/apache/catalina/session/LocalStrings_fr.properties
index e76ade2..aa39d68 100644
--- a/java/org/apache/catalina/session/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/session/LocalStrings_fr.properties
@@ -32,6 +32,7 @@ applicationSession.value.iae=valeur nulle
 fileStore.createFailed=Impossible de créer le répertoire [{0}] pour stocker 
les données de session
 fileStore.deleteFailed=Impossible d''effacer le fichier [{0}] qui empêche la 
création du support de stockage de sessions
 fileStore.deleteSessionFailed=Impossible d''effacer le fichier [{0}] qui 
n''est plus nécessaire
+fileStore.invalid=Fichier de persistance [{0}] invalide pour la session avec 
id [{1}]
 fileStore.loading=Chargement de la Session [{0}] depuis le fichier [{1}]
 fileStore.removing=Retrait de la Session [{0}] du fichier [{1}]
 fileStore.saving=Sauvegarde de la Session [{0}] vers le fichier [{1}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4ac430d..23df812 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,10 @@
 they are packaged into separate jars. Pull request provided by Raymond
 Augé. (markt)
   
+  
+Improve the quality and expand the coverage of the French translations
+provided with Apache Tomcat. (remm)
+  
 
   
 


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

[tomcat] 02/02: Align Chinese translations with 8.5.x

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 3d23880904bd7ba3171a6bb9448d587890e9bf36
Author: Mark Thomas 
AuthorDate: Tue Jun 30 11:40:12 2020 +0100

Align Chinese translations with 8.5.x
---
 java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 4 
 1 file changed, 4 insertions(+)

diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index b84c416..2156a2e 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -62,6 +62,9 @@ applicationServletRegistration.setServletSecurity.ise=无法将安全性约束
 
 
applicationSessionCookieConfig.ise=无法将属性{0}添加到上下文{1}的sessioncokieconfig中，因为该上下文已初始化
 
+aprListener.aprDestroy=无法关闭基于APR的Apache Tomcat本机库
+aprListener.aprInit=在java.library.path:[{0}]上找不到基于APR的Apache 
Tomcat本机库，该库允许在生产环境中获得最佳性能
+aprListener.aprInitDebug=在java.library.path[{1}]上使用名称[{0}]找不到基于APR的ApacheTomcat本机库。报告的错误是[{2}]
 aprListener.aprInitError=基于APR的本地库加载失败.错误报告为[{0}]
 aprListener.currentFIPSMode=当前FIPS模式：[{0}]。
 aprListener.enterAlreadyInFIPSMode=AprLifecycleListener 
配置为强制进入FIPS模式，但库已处于FIPS模式[{0}]
@@ -74,6 +77,7 @@ aprListener.requireNotInFIPSMode=AprLifecycleListener配置为要求库已处于
 aprListener.skipFIPSInitialization=已经处于FIPS模式，跳过FIPS初始化
 aprListener.sslInit=无法初始化SSLEngine
 aprListener.tcnInvalid=安装了不兼容的APR（基于Apache Tomcat原生库）版本[{0}]，而Tomcat要求版本[{1}]
+aprListener.tcnValid=使用APR版本[{1}]加载了基于APR的Apache Tomcat本机库[{0}]。
 aprListener.tcnVersion=安装了基于APR的Apache Tomcat 
Native库的旧版本[{0}]，而Tomcat建议使用[{1}]的最低版本
 aprListener.tooLateForFIPSMode=无法设置FIPSMode：SSL已初始化
 aprListener.tooLateForSSLEngine=无法设置引擎：SSL已初始化


-
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

[buildbot]

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/5282

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] f0d96103734495d458d7412306dcbd6058413fd8
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

[tomcat] 01/02: Fix BZ 64563 - additional payload length validation

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 1c1c77b0efb667cea80b532440b44cea1dc427c3
Author: Mark Thomas 
AuthorDate: Mon Jun 29 14:02:59 2020 +0100

Fix BZ 64563 - additional payload length validation

https://bz.apache.org/bugzilla/show_bug.cgi?id=64563
---
 java/org/apache/tomcat/websocket/LocalStrings.properties | 1 +
 java/org/apache/tomcat/websocket/WsFrameBase.java| 7 +++
 webapps/docs/changelog.xml   | 8 
 3 files changed, 16 insertions(+)

diff --git a/java/org/apache/tomcat/websocket/LocalStrings.properties 
b/java/org/apache/tomcat/websocket/LocalStrings.properties
index 9412ffe..929822d 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings.properties
@@ -71,6 +71,7 @@ wsFrame.noContinuation=A new message was started when a 
continuation frame was e
 wsFrame.notMasked=The client frame was not masked but all client frames must 
be masked
 wsFrame.oneByteCloseCode=The client sent a close frame with a single byte 
payload which is not valid
 wsFrame.partialHeaderComplete=WebSocket frame received. fin [{0}], rsv [{1}], 
OpCode [{2}], payload length [{3}]
+wsFrame.payloadMsbInvalid=An invalid WebSocket frame was received - the most 
significant bit of a 64-bit payload was illegally set
 wsFrame.sessionClosed=The client data cannot be processed because the session 
has already been closed
 wsFrame.suspendRequested=Suspend of the message receiving has already been 
requested.
 wsFrame.textMessageTooBig=The decoded text message was too big for the output 
buffer and the endpoint does not support partial messages
diff --git a/java/org/apache/tomcat/websocket/WsFrameBase.java 
b/java/org/apache/tomcat/websocket/WsFrameBase.java
index 97c9c94..ba5813b 100644
--- a/java/org/apache/tomcat/websocket/WsFrameBase.java
+++ b/java/org/apache/tomcat/websocket/WsFrameBase.java
@@ -261,6 +261,13 @@ public abstract class WsFrameBase {
 } else if (payloadLength == 127) {
 payloadLength = byteArrayToLong(inputBuffer.array(),
 inputBuffer.arrayOffset() + inputBuffer.position(), 8);
+// The most significant bit of those 8 bytes is required to be zero
+// (see RFC 6455, section 5.2). If the most significant bit is set,
+// the resulting payload length will be negative so test for that.
+if (payloadLength < 0) {
+throw new WsIOException(
+new CloseReason(CloseCodes.PROTOCOL_ERROR, 
sm.getString("wsFrame.payloadMsbInvalid")));
+}
 inputBuffer.position(inputBuffer.position() + 8);
 }
 if (Util.isControl(opCode)) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 58a3acd..4bc2181 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -138,6 +138,14 @@
   
 
   
+  
+
+  
+64563: Add additional validation of payload length for
+WebSocket messages. (markt)
+  
+
+  
   
 
   


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

[tomcat] 02/02: Correct calculation of payload length when using 4 or more bytes

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 1cddae8da4ecb4ac04575d3b5fba2daa2e0c8ead
Author: Mark Thomas 
AuthorDate: Mon Jun 29 15:08:25 2020 +0100

Correct calculation of payload length when using 4 or more bytes
---
 java/org/apache/tomcat/websocket/WsFrameBase.java |  2 +-
 test/org/apache/tomcat/websocket/TestWsFrame.java | 32 ---
 webapps/docs/changelog.xml|  4 +++
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/WsFrameBase.java 
b/java/org/apache/tomcat/websocket/WsFrameBase.java
index ba5813b..a5d2aaa 100644
--- a/java/org/apache/tomcat/websocket/WsFrameBase.java
+++ b/java/org/apache/tomcat/websocket/WsFrameBase.java
@@ -678,7 +678,7 @@ public abstract class WsFrameBase {
 int shift = 0;
 long result = 0;
 for (int i = start + len - 1; i >= start; i--) {
-result = result + ((b[i] & 0xFF) << shift);
+result = result + ((b[i] & 0xFFL) << shift);
 shift += 8;
 }
 return result;
diff --git a/test/org/apache/tomcat/websocket/TestWsFrame.java 
b/test/org/apache/tomcat/websocket/TestWsFrame.java
index 0b423ad..d6afce0 100644
--- a/test/org/apache/tomcat/websocket/TestWsFrame.java
+++ b/test/org/apache/tomcat/websocket/TestWsFrame.java
@@ -28,10 +28,17 @@ public class TestWsFrame {
 Assert.assertEquals(0L, WsFrameBase.byteArrayToLong(new byte[] { 0 }, 
0, 1));
 Assert.assertEquals(1L, WsFrameBase.byteArrayToLong(new byte[] { 1 }, 
0, 1));
 Assert.assertEquals(0xFF, WsFrameBase.byteArrayToLong(new byte[] { -1 
}, 0, 1));
-Assert.assertEquals(0x,
-WsFrameBase.byteArrayToLong(new byte[] { -1, -1 }, 0, 2));
-Assert.assertEquals(0xFF,
-WsFrameBase.byteArrayToLong(new byte[] { -1, -1, -1 }, 0, 3));
+Assert.assertEquals(0x, WsFrameBase.byteArrayToLong(new byte[] { 
-1, -1 }, 0, 2));
+Assert.assertEquals(0xFF, WsFrameBase.byteArrayToLong(new byte[] { 
-1, -1, -1 }, 0, 3));
+Assert.assertEquals(0xL, WsFrameBase.byteArrayToLong(new 
byte[] { -1, -1, -1, -1 }, 0, 4));
+Assert.assertEquals(0xFFL, WsFrameBase.byteArrayToLong(new 
byte[] { -1, -1, -1, -1, -1 }, 0, 5));
+Assert.assertEquals(0xL, WsFrameBase.byteArrayToLong(new 
byte[] { -1, -1, -1, -1, -1, -1 }, 0, 6));
+Assert.assertEquals(0xFFL,
+WsFrameBase.byteArrayToLong(new byte[] { -1, -1, -1, -1, -1, 
-1, -1 }, 0, 7));
+Assert.assertEquals(0x7FFFL,
+WsFrameBase.byteArrayToLong(new byte[] { 127, -1, -1, -1, -1, 
-1, -1, -1 }, 0, 8));
+Assert.assertEquals(-1,
+WsFrameBase.byteArrayToLong(new byte[] { -1, -1, -1, -1, -1, 
-1, -1, -1 }, 0, 8));
 }
 
 
@@ -40,10 +47,17 @@ public class TestWsFrame {
 Assert.assertEquals(0L, WsFrameBase.byteArrayToLong(new byte[] { 20, 0 
}, 1, 1));
 Assert.assertEquals(1L, WsFrameBase.byteArrayToLong(new byte[] { 20, 1 
}, 1, 1));
 Assert.assertEquals(0xFF, WsFrameBase.byteArrayToLong(new byte[] { 20, 
-1 }, 1, 1));
-Assert.assertEquals(0x,
-WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1 }, 1, 2));
-Assert.assertEquals(0xFF,
-WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1 }, 1, 
3));
+Assert.assertEquals(0x, WsFrameBase.byteArrayToLong(new byte[] { 
20, -1, -1 }, 1, 2));
+Assert.assertEquals(0xFF, WsFrameBase.byteArrayToLong(new byte[] { 
20, -1, -1, -1 }, 1, 3));
+Assert.assertEquals(0xL, WsFrameBase.byteArrayToLong(new 
byte[] { 20, -1, -1, -1, -1 }, 1, 4));
+Assert.assertEquals(0xFFL, WsFrameBase.byteArrayToLong(new 
byte[] { 20, -1, -1, -1, -1, -1 }, 1, 5));
+Assert.assertEquals(0xL,
+WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1, -1, 
-1, -1 }, 1, 6));
+Assert.assertEquals(0xFFL,
+WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1, -1, 
-1, -1, -1 }, 1, 7));
+Assert.assertEquals(0x7FFFL,
+WsFrameBase.byteArrayToLong(new byte[] { 20, 127, -1, -1, -1, 
-1, -1, -1, -1 }, 1, 8));
+Assert.assertEquals(-1,
+WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1, -1, 
-1, -1, -1, -1 }, 1, 8));
 }
-
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4bc2181..1fbf038 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -144,6 +144,10 @@
 64563: Add additional validation of payload length for
 WebSocket messages. (markt)
   
+  
+Correct the calculation of payload length when four or more bytes are
+re

[tomcat] branch master updated (f0d9610 -> 1cddae8)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


from f0d9610  Extend the list of keys known to differ between versions
 new 1c1c77b  Fix BZ 64563 - additional payload length validation
 new 1cddae8  Correct calculation of payload length when using 4 or more 
bytes

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:
 .../tomcat/websocket/LocalStrings.properties   |  1 +
 java/org/apache/tomcat/websocket/WsFrameBase.java  |  9 +-
 test/org/apache/tomcat/websocket/TestWsFrame.java  | 32 --
 webapps/docs/changelog.xml | 12 
 4 files changed, 44 insertions(+), 10 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 BZ 64563 - additional payload length validation

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 40fa74c  Fix BZ 64563 - additional payload length validation
40fa74c is described below

commit 40fa74c74822711ab878079d0a69f7357926723d
Author: Mark Thomas 
AuthorDate: Mon Jun 29 14:02:59 2020 +0100

Fix BZ 64563 - additional payload length validation

https://bz.apache.org/bugzilla/show_bug.cgi?id=64563
---
 java/org/apache/tomcat/websocket/LocalStrings.properties | 1 +
 java/org/apache/tomcat/websocket/WsFrameBase.java| 7 +++
 webapps/docs/changelog.xml   | 8 
 3 files changed, 16 insertions(+)

diff --git a/java/org/apache/tomcat/websocket/LocalStrings.properties 
b/java/org/apache/tomcat/websocket/LocalStrings.properties
index 9412ffe..929822d 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings.properties
@@ -71,6 +71,7 @@ wsFrame.noContinuation=A new message was started when a 
continuation frame was e
 wsFrame.notMasked=The client frame was not masked but all client frames must 
be masked
 wsFrame.oneByteCloseCode=The client sent a close frame with a single byte 
payload which is not valid
 wsFrame.partialHeaderComplete=WebSocket frame received. fin [{0}], rsv [{1}], 
OpCode [{2}], payload length [{3}]
+wsFrame.payloadMsbInvalid=An invalid WebSocket frame was received - the most 
significant bit of a 64-bit payload was illegally set
 wsFrame.sessionClosed=The client data cannot be processed because the session 
has already been closed
 wsFrame.suspendRequested=Suspend of the message receiving has already been 
requested.
 wsFrame.textMessageTooBig=The decoded text message was too big for the output 
buffer and the endpoint does not support partial messages
diff --git a/java/org/apache/tomcat/websocket/WsFrameBase.java 
b/java/org/apache/tomcat/websocket/WsFrameBase.java
index 28cdc30..4afad67 100644
--- a/java/org/apache/tomcat/websocket/WsFrameBase.java
+++ b/java/org/apache/tomcat/websocket/WsFrameBase.java
@@ -261,6 +261,13 @@ public abstract class WsFrameBase {
 } else if (payloadLength == 127) {
 payloadLength = byteArrayToLong(inputBuffer.array(),
 inputBuffer.arrayOffset() + inputBuffer.position(), 8);
+// The most significant bit of those 8 bytes is required to be zero
+// (see RFC 6455, section 5.2). If the most significant bit is set,
+// the resulting payload length will be negative so test for that.
+if (payloadLength < 0) {
+throw new WsIOException(
+new CloseReason(CloseCodes.PROTOCOL_ERROR, 
sm.getString("wsFrame.payloadMsbInvalid")));
+}
 inputBuffer.position(inputBuffer.position() + 8);
 }
 if (Util.isControl(opCode)) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e75f367..1d1a735 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,14 @@
   
 
   
+  
+
+  
+64563: Add additional validation of payload length for
+WebSocket messages. (markt)
+  
+
+  
   
 
   


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

[tomcat] branch 9.0.x updated: Correct calculation of payload length when using 4 or more bytes

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new d37f128  Correct calculation of payload length when using 4 or more 
bytes
d37f128 is described below

commit d37f128c3b685dae25f55266d091c402e86257d7
Author: Mark Thomas 
AuthorDate: Mon Jun 29 15:08:25 2020 +0100

Correct calculation of payload length when using 4 or more bytes
---
 java/org/apache/tomcat/websocket/WsFrameBase.java |  2 +-
 test/org/apache/tomcat/websocket/TestWsFrame.java | 32 ---
 webapps/docs/changelog.xml|  4 +++
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/WsFrameBase.java 
b/java/org/apache/tomcat/websocket/WsFrameBase.java
index 4afad67..a6df700 100644
--- a/java/org/apache/tomcat/websocket/WsFrameBase.java
+++ b/java/org/apache/tomcat/websocket/WsFrameBase.java
@@ -678,7 +678,7 @@ public abstract class WsFrameBase {
 int shift = 0;
 long result = 0;
 for (int i = start + len - 1; i >= start; i--) {
-result = result + ((b[i] & 0xFF) << shift);
+result = result + ((b[i] & 0xFFL) << shift);
 shift += 8;
 }
 return result;
diff --git a/test/org/apache/tomcat/websocket/TestWsFrame.java 
b/test/org/apache/tomcat/websocket/TestWsFrame.java
index 0b423ad..d6afce0 100644
--- a/test/org/apache/tomcat/websocket/TestWsFrame.java
+++ b/test/org/apache/tomcat/websocket/TestWsFrame.java
@@ -28,10 +28,17 @@ public class TestWsFrame {
 Assert.assertEquals(0L, WsFrameBase.byteArrayToLong(new byte[] { 0 }, 
0, 1));
 Assert.assertEquals(1L, WsFrameBase.byteArrayToLong(new byte[] { 1 }, 
0, 1));
 Assert.assertEquals(0xFF, WsFrameBase.byteArrayToLong(new byte[] { -1 
}, 0, 1));
-Assert.assertEquals(0x,
-WsFrameBase.byteArrayToLong(new byte[] { -1, -1 }, 0, 2));
-Assert.assertEquals(0xFF,
-WsFrameBase.byteArrayToLong(new byte[] { -1, -1, -1 }, 0, 3));
+Assert.assertEquals(0x, WsFrameBase.byteArrayToLong(new byte[] { 
-1, -1 }, 0, 2));
+Assert.assertEquals(0xFF, WsFrameBase.byteArrayToLong(new byte[] { 
-1, -1, -1 }, 0, 3));
+Assert.assertEquals(0xL, WsFrameBase.byteArrayToLong(new 
byte[] { -1, -1, -1, -1 }, 0, 4));
+Assert.assertEquals(0xFFL, WsFrameBase.byteArrayToLong(new 
byte[] { -1, -1, -1, -1, -1 }, 0, 5));
+Assert.assertEquals(0xL, WsFrameBase.byteArrayToLong(new 
byte[] { -1, -1, -1, -1, -1, -1 }, 0, 6));
+Assert.assertEquals(0xFFL,
+WsFrameBase.byteArrayToLong(new byte[] { -1, -1, -1, -1, -1, 
-1, -1 }, 0, 7));
+Assert.assertEquals(0x7FFFL,
+WsFrameBase.byteArrayToLong(new byte[] { 127, -1, -1, -1, -1, 
-1, -1, -1 }, 0, 8));
+Assert.assertEquals(-1,
+WsFrameBase.byteArrayToLong(new byte[] { -1, -1, -1, -1, -1, 
-1, -1, -1 }, 0, 8));
 }
 
 
@@ -40,10 +47,17 @@ public class TestWsFrame {
 Assert.assertEquals(0L, WsFrameBase.byteArrayToLong(new byte[] { 20, 0 
}, 1, 1));
 Assert.assertEquals(1L, WsFrameBase.byteArrayToLong(new byte[] { 20, 1 
}, 1, 1));
 Assert.assertEquals(0xFF, WsFrameBase.byteArrayToLong(new byte[] { 20, 
-1 }, 1, 1));
-Assert.assertEquals(0x,
-WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1 }, 1, 2));
-Assert.assertEquals(0xFF,
-WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1 }, 1, 
3));
+Assert.assertEquals(0x, WsFrameBase.byteArrayToLong(new byte[] { 
20, -1, -1 }, 1, 2));
+Assert.assertEquals(0xFF, WsFrameBase.byteArrayToLong(new byte[] { 
20, -1, -1, -1 }, 1, 3));
+Assert.assertEquals(0xL, WsFrameBase.byteArrayToLong(new 
byte[] { 20, -1, -1, -1, -1 }, 1, 4));
+Assert.assertEquals(0xFFL, WsFrameBase.byteArrayToLong(new 
byte[] { 20, -1, -1, -1, -1, -1 }, 1, 5));
+Assert.assertEquals(0xL,
+WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1, -1, 
-1, -1 }, 1, 6));
+Assert.assertEquals(0xFFL,
+WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1, -1, 
-1, -1, -1 }, 1, 7));
+Assert.assertEquals(0x7FFFL,
+WsFrameBase.byteArrayToLong(new byte[] { 20, 127, -1, -1, -1, 
-1, -1, -1, -1 }, 1, 8));
+Assert.assertEquals(-1,
+WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1, -1, 
-1, -1, -1, -1 }, 1, 8));
 }
-
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1d1a735..4ad694f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -133,6 +133,10 @@
 64563: Add additi

[tomcat] 02/02: Correct calculation of payload length when using 4 or more bytes

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit e7c3817bfbc45bf5315e11f9a593d26d791d7fa9
Author: Mark Thomas 
AuthorDate: Mon Jun 29 15:08:25 2020 +0100

Correct calculation of payload length when using 4 or more bytes
---
 java/org/apache/tomcat/websocket/WsFrameBase.java |  2 +-
 test/org/apache/tomcat/websocket/TestWsFrame.java | 32 ---
 webapps/docs/changelog.xml|  4 +++
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/WsFrameBase.java 
b/java/org/apache/tomcat/websocket/WsFrameBase.java
index 4afad67..a6df700 100644
--- a/java/org/apache/tomcat/websocket/WsFrameBase.java
+++ b/java/org/apache/tomcat/websocket/WsFrameBase.java
@@ -678,7 +678,7 @@ public abstract class WsFrameBase {
 int shift = 0;
 long result = 0;
 for (int i = start + len - 1; i >= start; i--) {
-result = result + ((b[i] & 0xFF) << shift);
+result = result + ((b[i] & 0xFFL) << shift);
 shift += 8;
 }
 return result;
diff --git a/test/org/apache/tomcat/websocket/TestWsFrame.java 
b/test/org/apache/tomcat/websocket/TestWsFrame.java
index 0b423ad..d6afce0 100644
--- a/test/org/apache/tomcat/websocket/TestWsFrame.java
+++ b/test/org/apache/tomcat/websocket/TestWsFrame.java
@@ -28,10 +28,17 @@ public class TestWsFrame {
 Assert.assertEquals(0L, WsFrameBase.byteArrayToLong(new byte[] { 0 }, 
0, 1));
 Assert.assertEquals(1L, WsFrameBase.byteArrayToLong(new byte[] { 1 }, 
0, 1));
 Assert.assertEquals(0xFF, WsFrameBase.byteArrayToLong(new byte[] { -1 
}, 0, 1));
-Assert.assertEquals(0x,
-WsFrameBase.byteArrayToLong(new byte[] { -1, -1 }, 0, 2));
-Assert.assertEquals(0xFF,
-WsFrameBase.byteArrayToLong(new byte[] { -1, -1, -1 }, 0, 3));
+Assert.assertEquals(0x, WsFrameBase.byteArrayToLong(new byte[] { 
-1, -1 }, 0, 2));
+Assert.assertEquals(0xFF, WsFrameBase.byteArrayToLong(new byte[] { 
-1, -1, -1 }, 0, 3));
+Assert.assertEquals(0xL, WsFrameBase.byteArrayToLong(new 
byte[] { -1, -1, -1, -1 }, 0, 4));
+Assert.assertEquals(0xFFL, WsFrameBase.byteArrayToLong(new 
byte[] { -1, -1, -1, -1, -1 }, 0, 5));
+Assert.assertEquals(0xL, WsFrameBase.byteArrayToLong(new 
byte[] { -1, -1, -1, -1, -1, -1 }, 0, 6));
+Assert.assertEquals(0xFFL,
+WsFrameBase.byteArrayToLong(new byte[] { -1, -1, -1, -1, -1, 
-1, -1 }, 0, 7));
+Assert.assertEquals(0x7FFFL,
+WsFrameBase.byteArrayToLong(new byte[] { 127, -1, -1, -1, -1, 
-1, -1, -1 }, 0, 8));
+Assert.assertEquals(-1,
+WsFrameBase.byteArrayToLong(new byte[] { -1, -1, -1, -1, -1, 
-1, -1, -1 }, 0, 8));
 }
 
 
@@ -40,10 +47,17 @@ public class TestWsFrame {
 Assert.assertEquals(0L, WsFrameBase.byteArrayToLong(new byte[] { 20, 0 
}, 1, 1));
 Assert.assertEquals(1L, WsFrameBase.byteArrayToLong(new byte[] { 20, 1 
}, 1, 1));
 Assert.assertEquals(0xFF, WsFrameBase.byteArrayToLong(new byte[] { 20, 
-1 }, 1, 1));
-Assert.assertEquals(0x,
-WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1 }, 1, 2));
-Assert.assertEquals(0xFF,
-WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1 }, 1, 
3));
+Assert.assertEquals(0x, WsFrameBase.byteArrayToLong(new byte[] { 
20, -1, -1 }, 1, 2));
+Assert.assertEquals(0xFF, WsFrameBase.byteArrayToLong(new byte[] { 
20, -1, -1, -1 }, 1, 3));
+Assert.assertEquals(0xL, WsFrameBase.byteArrayToLong(new 
byte[] { 20, -1, -1, -1, -1 }, 1, 4));
+Assert.assertEquals(0xFFL, WsFrameBase.byteArrayToLong(new 
byte[] { 20, -1, -1, -1, -1, -1 }, 1, 5));
+Assert.assertEquals(0xL,
+WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1, -1, 
-1, -1 }, 1, 6));
+Assert.assertEquals(0xFFL,
+WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1, -1, 
-1, -1, -1 }, 1, 7));
+Assert.assertEquals(0x7FFFL,
+WsFrameBase.byteArrayToLong(new byte[] { 20, 127, -1, -1, -1, 
-1, -1, -1, -1 }, 1, 8));
+Assert.assertEquals(-1,
+WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1, -1, 
-1, -1, -1, -1 }, 1, 8));
 }
-
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d2de204..64545f3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -129,6 +129,10 @@
 64563: Add additional validation of payload length for
 WebSocket messages. (markt)
   
+  
+Correct the calculation of payload length when four or more bytes are
+req

[tomcat] branch 8.5.x updated (3003d7b -> e7c3817)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


from 3003d7b  Correct order
 new 12d7156  Fix BZ 64563 - additional payload length validation
 new e7c3817  Correct calculation of payload length when using 4 or more 
bytes

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:
 .../tomcat/websocket/LocalStrings.properties   |  1 +
 java/org/apache/tomcat/websocket/WsFrameBase.java  |  9 +-
 test/org/apache/tomcat/websocket/TestWsFrame.java  | 32 --
 webapps/docs/changelog.xml | 12 
 4 files changed, 44 insertions(+), 10 deletions(-)


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

[tomcat] 01/02: Fix BZ 64563 - additional payload length validation

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 12d715676038efbf9c728af10163f8277fc019d5
Author: Mark Thomas 
AuthorDate: Mon Jun 29 14:02:59 2020 +0100

Fix BZ 64563 - additional payload length validation

https://bz.apache.org/bugzilla/show_bug.cgi?id=64563
---
 java/org/apache/tomcat/websocket/LocalStrings.properties | 1 +
 java/org/apache/tomcat/websocket/WsFrameBase.java| 7 +++
 webapps/docs/changelog.xml   | 8 
 3 files changed, 16 insertions(+)

diff --git a/java/org/apache/tomcat/websocket/LocalStrings.properties 
b/java/org/apache/tomcat/websocket/LocalStrings.properties
index 9412ffe..929822d 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings.properties
@@ -71,6 +71,7 @@ wsFrame.noContinuation=A new message was started when a 
continuation frame was e
 wsFrame.notMasked=The client frame was not masked but all client frames must 
be masked
 wsFrame.oneByteCloseCode=The client sent a close frame with a single byte 
payload which is not valid
 wsFrame.partialHeaderComplete=WebSocket frame received. fin [{0}], rsv [{1}], 
OpCode [{2}], payload length [{3}]
+wsFrame.payloadMsbInvalid=An invalid WebSocket frame was received - the most 
significant bit of a 64-bit payload was illegally set
 wsFrame.sessionClosed=The client data cannot be processed because the session 
has already been closed
 wsFrame.suspendRequested=Suspend of the message receiving has already been 
requested.
 wsFrame.textMessageTooBig=The decoded text message was too big for the output 
buffer and the endpoint does not support partial messages
diff --git a/java/org/apache/tomcat/websocket/WsFrameBase.java 
b/java/org/apache/tomcat/websocket/WsFrameBase.java
index 28cdc30..4afad67 100644
--- a/java/org/apache/tomcat/websocket/WsFrameBase.java
+++ b/java/org/apache/tomcat/websocket/WsFrameBase.java
@@ -261,6 +261,13 @@ public abstract class WsFrameBase {
 } else if (payloadLength == 127) {
 payloadLength = byteArrayToLong(inputBuffer.array(),
 inputBuffer.arrayOffset() + inputBuffer.position(), 8);
+// The most significant bit of those 8 bytes is required to be zero
+// (see RFC 6455, section 5.2). If the most significant bit is set,
+// the resulting payload length will be negative so test for that.
+if (payloadLength < 0) {
+throw new WsIOException(
+new CloseReason(CloseCodes.PROTOCOL_ERROR, 
sm.getString("wsFrame.payloadMsbInvalid")));
+}
 inputBuffer.position(inputBuffer.position() + 8);
 }
 if (Util.isControl(opCode)) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1ba0273..d2de204 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -123,6 +123,14 @@
   
 
   
+  
+
+  
+64563: Add additional validation of payload length for
+WebSocket messages. (markt)
+  
+
+  
   
 
   


-
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 (3d23880 -> 34d19fb)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


from 3d23880  Align Chinese translations with 8.5.x
 new f9f75c1  Fix BZ 64563 - additional payload length validation
 new 34d19fb  Correct calculation of payload length when using 4 or more 
bytes

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:
 .../tomcat/websocket/LocalStrings.properties   |  1 +
 java/org/apache/tomcat/websocket/WsFrameBase.java  |  9 +-
 test/org/apache/tomcat/websocket/TestWsFrame.java  | 32 --
 webapps/docs/changelog.xml |  8 ++
 4 files changed, 40 insertions(+), 10 deletions(-)


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

[tomcat] 01/02: Fix BZ 64563 - additional payload length validation

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit f9f75c14678b68633f79030ddf4ff827f014cc84
Author: Mark Thomas 
AuthorDate: Mon Jun 29 14:02:59 2020 +0100

Fix BZ 64563 - additional payload length validation

https://bz.apache.org/bugzilla/show_bug.cgi?id=64563
---
 java/org/apache/tomcat/websocket/LocalStrings.properties | 1 +
 java/org/apache/tomcat/websocket/WsFrameBase.java| 7 +++
 webapps/docs/changelog.xml   | 4 
 3 files changed, 12 insertions(+)

diff --git a/java/org/apache/tomcat/websocket/LocalStrings.properties 
b/java/org/apache/tomcat/websocket/LocalStrings.properties
index 00a409c..0659225 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings.properties
@@ -64,6 +64,7 @@ wsFrame.noContinuation=A new message was started when a 
continuation frame was e
 wsFrame.notMasked=The client frame was not masked but all client frames must 
be masked
 wsFrame.oneByteCloseCode=The client sent a close frame with a single byte 
payload which is not valid
 wsFrame.partialHeaderComplete=WebSocket frame received. fin [{0}], rsv [{1}], 
OpCode [{2}], payload length [{3}]
+wsFrame.payloadMsbInvalid=An invalid WebSocket frame was received - the most 
significant bit of a 64-bit payload was illegally set
 wsFrame.sessionClosed=The client data cannot be processed because the session 
has already been closed
 wsFrame.textMessageTooBig=The decoded text message was too big for the output 
buffer and the endpoint does not support partial messages
 wsFrame.wrongRsv=The client frame set the reserved bits to [{0}] for a message 
with opCode [{1}] which was not supported by this endpoint
diff --git a/java/org/apache/tomcat/websocket/WsFrameBase.java 
b/java/org/apache/tomcat/websocket/WsFrameBase.java
index b3d7261..e7b13fd 100644
--- a/java/org/apache/tomcat/websocket/WsFrameBase.java
+++ b/java/org/apache/tomcat/websocket/WsFrameBase.java
@@ -256,6 +256,13 @@ public abstract class WsFrameBase {
 readPos += 2;
 } else if (payloadLength == 127) {
 payloadLength = byteArrayToLong(inputBuffer, readPos, 8);
+// The most significant bit of those 8 bytes is required to be zero
+// (see RFC 6455, section 5.2). If the most significant bit is set,
+// the resulting payload length will be negative so test for that.
+if (payloadLength < 0) {
+throw new WsIOException(
+new CloseReason(CloseCodes.PROTOCOL_ERROR, 
sm.getString("wsFrame.payloadMsbInvalid")));
+}
 readPos += 8;
 }
 if (Util.isControl(opCode)) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 23df812..93823de 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,10 @@
 Include the target URL in the log message when a WebSocket connection
 fails. (markt)
   
+  
+64563: Add additional validation of payload length for
+WebSocket messages. (markt)
+  
 
   
   


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

[tomcat] 02/02: Correct calculation of payload length when using 4 or more bytes

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 34d19fbe243a6c84cac75c83118d3a0351f5ab41
Author: Mark Thomas 
AuthorDate: Mon Jun 29 15:08:25 2020 +0100

Correct calculation of payload length when using 4 or more bytes
---
 java/org/apache/tomcat/websocket/WsFrameBase.java |  2 +-
 test/org/apache/tomcat/websocket/TestWsFrame.java | 32 ---
 webapps/docs/changelog.xml|  4 +++
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/WsFrameBase.java 
b/java/org/apache/tomcat/websocket/WsFrameBase.java
index e7b13fd..1d9404e 100644
--- a/java/org/apache/tomcat/websocket/WsFrameBase.java
+++ b/java/org/apache/tomcat/websocket/WsFrameBase.java
@@ -679,7 +679,7 @@ public abstract class WsFrameBase {
 int shift = 0;
 long result = 0;
 for (int i = start + len - 1; i >= start; i--) {
-result = result + ((b[i] & 0xFF) << shift);
+result = result + ((b[i] & 0xFFL) << shift);
 shift += 8;
 }
 return result;
diff --git a/test/org/apache/tomcat/websocket/TestWsFrame.java 
b/test/org/apache/tomcat/websocket/TestWsFrame.java
index 0b423ad..d6afce0 100644
--- a/test/org/apache/tomcat/websocket/TestWsFrame.java
+++ b/test/org/apache/tomcat/websocket/TestWsFrame.java
@@ -28,10 +28,17 @@ public class TestWsFrame {
 Assert.assertEquals(0L, WsFrameBase.byteArrayToLong(new byte[] { 0 }, 
0, 1));
 Assert.assertEquals(1L, WsFrameBase.byteArrayToLong(new byte[] { 1 }, 
0, 1));
 Assert.assertEquals(0xFF, WsFrameBase.byteArrayToLong(new byte[] { -1 
}, 0, 1));
-Assert.assertEquals(0x,
-WsFrameBase.byteArrayToLong(new byte[] { -1, -1 }, 0, 2));
-Assert.assertEquals(0xFF,
-WsFrameBase.byteArrayToLong(new byte[] { -1, -1, -1 }, 0, 3));
+Assert.assertEquals(0x, WsFrameBase.byteArrayToLong(new byte[] { 
-1, -1 }, 0, 2));
+Assert.assertEquals(0xFF, WsFrameBase.byteArrayToLong(new byte[] { 
-1, -1, -1 }, 0, 3));
+Assert.assertEquals(0xL, WsFrameBase.byteArrayToLong(new 
byte[] { -1, -1, -1, -1 }, 0, 4));
+Assert.assertEquals(0xFFL, WsFrameBase.byteArrayToLong(new 
byte[] { -1, -1, -1, -1, -1 }, 0, 5));
+Assert.assertEquals(0xL, WsFrameBase.byteArrayToLong(new 
byte[] { -1, -1, -1, -1, -1, -1 }, 0, 6));
+Assert.assertEquals(0xFFL,
+WsFrameBase.byteArrayToLong(new byte[] { -1, -1, -1, -1, -1, 
-1, -1 }, 0, 7));
+Assert.assertEquals(0x7FFFL,
+WsFrameBase.byteArrayToLong(new byte[] { 127, -1, -1, -1, -1, 
-1, -1, -1 }, 0, 8));
+Assert.assertEquals(-1,
+WsFrameBase.byteArrayToLong(new byte[] { -1, -1, -1, -1, -1, 
-1, -1, -1 }, 0, 8));
 }
 
 
@@ -40,10 +47,17 @@ public class TestWsFrame {
 Assert.assertEquals(0L, WsFrameBase.byteArrayToLong(new byte[] { 20, 0 
}, 1, 1));
 Assert.assertEquals(1L, WsFrameBase.byteArrayToLong(new byte[] { 20, 1 
}, 1, 1));
 Assert.assertEquals(0xFF, WsFrameBase.byteArrayToLong(new byte[] { 20, 
-1 }, 1, 1));
-Assert.assertEquals(0x,
-WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1 }, 1, 2));
-Assert.assertEquals(0xFF,
-WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1 }, 1, 
3));
+Assert.assertEquals(0x, WsFrameBase.byteArrayToLong(new byte[] { 
20, -1, -1 }, 1, 2));
+Assert.assertEquals(0xFF, WsFrameBase.byteArrayToLong(new byte[] { 
20, -1, -1, -1 }, 1, 3));
+Assert.assertEquals(0xL, WsFrameBase.byteArrayToLong(new 
byte[] { 20, -1, -1, -1, -1 }, 1, 4));
+Assert.assertEquals(0xFFL, WsFrameBase.byteArrayToLong(new 
byte[] { 20, -1, -1, -1, -1, -1 }, 1, 5));
+Assert.assertEquals(0xL,
+WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1, -1, 
-1, -1 }, 1, 6));
+Assert.assertEquals(0xFFL,
+WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1, -1, 
-1, -1, -1 }, 1, 7));
+Assert.assertEquals(0x7FFFL,
+WsFrameBase.byteArrayToLong(new byte[] { 20, 127, -1, -1, -1, 
-1, -1, -1, -1 }, 1, 8));
+Assert.assertEquals(-1,
+WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1, -1, 
-1, -1, -1, -1 }, 1, 8));
 }
-
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 93823de..c970cd8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -109,6 +109,10 @@
 64563: Add additional validation of payload length for
 WebSocket messages. (markt)
   
+  
+Correct the calculation of payload length when four or more bytes are
+req

[tomcat] branch 7.0.x updated (34d19fb -> 4c04982)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


from 34d19fb  Correct calculation of payload length when using 4 or more 
bytes
 new b517002  Correct calculation of payload length when using 4 or more 
bytes
 new 4c04982  Fix BZ 64563 - additional payload length validation

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/util/Conversions.java |  2 +-
 java/org/apache/catalina/websocket/LocalStrings.properties |  1 +
 java/org/apache/catalina/websocket/WsFrame.java|  6 ++
 test/org/apache/catalina/util/TestConversions.java | 12 
 4 files changed, 16 insertions(+), 5 deletions(-)


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

[tomcat] 02/02: Fix BZ 64563 - additional payload length validation

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 4c04982870d6e730c38e21e58fb653b7cf723784
Author: Mark Thomas 
AuthorDate: Tue Jun 30 14:20:58 2020 +0100

Fix BZ 64563 - additional payload length validation
---
 java/org/apache/catalina/websocket/LocalStrings.properties | 1 +
 java/org/apache/catalina/websocket/WsFrame.java| 6 ++
 2 files changed, 7 insertions(+)

diff --git a/java/org/apache/catalina/websocket/LocalStrings.properties 
b/java/org/apache/catalina/websocket/LocalStrings.properties
index 089dfee..edde581 100644
--- a/java/org/apache/catalina/websocket/LocalStrings.properties
+++ b/java/org/apache/catalina/websocket/LocalStrings.properties
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 frame.eos=The end of the stream was reached before the expected number of 
payload bytes could be read
+frame.invalidLength=An invalid payload length was specified
 frame.invalidUtf8=A sequence of bytes was received that did not represent 
valid UTF-8
 frame.notMasked=The client frame was not masked but all client frames must be 
masked
 frame.readEos=The end of the stream was reached when trying to read the first 
byte of a new WebSocket frame
diff --git a/java/org/apache/catalina/websocket/WsFrame.java 
b/java/org/apache/catalina/websocket/WsFrame.java
index 9f39777..d2189c2 100644
--- a/java/org/apache/catalina/websocket/WsFrame.java
+++ b/java/org/apache/catalina/websocket/WsFrame.java
@@ -84,6 +84,12 @@ public class WsFrame {
 blockingRead(processor, extended);
 payloadLength = Conversions.byteArrayToLong(extended);
 }
+// The most significant bit of those 8 bytes is required to be zero
+// (see RFC 6455, section 5.2). If the most significant bit is set,
+// the resulting payload length will be negative so test for that.
+if (payloadLength < 0) {
+throw new IOException(sm.getString("frame.invalidLength"));
+}
 
 if (isControl()) {
 if (payloadLength > 125) {


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

[tomcat] 01/02: Correct calculation of payload length when using 4 or more bytes

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit b51700209311c352e1c35d7845237da7a435b06b
Author: Mark Thomas 
AuthorDate: Tue Jun 30 14:18:55 2020 +0100

Correct calculation of payload length when using 4 or more bytes
---
 java/org/apache/catalina/util/Conversions.java |  2 +-
 test/org/apache/catalina/util/TestConversions.java | 12 
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/util/Conversions.java 
b/java/org/apache/catalina/util/Conversions.java
index 322fdbb..b98c2d0 100644
--- a/java/org/apache/catalina/util/Conversions.java
+++ b/java/org/apache/catalina/util/Conversions.java
@@ -33,7 +33,7 @@ public class Conversions {
 int shift = 0;
 long result = 0;
 for (int i = input.length - 1; i >= 0; i--) {
-result = result + ((input[i] & 0xFF) << shift);
+result = result + ((input[i] & 0xFFL) << shift);
 shift += 8;
 }
 
diff --git a/test/org/apache/catalina/util/TestConversions.java 
b/test/org/apache/catalina/util/TestConversions.java
index fae4f8b..a9a228b 100644
--- a/test/org/apache/catalina/util/TestConversions.java
+++ b/test/org/apache/catalina/util/TestConversions.java
@@ -28,10 +28,14 @@ public class TestConversions {
 Assert.assertEquals(0L, Conversions.byteArrayToLong(new byte[] { 0 }));
 Assert.assertEquals(1L, Conversions.byteArrayToLong(new byte[] { 1 }));
 Assert.assertEquals(0xFF, Conversions.byteArrayToLong(new byte[] { -1 
}));
-Assert.assertEquals(0x,
-Conversions.byteArrayToLong(new byte[] { -1, -1 }));
-Assert.assertEquals(0xFF,
-Conversions.byteArrayToLong(new byte[] { -1, -1, -1 }));
+Assert.assertEquals(0x, Conversions.byteArrayToLong(new byte[] { 
-1, -1 }));
+Assert.assertEquals(0xFF, Conversions.byteArrayToLong(new byte[] { 
-1, -1, -1 }));
+Assert.assertEquals(0xL, Conversions.byteArrayToLong(new 
byte[] { -1, -1, -1, -1 }));
+Assert.assertEquals(0xFFL, Conversions.byteArrayToLong(new 
byte[] { -1, -1, -1, -1, -1 }));
+Assert.assertEquals(0xL, Conversions.byteArrayToLong(new 
byte[] { -1, -1, -1, -1, -1, -1 }));
+Assert.assertEquals(0xFFL, Conversions.byteArrayToLong(new 
byte[] { -1, -1, -1, -1, -1, -1, -1 }));
+Assert.assertEquals(0x7FFFL, 
Conversions.byteArrayToLong(new byte[] {127, -1, -1, -1, -1, -1, -1, -1 }));
+Assert.assertEquals(-1, Conversions.byteArrayToLong(new byte[] { -1, 
-1, -1, -1, -1, -1, -1, -1 }));
 }
 
 }


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

buildbot success in on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/5283

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] 1cddae8da4ecb4ac04575d3b5fba2daa2e0c8ead
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

Release tagging

[Mark Thomas]

Hi all,

It isn't quite the start of July but my release prep didn't take quite
as long as I thought it might and the code base looks to be in a good
state to tag. Therefore, I plan to start the July releases with a 10.0.x
tag shortly.

Mark

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

[tomcat] tag 10.0.0-M7 created (now 09f5fc9)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to tag 10.0.0-M7
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at 09f5fc9  (commit)
This tag includes the following new commits:

 new 09f5fc9  Tag 10.0.0-M7

The 1 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.



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

[tomcat] 01/01: Tag 10.0.0-M7

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to tag 10.0.0-M7
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 09f5fc989126bb9d942df704f9186dca5fa620d5
Author: Mark Thomas 
AuthorDate: Tue Jun 30 17:55:43 2020 +0100

Tag 10.0.0-M7
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 3c3a3b1..e67a701 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=10
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=-M7-dev
+version.suffix=-M7
 
 # - Source control flags -
 git.branch=master
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1fbf038..5084a6c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   


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

Re: [tomcat] 01/01: Tag 10.0.0-M7

[Mark Thomas]

On 30/06/2020 17:56, ma...@apache.org wrote:

> +

Doh. Re-tag to follow shortly.

Mark

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

[tomcat] 01/01: Tag 10.0.0-M7

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to tag 10.0.0-M7
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit c549413165721180b15f62033c1be6c5970028fd
Author: Mark Thomas 
AuthorDate: Tue Jun 30 18:07:33 2020 +0100

Tag 10.0.0-M7
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 3c3a3b1..e67a701 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=10
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=-M7-dev
+version.suffix=-M7
 
 # - Source control flags -
 git.branch=master
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1fbf038..cd90e63 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   


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

[tomcat] tag 10.0.0-M7 created (now c549413)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to tag 10.0.0-M7
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at c549413  (commit)
This tag includes the following new commits:

 new c549413  Tag 10.0.0-M7

The 1 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.



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

Re: Release tagging

[Raymond Auge]

Hey Mark,

I'm sorry I got sidetracked with other things but would it be possible to
wait for the final JPMS/OSGi PRs if I promise to have them by the end of
this week?

I would love for that to be part of the 10.0.x tag but I understand if
that's not possible.

- Ray

On Tue, Jun 30, 2020 at 12:50 PM Mark Thomas  wrote:

> Hi all,
>
> It isn't quite the start of July but my release prep didn't take quite
> as long as I thought it might and the code base looks to be in a good
> state to tag. Therefore, I plan to start the July releases with a 10.0.x
> tag shortly.
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

-- 
*Raymond Augé* 
 (@rotty3000)
Senior Software Architect *Liferay, Inc.* 
 (@Liferay)

svn commit: r40255 - in /dev/tomcat/tomcat-10/v10.0.0-M7: ./ bin/ bin/embed/ src/

[markt]

Author: markt
Date: Tue Jun 30 17:48:51 2020
New Revision: 40255

Log:
Upload 10.0.0-M7 for voting

Added:
dev/tomcat/tomcat-10/v10.0.0-M7/
dev/tomcat/tomcat-10/v10.0.0-M7/KEYS
dev/tomcat/tomcat-10/v10.0.0-M7/README.html
dev/tomcat/tomcat-10/v10.0.0-M7/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.0.0-M7/bin/
dev/tomcat/tomcat-10/v10.0.0-M7/bin/README.html
dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7-deployer.tar.gz 
  (with props)

dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7-deployer.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7-deployer.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7-deployer.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7-deployer.zip.asc

dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7-deployer.zip.sha512
dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7-fulldocs.tar.gz 
  (with props)

dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7-fulldocs.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7-windows-x64.zip 
  (with props)

dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7-windows-x64.zip.asc

dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7-windows-x64.zip.sha512
dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7-windows-x86.zip 
  (with props)

dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7-windows-x86.zip.asc

dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7-windows-x86.zip.sha512
dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7.exe   (with 
props)
dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7.exe.asc
dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7.exe.sha512
dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7.tar.gz   (with 
props)
dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7.tar.gz.asc
dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7.zip   (with 
props)
dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7.zip.asc
dev/tomcat/tomcat-10/v10.0.0-M7/bin/apache-tomcat-10.0.0-M7.zip.sha512
dev/tomcat/tomcat-10/v10.0.0-M7/bin/embed/

dev/tomcat/tomcat-10/v10.0.0-M7/bin/embed/apache-tomcat-10.0.0-M7-embed.tar.gz  
 (with props)

dev/tomcat/tomcat-10/v10.0.0-M7/bin/embed/apache-tomcat-10.0.0-M7-embed.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.0-M7/bin/embed/apache-tomcat-10.0.0-M7-embed.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0-M7/bin/embed/apache-tomcat-10.0.0-M7-embed.zip 
  (with props)

dev/tomcat/tomcat-10/v10.0.0-M7/bin/embed/apache-tomcat-10.0.0-M7-embed.zip.asc

dev/tomcat/tomcat-10/v10.0.0-M7/bin/embed/apache-tomcat-10.0.0-M7-embed.zip.sha512
dev/tomcat/tomcat-10/v10.0.0-M7/src/
dev/tomcat/tomcat-10/v10.0.0-M7/src/apache-tomcat-10.0.0-M7-src.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.0-M7/src/apache-tomcat-10.0.0-M7-src.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.0-M7/src/apache-tomcat-10.0.0-M7-src.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.0-M7/src/apache-tomcat-10.0.0-M7-src.zip   (with 
props)
dev/tomcat/tomcat-10/v10.0.0-M7/src/apache-tomcat-10.0.0-M7-src.zip.asc
dev/tomcat/tomcat-10/v10.0.0-M7/src/apache-tomcat-10.0.0-M7-src.zip.sha512

Added: dev/tomcat/tomcat-10/v10.0.0-M7/KEYS
==
--- dev/tomcat/tomcat-10/v10.0.0-M7/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.0.0-M7/KEYS Tue Jun 30 17:48:51 2020
@@ -0,0 +1,676 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
+gNftTbKx/MVS7cQU0II8BKo2Akr+1FZah+sD4ovK8SfkMXUQUbTeefTntsAQKyyU
+9M9tA/9on9tBiHFl0qVJht6N4GiJ2G689v7rS2giLgKjetjiCduxBXEgvUSuyQID
+nF9ATrpXjITwsRlGKFmpZiFm5oCeCXihIVH0u6q066xNW2AXkLVoJ

Re: Release tagging

[Mark Thomas]

On 30/06/2020 18:09, Raymond Auge wrote:
> Hey Mark,
> 
> I'm sorry I got sidetracked with other things but would it be possible
> to wait for the final JPMS/OSGi PRs if I promise to have them by the end
> of this week?
> 
> I would love for that to be part of the 10.0.x tag but I understand if
> that's not possible.

Sorry, I've already tagged the code. The end of the week would have been
too long anyway. Those fixes will have to wait for M8 I am afraid.

Mark


> 
> - Ray
> 
> On Tue, Jun 30, 2020 at 12:50 PM Mark Thomas  > wrote:
> 
> Hi all,
> 
> It isn't quite the start of July but my release prep didn't take quite
> as long as I thought it might and the code base looks to be in a good
> state to tag. Therefore, I plan to start the July releases with a 10.0.x
> tag shortly.
> 
> Mark
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> 
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 
> 
> 
> 
> -- 
> *Raymond Augé*
>  (@rotty3000)
> Senior Software Architect *Liferay, Inc.*
>  (@Liferay)


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

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Ant/Apache Ant(TM) version 1.9.14 compiled on March 12 2019 (Java 1.8.0_252; Windows 10 10.0) Aether""userId" = "markt""ip" = "86.144.69.4"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-catalina-ha/10.0.0-M7/tomcat-catalina-ha-10.0.0-M7.pom(SHA1: 60586794e97517e7664b76149df35278855d950b)/org/apache/tomcat/tomcat-catalina-ha/10.0.0-M7/tomcat-catalina-ha-10.0.0-M7.jar(SHA1: e7a13021b8c31578af6266b5750e44a06e598438)/org/apache/tomcat/tomcat-catalina-ha/10.0.0-M7/tomcat-catalina-ha-10.0.0-M7.jar.asc(SHA1: d76d0fd18490322b42c6acb29b75052e89f8a007)/org/apache/tomcat/tomcat-catalina-ha/10.0.0-M7/tomcat-catalina-ha-10.0.0-M7-sources.jar.asc(SHA1: 6682892a65f7989d6dae8089870869aece63c67e)/org/apache/tomcat/tomcat-catalina-ha/10.0.0-M7/tomcat-catalina-ha-10.0.0-M7-sources.jar(SHA1: 80c5a9f7fa815d35b33e03dd59aa0b9cf2eb6fc9)/org/apache/tomcat/tomcat-catalina-ha/10.0.0-M7/tomcat-catalina-ha-10.0.0-M7.pom.asc(SHA1: 712caefaf13fd75b048402e8c0f3c350cb64a69f)/org/apache/tomcat/tomcat-api/10.0.0-M7/tomcat-api-10.0.0-M7.pom(SHA1: 283e4efd64a9de21150e0c113093c2b1b9a52b09)/org/apache/tomcat/tomcat-api/10.0.0-M7/tomcat-api-10.0.0-M7-sources.jar.asc(SHA1: 16735110758223f883772fb5647dcc61937bf325)/org/apache/tomcat/tomcat-api/10.0.0-M7/tomcat-api-10.0.0-M7-sources.jar(SHA1: 4f36f2148f5c00077f530997d612f24d2990e09d)/org/apache/tomcat/tomcat-api/10.0.0-M7/tomcat-api-10.0.0-M7.pom.asc(SHA1: 946085f174cb80e0dad75f0493c82462ee22b430)/org/apache/tomcat/tomcat-api/10.0.0-M7/tomcat-api-10.0.0-M7.jar.asc(SHA1: e3aa8171036895679931a01d5427f84473a3a2b2)/org/apache/tomcat/tomcat-api/10.0.0-M7/tomcat-api-10.0.0-M7.jar(SHA1: d136fb9b30ae61578e326c4b38ee70951e7ea626)/org/apache/tomcat/embed/tomcat-embed-jasper/10.0.0-M7/tomcat-embed-jasper-10.0.0-M7-sources.jar(SHA1: 5506ed1f5e1562eb095e8f1907854bb4c967780c)/org/apache/tomcat/embed/tomcat-embed-jasper/10.0.0-M7/tomcat-embed-jasper-10.0.0-M7-sources.jar.asc(SHA1: b97d499173016bd7b6c5336d72b07c7ac556c3ba)/org/apache/tomcat/embed/tomcat-embed-jasper/10.0.0-M7/tomcat-embed-jasper-10.0.0-M7.pom(SHA1: be6fc0d6cca584ce3f4614280b0ee7eabcb0d1d0)/org/apache/tomcat/embed/tomcat-embed-jasper/10.0.0-M7/tomcat-embed-jasper-10.0.0-M7.pom.asc(SHA1: 9012ba29acb220f2a77dbc86787f49b045702891)/org/apache/tomcat/embed/tomcat-embed-jasper/10.0.0-M7/tomcat-embed-jasper-10.0.0-M7.jar(SHA1: b4d265a0a01c8d8b7993feaed39b9bff994812ea)/org/apache/tomcat/embed/tomcat-embed-jasper/10.0.0-M7/tomcat-embed-jasper-10.0.0-M7.jar.asc(SHA1: 4dc39670a599f70b9fa945f59b1a83bdc8ef6744)/org/apache/tomcat/embed/tomcat-embed-core/10.0.0-M7/tomcat-embed-core-10.0.0-M7.pom.asc(SHA1: 36f75cc5e58f8bfa37b1ed7b86688adead1132b7)/org/apache/tomcat/embed/tomcat-embed-core/10.0.0-M7/tomcat-embed-core-10.0.0-M7-sources.jar.asc(SHA1: 5f20888019b18fd080b3a565bd852c9b769ddd86)/org/apache/tomcat/embed/tomcat-embed-core/10.0.0-M7/tomcat-embed-core-10.0.0-M7.pom(SHA1: cce4fc490e50f8cdfdaf21200c5a3caa545493c7)/org/apache/tomcat/embed/tomcat-embed-core/10.0.0-M7/tomcat-embed-core-10.0.0-M7-sources.jar(SHA1: aebf3ad6da7185e5f562442b1ec65c50ce00af51)/org/apache/tomcat/embed/tomcat-embed-core/10.0.0-M7/tomcat-embed-core-10.0.0-M7.jar(SHA1: 04e1609cb5c485694737b02c37536958059c42dc)/org/apache/tomcat/embed/tomcat-embed-core/10.0.0-M7/tomcat-embed-core-10.0.0-M7.jar.asc(SHA1: 2d723b2555a4ead1f8dbcfd5bc2a14a11ac27362)/org/apache/tomcat/embed/tomcat-embed-websocket/10.0.0-M7/tomcat-embed-websocket-10.0.0-M7-sources.jar(SHA1: 4ef12597f51aae704011c238fc3fcfca23402306)/org/apache/tomcat/embed/tomcat-embed-websocket/10.0.0-M7/tomcat-embed-websocket-10.0.0-M7.jar(SHA1: 1a3220e012d3be741d9ee313c055ba4be7c5fbcf)/org/apache/tomcat/embed/tomcat-embed-websocket/10.0.0-M7/tomcat-embed-websocket-10.0.0-M7-sources.jar.asc(SHA1: ba7572bdcd71bd1267108f2e101eecbc2eb76b87)/org/apache/tomcat/embed/tomcat-embed-websocket/10.0.0-M7/tomcat-embed-websocket-10.0.0-M7.pom.asc(SHA1: 518526896b75d0dd1d1a2ecb7adb1f87f1a609af)/org/apache/tomcat/embed/tomcat-embed-websocket/10.0.0-M7/tomcat-embed-websocket-10.0.0-M7.jar.asc(SHA1: 0e1e6df1a84e1bb3904c2c770212cf4b97c52ba2)/org/apache/tomcat/embed/tomcat-embed-websocket/10.0.0-M7/tomcat-embed-websocket-10.0.0-M7.pom(SHA1: 892a992c4d93de161f97916c95042c9c3c53)/org/apache/tomcat/embed/tomcat-embed-el/10.0.0-M7/tomcat-embed-el-10.0.0-M7.jar(SHA1: a9ba8e5c6b43db5f4559a85d508ed0fac2695822)/org/apache/tomcat/embed/tomcat-embed-el/10.0.0-M7/tomcat-embed-el-10.0.0-M7.pom.asc(SHA1: 47a93b730fdc0156408248f736994ba2c9cff5d2)/org/apache/tomcat/embed/tomcat-embed-el/10.0.0-M7/tomcat-embed-el-10.0.0-M7-sources.jar.asc(SHA1: 90766d7d8cb9869c95d2192740666b29a3255273)/org/apache/tomcat/embed/tomcat-embed-el/10.0.0-M7/tomcat-embed-el-10.0.0-M7-sources.jar(SHA1: 8f8d2b5be9e31f68d2a9332cfd794dbba429f622)/org/apache/tomcat/embed/tomcat-embed-el/10.0.0-M7/tomcat-embed-el-10.0.0-M7.jar.asc(SHA1: de92c22bdded6fb8ade6e1cb2f91bf8b5579a6a1)/org/apache/tomcat/

[VOTE] Release Apache Tomcat 10.0.0-M7

[Mark Thomas]

The proposed Apache Tomcat 10.0.0-M7 release is now available for
voting.

Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary
package for all the specification APIs has changed from javax.* to jakarta.*
Applications that run on Tomcat 9 will not run on Tomcat 10 without changes.

The notable changes compared to 10.0.0-M6 are:

- Implement a significant portion of the TLS environment variables
  for the rewrite valve.

- Add the Jakarta EE 9 schema.

- Improvements to the creatio of OSGi manifests.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://ci.apache.org/projects/tomcat/tomcat10/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.0-M7/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1272/
The tag is:
https://github.com/apache/tomcat/tree/10.0.0-M7
c549413165721180b15f62033c1be6c5970028fd

The proposed 10.0.0-M7 release is:
[ ] Broken - do not release
[ ] Alpha  - go ahead and release as 10.0.0-M7

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

[GitHub] [tomcat] Holomark opened a new pull request #310: Remove extraneous spaces around the colons, which are breaking the co…

[GitBox]

Holomark opened a new pull request #310:
URL: https://github.com/apache/tomcat/pull/310


   This specific string is used to produce the context list in the text-based 
manager (`/manager/text/list`) and the spaces are breaking the tools that rely 
on it.
   
   [Usage in the 
ManagerServlet](https://github.com/Holomark/tomcat/blob/21d2000c99134b7ec54424ea210cf9b2fd6aae38/java/org/apache/catalina/manager/ManagerServlet.java#L1079)
   
   For instance, the cargo maven plugin 
(https://codehaus-cargo.github.io/cargo/Maven2+plugin.html), when trying to 
undeploy a project attempts first to find it in the list. If Tomcat's host 
system is configured in French, cargo will receive an incorrect input and infer 
that it is not currently deployed in Tomcat, even if it is.
   That specific bug is how I became aware of the problem.
   
   The commit that introduced those specific spaces invoked the french grammar; 
that is correct but this line is not a piece of natural language and those 
rules do not apply.



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] tag 9.0.37 created (now bd68c42)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


  at bd68c42  (commit)
This tag includes the following new commits:

 new bd68c42  Tag 9.0.37

The 1 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.



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

[tomcat] 01/01: Tag 9.0.37

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit bd68c421ea32fea08263db73cd5b987ab606a0bb
Author: Mark Thomas 
AuthorDate: Tue Jun 30 21:07:10 2020 +0100

Tag 9.0.37
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 6cf6697..c6e290b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=37
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Source control flags -
 git.branch=master
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4ad694f..82cd7df 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   


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

svn commit: r40260 - in /dev/tomcat/tomcat-9/v9.0.37: ./ bin/ bin/embed/ src/

[markt]

Author: markt
Date: Tue Jun 30 20:34:14 2020
New Revision: 40260

Log:
Upload 9.0.37 for voting

Added:
dev/tomcat/tomcat-9/v9.0.37/
dev/tomcat/tomcat-9/v9.0.37/KEYS
dev/tomcat/tomcat-9/v9.0.37/README.html
dev/tomcat/tomcat-9/v9.0.37/RELEASE-NOTES
dev/tomcat/tomcat-9/v9.0.37/bin/
dev/tomcat/tomcat-9/v9.0.37/bin/README.html
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37-deployer.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37-deployer.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37-deployer.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37-deployer.zip.asc
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37-deployer.zip.sha512
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37-fulldocs.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37-windows-x64.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37-windows-x64.zip.asc
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37-windows-x64.zip.sha512
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37-windows-x86.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37-windows-x86.zip.asc
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37-windows-x86.zip.sha512
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37.exe   (with props)
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37.exe.asc
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37.exe.sha512
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37.tar.gz   (with props)
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37.zip   (with props)
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37.zip.asc
dev/tomcat/tomcat-9/v9.0.37/bin/apache-tomcat-9.0.37.zip.sha512
dev/tomcat/tomcat-9/v9.0.37/bin/embed/
dev/tomcat/tomcat-9/v9.0.37/bin/embed/apache-tomcat-9.0.37-embed.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.37/bin/embed/apache-tomcat-9.0.37-embed.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.37/bin/embed/apache-tomcat-9.0.37-embed.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.37/bin/embed/apache-tomcat-9.0.37-embed.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.37/bin/embed/apache-tomcat-9.0.37-embed.zip.asc
dev/tomcat/tomcat-9/v9.0.37/bin/embed/apache-tomcat-9.0.37-embed.zip.sha512
dev/tomcat/tomcat-9/v9.0.37/src/
dev/tomcat/tomcat-9/v9.0.37/src/apache-tomcat-9.0.37-src.tar.gz   (with 
props)
dev/tomcat/tomcat-9/v9.0.37/src/apache-tomcat-9.0.37-src.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.37/src/apache-tomcat-9.0.37-src.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.37/src/apache-tomcat-9.0.37-src.zip   (with props)
dev/tomcat/tomcat-9/v9.0.37/src/apache-tomcat-9.0.37-src.zip.asc
dev/tomcat/tomcat-9/v9.0.37/src/apache-tomcat-9.0.37-src.zip.sha512

Added: dev/tomcat/tomcat-9/v9.0.37/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.37/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.37/KEYS Tue Jun 30 20:34:14 2020
@@ -0,0 +1,676 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
+gNftTbKx/MVS7cQU0II8BKo2Akr+1FZah+sD4ovK8SfkMXUQUbTeefTntsAQKyyU
+9M9tA/9on9tBiHFl0qVJht6N4GiJ2G689v7rS2giLgKjetjiCduxBXEgvUSuyQID
+nF9ATrpXjITwsRlGKFmpZiFm5oCeCXihIVH0u6q066xNW2AXkLVoJ1l1Rs2Z0lsb
+0cq3xEAcwAmYLKQvCtgDV8CYgWKVmPi+49rSuQn7Lo9l02OUbLQgQW5keSBBcm1z
+dHJvbmcgPGFuZHlAdGFnaXNoLmNvbT6JAFgEEBECABgFAjtAWuUICwMJCAcCAQoC
+GQEFGwMACgkQajrT9PIsT+1plgCfXAovWnVL3MjrTfcGlFSKw7GHCSYAoJkz
+x+r2ANe8/0e+u5ZcYtSaSry+uQINBDtAWuUQCAD2Qle3CH8IF3KiutapQvMF6PlT
+ETlPtvFuuUs4INoBp1ajFOmPQFXz0AfGy0OplK33

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Ant/Apache Ant(TM) version 1.9.14 compiled on March 12 2019 (Java 1.8.0_252; Windows 10 10.0) Aether""userId" = "markt""ip" = "86.144.69.4"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-catalina-ha/9.0.37/tomcat-catalina-ha-9.0.37.jar(SHA1: ec7cc685dabdcdfa5cf0b44b9b23c60ba9414f25)/org/apache/tomcat/tomcat-catalina-ha/9.0.37/tomcat-catalina-ha-9.0.37.pom.asc(SHA1: 35a30130d5c7e3bcb0ed7f31dde0d9e911cb76cc)/org/apache/tomcat/tomcat-catalina-ha/9.0.37/tomcat-catalina-ha-9.0.37.jar.asc(SHA1: 4d3385628c7ac1fb1a18ddfaac74e5feb6e2e2cf)/org/apache/tomcat/tomcat-catalina-ha/9.0.37/tomcat-catalina-ha-9.0.37-sources.jar.asc(SHA1: 40df1fe800cfec587d1f8c26fd329c2de3aca204)/org/apache/tomcat/tomcat-catalina-ha/9.0.37/tomcat-catalina-ha-9.0.37.pom(SHA1: 1a09a6feb1d50c8558cf809ece3c7fe1353dec04)/org/apache/tomcat/tomcat-catalina-ha/9.0.37/tomcat-catalina-ha-9.0.37-sources.jar(SHA1: 5c8a7901d0f3d34fa62b9aa3f85e3137fed8a037)/org/apache/tomcat/tomcat-api/9.0.37/tomcat-api-9.0.37-sources.jar.asc(SHA1: b23ff5c6458b1c655cf17d9875c2fd62c7b0cdf2)/org/apache/tomcat/tomcat-api/9.0.37/tomcat-api-9.0.37.jar.asc(SHA1: 195286b86d4c92b5f6a853c9fb9a7ba4b3e75814)/org/apache/tomcat/tomcat-api/9.0.37/tomcat-api-9.0.37.pom.asc(SHA1: ca74a5c1704422fffb3abe41a1ea903ddc72260c)/org/apache/tomcat/tomcat-api/9.0.37/tomcat-api-9.0.37.pom(SHA1: 5d342780804f6ef965a350b14247a7fab8d781ba)/org/apache/tomcat/tomcat-api/9.0.37/tomcat-api-9.0.37-sources.jar(SHA1: 81922250682807fed31bfd6d3ce4152fe6440694)/org/apache/tomcat/tomcat-api/9.0.37/tomcat-api-9.0.37.jar(SHA1: 6f0839e1a9e2d3d562d40067844b1d18cb47ebef)/org/apache/tomcat/embed/tomcat-embed-jasper/9.0.37/tomcat-embed-jasper-9.0.37.pom.asc(SHA1: c9c10dcec06bf75ca175992481126e1c5d73b044)/org/apache/tomcat/embed/tomcat-embed-jasper/9.0.37/tomcat-embed-jasper-9.0.37-sources.jar.asc(SHA1: 74e280a379a3ff82a67d574c3b553a00325849f1)/org/apache/tomcat/embed/tomcat-embed-jasper/9.0.37/tomcat-embed-jasper-9.0.37.jar.asc(SHA1: d929e0002dced0600e4bddfbd220729541a683ab)/org/apache/tomcat/embed/tomcat-embed-jasper/9.0.37/tomcat-embed-jasper-9.0.37.pom(SHA1: 8a166bff0de27a87035beaabcd5aa273ebc6ec1a)/org/apache/tomcat/embed/tomcat-embed-jasper/9.0.37/tomcat-embed-jasper-9.0.37-sources.jar(SHA1: a42eee320d0c0e0bc0f029b9be46d33af61d4241)/org/apache/tomcat/embed/tomcat-embed-jasper/9.0.37/tomcat-embed-jasper-9.0.37.jar(SHA1: a7286c7a7c23a265a95af41c1a2de8b15bbc64e8)/org/apache/tomcat/embed/tomcat-embed-core/9.0.37/tomcat-embed-core-9.0.37-sources.jar.asc(SHA1: ccb4a2d6ac38d97cccb4e1d6d784e8e7beb43081)/org/apache/tomcat/embed/tomcat-embed-core/9.0.37/tomcat-embed-core-9.0.37.jar(SHA1: c3f788de87f17eb57a9e7083736c1820fcbc1046)/org/apache/tomcat/embed/tomcat-embed-core/9.0.37/tomcat-embed-core-9.0.37.pom.asc(SHA1: 70ee7e70a61790e3ea8591ba2db830d4b86f5a51)/org/apache/tomcat/embed/tomcat-embed-core/9.0.37/tomcat-embed-core-9.0.37-sources.jar(SHA1: 0f9c4596dc0ff89c30710957100619188852203b)/org/apache/tomcat/embed/tomcat-embed-core/9.0.37/tomcat-embed-core-9.0.37.pom(SHA1: d12794b46c936e2e9b1c85787bc799a02ff7509d)/org/apache/tomcat/embed/tomcat-embed-core/9.0.37/tomcat-embed-core-9.0.37.jar.asc(SHA1: e4624429fbff61eaa4c8e8762b567f8ae8038e29)/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.37/tomcat-embed-websocket-9.0.37.jar(SHA1: ee8b7c9081372bf40c41443c93317145a01e343a)/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.37/tomcat-embed-websocket-9.0.37.pom.asc(SHA1: c77dfc2b42717161dfc8d06060f406b5c1d90e83)/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.37/tomcat-embed-websocket-9.0.37-sources.jar.asc(SHA1: 831606641ce3dc8471f7024ca58858f35718748a)/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.37/tomcat-embed-websocket-9.0.37.jar.asc(SHA1: aae46ff388411c9b48947176007170502137bcc5)/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.37/tomcat-embed-websocket-9.0.37.pom(SHA1: 7b2185c59cc0d8ece2b9713437eb774f6f033c5d)/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.37/tomcat-embed-websocket-9.0.37-sources.jar(SHA1: 9440751b66191232c7e397022e184dfe2c2a5215)/org/apache/tomcat/embed/tomcat-embed-el/9.0.37/tomcat-embed-el-9.0.37.pom(SHA1: 086ee9c72bf134798c583b4d496d690d81c9b21c)/org/apache/tomcat/embed/tomcat-embed-el/9.0.37/tomcat-embed-el-9.0.37.jar(SHA1: 5397dfef152fe2a84dbbf493303d3d02e7a08020)/org/apache/tomcat/embed/tomcat-embed-el/9.0.37/tomcat-embed-el-9.0.37.pom.asc(SHA1: 33f9ed88781199e199e96a966d6074ba2d06f154)/org/apache/tomcat/embed/tomcat-embed-el/9.0.37/tomcat-embed-el-9.0.37-sources.jar.asc(SHA1: 34efc4c53119cc460bcce5c2b7876092228ae591)/org/apache/tomcat/embed/tomcat-embed-el/9.0.37/tomcat-embed-el-9.0.37.jar.asc(SHA1: 510fba5c2cb24e62cdae824f9eaa5560d5f93327)/org/apache/tomcat/embed/tomcat-embed-el/9.0.37/tomcat-embed-el-9.0.37-sources.jar(SHA1: b573fef14839d9499bfc3202d90e37789df9be51)/org/apache/tomcat/tomcat-juli/9.0.37/tomcat-juli-9.0.37-sources.jar(SHA1: 87639cead3a441021ef5276d984d93df

[VOTE] Release Apache Tomcat 9.0.37

[Mark Thomas]

The proposed Apache Tomcat 9.0.37 release is now available for voting.

The notable changes compared to the 9.0.36 release are:

- Implement a significant portion of the TLS environment variables
  for the rewrite valve.

- Improvements to the creation of OSGi manifests.

- Reduce memory footprint of closed HTTP/2 streams

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.37/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1273/
The tag is:
https://github.com/apache/tomcat/tree/9.0.37
bd68c421ea32fea08263db73cd5b987ab606a0bb

The proposed 9.0.37 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 9.0.37

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

[tomcat] branch master updated: Increment version number for next dev cycle

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 0aac8cb  Increment version number for next dev cycle
0aac8cb is described below

commit 0aac8cbd50d8614aef0b0944af112f91ffeb6e1d
Author: Mark Thomas 
AuthorDate: Tue Jun 30 21:45:11 2020 +0100

Increment version number for next dev cycle
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 3c3a3b1..565eb53 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=10
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=-M7-dev
+version.suffix=-M8-dev
 
 # - Source control flags -
 git.branch=master
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 77b33e2..4c6bdb6 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=10.0.0-M7
+maven.asf.release.deploy.version=10.0.0-M8
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1fbf038..1eb7dca 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


-
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: Increment version number for next dev cycle

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 72d8331  Increment version number for next dev cycle
72d8331 is described below

commit 72d833199769bc01f7ab8f2e1862a90174e0a1bb
Author: Mark Thomas 
AuthorDate: Tue Jun 30 21:46:44 2020 +0100

Increment version number for next dev cycle
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 6cf6697..256c16c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=37
+version.build=38
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 91d74f5..b859909 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=9.0.37
+maven.asf.release.deploy.version=9.0.38
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4ad694f..2d9b527 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


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

Re: Issue building tomcat 8.5.56

[Cesar Hernandez]

Thank you Mark for the detailed response.

I'm going to take a look at the right CI server now to take as a reference.

There are no such tests in the Tomcat source tree nor can I find any

record of such tests. What eaxcatly is running here?

What I did was to download directly the zip source code  from latest
release
https://github.com/apache/tomcat/commit/4560d2f5a49965f73ed07cb879f17d9c096c9d13



> Tribes related tests are sensitive to the availability of multicast
> networking. From memory, OSX had an issue with that by default.
> Use org.apache.catalina.tribes.TesterMulticast to help diagnose.


Thanks for the pointer, I'll take a look to this too.


El mar., 30 jun. 2020 a las 2:47, Mark Thomas () escribió:

> On 30/06/2020 04:47, Cesar Hernandez wrote:
> > Hi!,
> >
> >
> > I'm able to checkout 8.5.56 tag and have a successful: ant
> > But I'm getting the following errors [1] after running:  ant test
>
> We would need to see the individual test files to understand each of
> those failures.
>
> > I notice that in the build.properties.default there are some  Build
> > control flags [2] related for NIO and NIO2, but by checking the Travis
> > file I don't see those flags are been set to false during CI runs [3]
>
> Travis is not the primary CI. Travis is being used to test architectures
> we don't have as easy access to. The primary CI is at ci.apache.org
>
> > It seems that during Travis build the project
> > https://github.com/apache/tomcat-native is also compiled [4] but I
> > wonder if I actually need to compile this tomcat-native or if there is
> > something else I'm missing that is preventing me to have a successful
> > build with all tests passing ok?
>
> Tomcat Native is required to test the APR/Native Connector. The tests
> run for each connector but if Tomcat Native is not present the tests
> don't run for the APR/Native Connectot. It won't trigger failures.
>
> > My environment:
> > - OSX 10.15.5
> > - java version "1.7.0_79"
> >  Java(TM) SE Runtime Environment (build 1.7.0_79-b15)
> >  Java HotSpot(TM) 64-Bit Server VM (build 24.79-b02, mixed mode)
> > - javac 1.7.0_79
> > - Apache Ant(TM) version 1.9.9 compiled on February 2 2017
> > - Git TAG checkout
> > 8.5.56:
> https://github.com/apache/tomcat/tree/4560d2f5a49965f73ed07cb879f17d9c096c9d13
> >
> >
> >
> > [1]
> >  [concat] Testsuites with failed tests:
> >[concat] TEST-org.apache.catalina.loader.TestPermissions.NIO.txt
> >[concat] TEST-org.apache.catalina.loader.TestPermissions.NIO2.txt
>
> There are no such tests in the Tomcat source tree nor can I find any
> record of such tests. What eaxcatly is running here?
>
> >[concat]
> > TEST-org.apache.catalina.session.TestStandardSessionIntegration.NIO.txt
> >[concat]
> > TEST-org.apache.catalina.session.TestStandardSessionIntegration.NIO2.txt
> >[concat]
> >
> TEST-org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.NIO.txt
> >[concat]
> >
> TEST-org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.NIO2.txt
> >[concat]
> > TEST-org.apache.catalina.tribes.group.TestGroupChannelStartStop.NIO.txt
> >[concat]
> > TEST-org.apache.catalina.tribes.group.TestGroupChannelStartStop.NIO2.txt
> >[concat]
> >
> TEST-org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.NIO.txt
> >[concat]
> >
> TEST-org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.NIO2.txt
> >[concat]
> >
> TEST-org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.NIO.txt
> >[concat]
> >
> TEST-org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.NIO2.txt
>
> Tribes related tests are sensitive to the availability of multicast
> networking. From memory, OSX had an issue with that by default.
>
> Use org.apache.catalina.tribes.TesterMulticast to help diagnose.
>
>
> >[concat] TEST-org.apache.coyote.http11.TestHttp11Processor.NIO.txt
> >[concat] TEST-org.apache.coyote.http11.TestHttp11Processor.NIO2.txt
>
> Failures in those tests are unusual.
>
> >[concat] TEST-org.apache.coyote.http2.TestHttp2Section_5_3.NIO.txt
>
> This one might be a timing issue in the test.
>
> >[concat]
> > TEST-org.apache.tomcat.util.digester.TestDigesterPermissions.NIO.txt
> >[concat]
> > TEST-org.apache.tomcat.util.digester.TestDigesterPermissions.NIO2.txt
>
> There are no such tests in the Tomcat source tree nor can I find any
> record of such tests.
>
> >[concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO.txt
> >[concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO2.txt
> >[concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO.txt
> >[concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO2.txt
> >[concat] TEST-org.apache.tomcat.util.net.TestSsl.NIO.txt
> >[concat] TEST-org.apache.tomcat.util.net.TestSsl.NIO2.txt
> >[concat]
> > TEST-org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO.txt
> >[concat]
> > TEST-org.apache.tomcat.util.net.openssl.ciphers.T

[tomcat] 01/01: Tag 8.5.57

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 9c649984ef92c2534a734c6584220a9a0c0c3462
Author: Mark Thomas 
AuthorDate: Tue Jun 30 22:46:18 2020 +0100

Tag 8.5.57
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 1f462f5..c260454 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=8
 version.minor=5
 version.build=57
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Source control flags -
 git.branch=8.5.x
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 64545f3..1f45f01 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   


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

[tomcat] tag 8.5.57 created (now 9c64998)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


  at 9c64998  (commit)
This tag includes the following new commits:

 new 9c64998  Tag 8.5.57

The 1 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.



-
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 #310: Remove extraneous spaces around the colons of the output of the contexts list in the text-based manager

[GitBox]

michael-o commented on pull request #310:
URL: https://github.com/apache/tomcat/pull/310#issuecomment-652065030


   It is a logical error to have an automated interface to be to stable across 
locales, infact, it should be locale-agnostic. The issue you have observed due 
to the fact that French spelling mandates a space before a colon.



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 edited a comment on pull request #310: Remove extraneous spaces around the colons of the output of the contexts list in the text-based manager

[GitBox]

michael-o edited a comment on pull request #310:
URL: https://github.com/apache/tomcat/pull/310#issuecomment-652065030


   It is a logical error to have an automated interface to be to stable across 
locales, infact, it should be locale-agnostic. The issue you have observed due 
to the fact that French spelling mandates a space before a colon. We likely 
need to review all other automated output from the text interface to make it 
properly consumable by machine clients.



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

svn commit: r40261 [2/2] - in /dev/tomcat/tomcat-8/v8.5.57: ./ bin/ bin/embed/ bin/extras/ src/

[markt]

Added: dev/tomcat/tomcat-8/v8.5.57/src/apache-tomcat-8.5.57-src.zip.asc
==
--- dev/tomcat/tomcat-8/v8.5.57/src/apache-tomcat-8.5.57-src.zip.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.57/src/apache-tomcat-8.5.57-src.zip.asc Tue Jun 30 
22:09:05 2020
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl77tX4ACgkQEMAcWi9g
+WecRig/9FLYjYtNUPHNg8qJ2Kbgdg+/IJaGDlhkx0vUXtAwaIN6y+QcNrmWdUgDY
+fZTGG5fwLpjrDw6Mys1Mk7fPvryQBDHJCKj3sWOw+mllVkQofXR+UnDi6h8J2179
+Mg4zRToeV4vR9tBHDiCUPEhHXboUSRZnGj6GcG82l8OToew6wGcuICgeWdy6BUsb
+3wFX1oHlkPHJAsHHdgHfHTQ7312TLV3rbX+Kt5Thh2KbfnB992phbntklesIIEfP
+PQ5MUMEwuCSU3awVQqpuZu5GYfYajHSGbLJaJ0A82XwhXJavZyc8HfGnuL2BXUcH
+IEVbcgt2qgFI4XCjKfDxtalBQCDydjsrlGxNUlpUU6sFsTaT4TZMEuinWfafHR63
+bpz1VNlfHR6IKbY6YObG1cyLM4wNtfoHoHEd2z9R13t2GfSOjw7MLJe9Ep7eBlo6
+KXbCehbvSFX9m74mROWubBTf1l1yIYy1gu/qvLl+bmLkV+O+wxYn+IiZ2aSlT7kC
+Ni1kk+dyrJRdk5VO2thQQlW+wV3KGUN36FFqvH85PajuhN9V7XXbhGW+XVrgGp4Z
+VmBBKEVyd90IJGLJNz6Gas3kd6vn7F/IAuMyQ3b6Ai+2lujZOpxddH+rE7m+4SpW
+7A/7xCnH6Hdnpi/CaMmVT5MCGciXL5GQmRON2bxfuEZUqpLTFn8=
+=OvJ/
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.57/src/apache-tomcat-8.5.57-src.zip.sha512
==
--- dev/tomcat/tomcat-8/v8.5.57/src/apache-tomcat-8.5.57-src.zip.sha512 (added)
+++ dev/tomcat/tomcat-8/v8.5.57/src/apache-tomcat-8.5.57-src.zip.sha512 Tue Jun 
30 22:09:05 2020
@@ -0,0 +1 @@
+4fab50819bf3f045ec1c3dd16ba928543b81e9d1569e024c4e3e4de7c338dbf93f228b59db7122104e48ae8b324e95681a6688f722b9a918087f294a4ea2f828
 *apache-tomcat-8.5.57-src.zip
\ No newline at end of file



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

svn commit: r40261 [1/2] - in /dev/tomcat/tomcat-8/v8.5.57: ./ bin/ bin/embed/ bin/extras/ src/

[markt]

Author: markt
Date: Tue Jun 30 22:09:05 2020
New Revision: 40261

Log:
Upload 8.5.57 for voting

Added:
dev/tomcat/tomcat-8/v8.5.57/
dev/tomcat/tomcat-8/v8.5.57/KEYS
dev/tomcat/tomcat-8/v8.5.57/README.html
dev/tomcat/tomcat-8/v8.5.57/RELEASE-NOTES
dev/tomcat/tomcat-8/v8.5.57/bin/
dev/tomcat/tomcat-8/v8.5.57/bin/README.html
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57-deployer.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57-deployer.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57-deployer.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57-deployer.zip.asc
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57-deployer.zip.sha512
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57-fulldocs.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57-windows-x64.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57-windows-x64.zip.asc
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57-windows-x64.zip.sha512
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57-windows-x86.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57-windows-x86.zip.asc
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57-windows-x86.zip.sha512
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57.exe   (with props)
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57.exe.asc
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57.exe.sha512
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57.zip   (with props)
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57.zip.asc
dev/tomcat/tomcat-8/v8.5.57/bin/apache-tomcat-8.5.57.zip.sha512
dev/tomcat/tomcat-8/v8.5.57/bin/embed/
dev/tomcat/tomcat-8/v8.5.57/bin/embed/apache-tomcat-8.5.57-embed.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.57/bin/embed/apache-tomcat-8.5.57-embed.tar.gz.asc

dev/tomcat/tomcat-8/v8.5.57/bin/embed/apache-tomcat-8.5.57-embed.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.57/bin/embed/apache-tomcat-8.5.57-embed.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.57/bin/embed/apache-tomcat-8.5.57-embed.zip.asc
dev/tomcat/tomcat-8/v8.5.57/bin/embed/apache-tomcat-8.5.57-embed.zip.sha512
dev/tomcat/tomcat-8/v8.5.57/bin/extras/
dev/tomcat/tomcat-8/v8.5.57/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-8/v8.5.57/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-8/v8.5.57/bin/extras/catalina-jmx-remote.jar.sha512
dev/tomcat/tomcat-8/v8.5.57/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-8/v8.5.57/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-8/v8.5.57/bin/extras/catalina-ws.jar.sha512
dev/tomcat/tomcat-8/v8.5.57/src/
dev/tomcat/tomcat-8/v8.5.57/src/apache-tomcat-8.5.57-src.tar.gz   (with 
props)
dev/tomcat/tomcat-8/v8.5.57/src/apache-tomcat-8.5.57-src.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.57/src/apache-tomcat-8.5.57-src.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.57/src/apache-tomcat-8.5.57-src.zip   (with props)
dev/tomcat/tomcat-8/v8.5.57/src/apache-tomcat-8.5.57-src.zip.asc
dev/tomcat/tomcat-8/v8.5.57/src/apache-tomcat-8.5.57-src.zip.sha512

Added: dev/tomcat/tomcat-8/v8.5.57/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.57/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.57/KEYS Tue Jun 30 22:09:05 2020
@@ -0,0 +1,676 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
+gNftTbKx/MVS7cQU0II8BKo2Akr

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Ant/Apache Ant(TM) version 1.9.14 compiled on March 12 2019 (Java 1.7.0_80; Windows 8.1 6.3) Aether""userId" = "markt""ip" = "86.144.69.4"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-catalina-ha/8.5.57/tomcat-catalina-ha-8.5.57.jar.asc(SHA1: e06e0ac8fbef766c519a1c9e4c301de345a150af)/org/apache/tomcat/tomcat-catalina-ha/8.5.57/tomcat-catalina-ha-8.5.57.pom.asc(SHA1: bb50259ded3b681e467dcc64b0dab91c681725bb)/org/apache/tomcat/tomcat-catalina-ha/8.5.57/tomcat-catalina-ha-8.5.57.pom(SHA1: 8543310765e49361f84e65c7ee28b68be193e299)/org/apache/tomcat/tomcat-catalina-ha/8.5.57/tomcat-catalina-ha-8.5.57-sources.jar.asc(SHA1: d2ac8d93e49998b92afa46d266b526ef5d7b18be)/org/apache/tomcat/tomcat-catalina-ha/8.5.57/tomcat-catalina-ha-8.5.57.jar(SHA1: 55b05b971a0e4a5a31068492bacd1ae1c9a9062f)/org/apache/tomcat/tomcat-catalina-ha/8.5.57/tomcat-catalina-ha-8.5.57-sources.jar(SHA1: 1160baac0628a4b37af7df8a5e95c85bd32e2ba9)/org/apache/tomcat/tomcat-api/8.5.57/tomcat-api-8.5.57-sources.jar.asc(SHA1: dfa394816aceb234d6449d65e60f0d295fdf9ffd)/org/apache/tomcat/tomcat-api/8.5.57/tomcat-api-8.5.57.pom.asc(SHA1: 69e31e6cfe97ef75d78c0f3ca3cd8320dfdf32f1)/org/apache/tomcat/tomcat-api/8.5.57/tomcat-api-8.5.57.jar(SHA1: 46e2aefee3855af20cac5f3282bc59beb3f570a9)/org/apache/tomcat/tomcat-api/8.5.57/tomcat-api-8.5.57-sources.jar(SHA1: 195241694ef1245d068dd02a8093d6941255b373)/org/apache/tomcat/tomcat-api/8.5.57/tomcat-api-8.5.57.pom(SHA1: 6186f4e3b7e4211748d7710d3ecbe523fd985774)/org/apache/tomcat/tomcat-api/8.5.57/tomcat-api-8.5.57.jar.asc(SHA1: 9e49524850be5ac0463245beff980a5c076ce5c7)/org/apache/tomcat/embed/tomcat-embed-jasper/8.5.57/tomcat-embed-jasper-8.5.57.pom.asc(SHA1: 0a51293203303b58d34efac198d70267176552c1)/org/apache/tomcat/embed/tomcat-embed-jasper/8.5.57/tomcat-embed-jasper-8.5.57.pom(SHA1: 7f3fc4f4d370184a7d749659a81a0b851076b836)/org/apache/tomcat/embed/tomcat-embed-jasper/8.5.57/tomcat-embed-jasper-8.5.57.jar.asc(SHA1: 25ba8410080e593b5775650a9a778ec689a3fc35)/org/apache/tomcat/embed/tomcat-embed-jasper/8.5.57/tomcat-embed-jasper-8.5.57.jar(SHA1: 8d44938b5df875be6180cf0425c3ba62a33c6176)/org/apache/tomcat/embed/tomcat-embed-jasper/8.5.57/tomcat-embed-jasper-8.5.57-sources.jar.asc(SHA1: 28792cf47ffb67e474f9056d032282ddb78762e8)/org/apache/tomcat/embed/tomcat-embed-jasper/8.5.57/tomcat-embed-jasper-8.5.57-sources.jar(SHA1: 0396fa0d9883546c231419dc94c8384b4f0eb91f)/org/apache/tomcat/embed/tomcat-embed-core/8.5.57/tomcat-embed-core-8.5.57.jar.asc(SHA1: a8c15f3bed67803121d95ac51e0f2bd281230d68)/org/apache/tomcat/embed/tomcat-embed-core/8.5.57/tomcat-embed-core-8.5.57.pom.asc(SHA1: 13aa76922fd6b66f650e44f2ab32eb70a7762539)/org/apache/tomcat/embed/tomcat-embed-core/8.5.57/tomcat-embed-core-8.5.57.jar(SHA1: 0a6db087f7e91ef255a63af0a7cdcc594ca91049)/org/apache/tomcat/embed/tomcat-embed-core/8.5.57/tomcat-embed-core-8.5.57.pom(SHA1: f7ec905050f3cc48e02ac5f45bbd9cae1901a8e8)/org/apache/tomcat/embed/tomcat-embed-core/8.5.57/tomcat-embed-core-8.5.57-sources.jar.asc(SHA1: 1dd665f0d56c9057d98c0d4202516d2395e75761)/org/apache/tomcat/embed/tomcat-embed-core/8.5.57/tomcat-embed-core-8.5.57-sources.jar(SHA1: 384ee83582c9a5548eee4931606766dc55ea310a)/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.57/tomcat-embed-websocket-8.5.57-sources.jar.asc(SHA1: dd678da31b4325dc764cca6ec652a5ed8bc836a8)/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.57/tomcat-embed-websocket-8.5.57-sources.jar(SHA1: f0e56965dda46778caa68d81370004e636597cee)/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.57/tomcat-embed-websocket-8.5.57.pom(SHA1: cb74e652b3a0c44813805da3e59dd45089379568)/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.57/tomcat-embed-websocket-8.5.57.jar.asc(SHA1: 071e1059deb1d5d60ecc69b76439f9c129bfe806)/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.57/tomcat-embed-websocket-8.5.57.pom.asc(SHA1: a399c766d78f312391242e05359e96b204b1134a)/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.57/tomcat-embed-websocket-8.5.57.jar(SHA1: b882fbd2a7072554692894b4532518882be10366)/org/apache/tomcat/embed/tomcat-embed-el/8.5.57/tomcat-embed-el-8.5.57.jar(SHA1: e8030feb92d1b513dcc9f678a808caaeb257fd34)/org/apache/tomcat/embed/tomcat-embed-el/8.5.57/tomcat-embed-el-8.5.57.pom.asc(SHA1: 678821de3bee8817bf176e4e0756f92282c9e5ba)/org/apache/tomcat/embed/tomcat-embed-el/8.5.57/tomcat-embed-el-8.5.57.jar.asc(SHA1: 25c2f729afc5c72c2cec7881b76fa2f2f3a7fb64)/org/apache/tomcat/embed/tomcat-embed-el/8.5.57/tomcat-embed-el-8.5.57-sources.jar.asc(SHA1: 127e63b247b45eac0c9127edec463e49fc05ac2f)/org/apache/tomcat/embed/tomcat-embed-el/8.5.57/tomcat-embed-el-8.5.57.pom(SHA1: 91e8630aff5fdda60b98a5f8e21798fe54013f71)/org/apache/tomcat/embed/tomcat-embed-el/8.5.57/tomcat-embed-el-8.5.57-sources.jar(SHA1: 37042345ade67d6f95a42d493656756fb8e60aa8)/org/apache/tomcat/tomcat-juli/8.5.57/tomcat-juli-8.5.57.pom.asc(SHA1: 8ed6afdb15b57546bd4bc399ad5a3e1494332

[VOTE] Release Apache Tomcat 8.5.57

[Mark Thomas]

The proposed Apache Tomcat 8.5.57 release is now available for voting.

The notable changes compared to the 8.5.56 release are:

- Implement a significant portion of the TLS environment variables
  for the rewrite valve.

- Reduce memory footprint of closed HTTP/2 streams

- Improve parsing of RFC 2109 cookies

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://ci.apache.org/projects/tomcat/tomcat85/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.57/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1274/

The tag is:
https://github.com/apache/tomcat/tree/8.5.57
9c649984ef92c2534a734c6584220a9a0c0c3462

The proposed 8.5.57 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 8.5.57

-
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: Increment version number for next dev cycle

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new fc0f873  Increment version number for next dev cycle
fc0f873 is described below

commit fc0f8731bdef345fa6a23a4905217e45e2e17244
Author: Mark Thomas 
AuthorDate: Tue Jun 30 23:15:45 2020 +0100

Increment version number for next dev cycle
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 1f462f5..99dcb55 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=57
+version.build=58
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 523a71f..81fa393 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=8.5.57
+maven.asf.release.deploy.version=8.5.58
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 64545f3..c155da0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


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

[GitHub] [tomcat] Holomark commented on pull request #310: Remove extraneous spaces around the colons of the output of the contexts list in the text-based manager

[GitBox]

Holomark commented on pull request #310:
URL: https://github.com/apache/tomcat/pull/310#issuecomment-652226783


   I understand your comment, but I really believe this principle doesn't apply 
here. I may have not made my example clear, I am not trying to bend Tomcat to 
the whims of a plugin.
   
   Here is a sample output from http://localhost:8080/manager/text/list on my 
machine, with a typical Tomcat installation:
   ```
   OK - Listed applications for virtual host [localhost]
   /:running:0:ROOT
   /webstart:running:0:webstart
   /manager:running:0:manager
   /docs:running:0:docs
   ```
   
   Here is the same output, in the context of a French configured system
   ```
   OK - Applications listées pour l''hôte virtuel (virtual host) [localhost]
   / : running : 0 : ROOT
   /webstart : running : 0 : webstart
   /manager : running : 0 : manager
   /docs : running : 0 : docs
   ```
   
   As you can expect, an automated script splits the line on the colons. I 
believe this is a fair assumption. 
   This is not about translation, this is breaking the contract.
   
   Actually I'd say the initial mistake was to put this line with the localized 
strings.
   I was tempted to propose the following correction:
   Those lines [from the 
ManagerServlet](https://github.com/Holomark/tomcat/blob/21d2000c99134b7ec54424ea210cf9b2fd6aae38/java/org/apache/catalina/manager/ManagerServlet.java#L1079)
   ```java
   if (context.getState().isAvailable()) {
   
writer.println(smClient.getString("managerServlet.listitem",
   displayPath,
   "running",
   "" + context.getManager().findSessions().length,
   context.getDocBase()));
   } else {
   
writer.println(smClient.getString("managerServlet.listitem",
   displayPath,
   "stopped",
   "0",
   context.getDocBase()));
   }
   ```
   ... would be tweaked to:
   ```java
   if (context.getState().isAvailable()) {
   writer.println(String.join(":",
   displayPath,
   "running",
   "" + context.getManager().findSessions().length,
   context.getDocBase()));
   } else {
   writer.println(String.join(":",
   displayPath,
   "stopped",
   "0",
   context.getDocBase()));
   ```
   ... and the `managerServlet.listitem` line in LocalStrings_xx.properties 
removed (It is not used elsewhere).
   
   I stepped back and proposed only a correction that seemed more innocuous to 
`LocalStrings_fr.properties`, as I have never contributed to this project, and 
barely in any other open source project.
   
   Am I wrong ? I may be missing something.
   
   Thank you for your 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

[Bug 64570] New: Transaction not rollbacked if autocommit is false

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64570

Bug ID: 64570
   Summary: Transaction not rollbacked if autocommit is false
   Product: Tomcat Modules
   Version: unspecified
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: jdbc-pool
  Assignee: dev@tomcat.apache.org
  Reporter: ronald.dehuys...@gmail.com
  Target Milestone: ---

Created attachment 37344
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=37344&action=edit
Packet capturing using wireshark

I think I found a bug in the Tomcat JDBC Pool.

If I start a connection with autoCommit set to false and default autoCommit is
set to true, the active transaction is not rollbacked when the connection is
closed.

I think the bug is located in the terminateTransaction method in the
ConnectionPool class: if one sets the autoCommit manually to false and
afterwards the connection is closed without committing or rollback, the
transaction stays open.

See line 888 of ConnectionPool. 

Code to reproduce:

conn = dataSource.getConnection();
conn.setAutoCommit(false);
ps = conn.prepareStatement(sqlStatement, ResultSet.TYPE_FORWARD_ONLY,
ResultSet.CONCUR_READ_ONLY);
ps.setFetchSize(100);
paramsSetter.accept(ps);
rs = ps.executeQuery();
while(rs.next()) {
 // do something with result
}
rs.close()
ps.close()
conn.close()


=> Postgres connection stays in state: Ready for query (in a transaction)

All other connection pools rollback active transaction on close of connection.


See wireshark capture:
Correct behaviour: packet 2698 -> 2701 (same for commons-dbcp, hikari and c3p0)
Incorrect behaviour: packet 12018 -> missing rollback

-- 
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