[Bug 62899] Async servlet over HTTP/2 on embedded server sporadically timeout forever when reading near end of request
https://bz.apache.org/bugzilla/show_bug.cgi?id=62899 --- Comment #5 from Mark Thomas --- Thanks for the confirmation. I'll back-port the fix to 8.5.x. You'll see that CNFE if you run on later versions of Java that either don't provide those classes by default or don't provide them at all. -- 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
[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 23 mins 32 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20181114/bin/openssl -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dtest.relaxTiming=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.1-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-t
Re: [VOTE] Release Apache Tomcat 7.0.92
Hi, На пт, 9.11.2018 г. в 13:34 ч. Violeta Georgieva написа: > > The proposed Apache Tomcat 7.0.92 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.92/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1198/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_92/ > > The proposed 7.0.92 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 7.0.92 Stable +1 All my tests passed successfully. Regards, Violeta
Re: [VOTE] Release Apache Tomcat 7.0.92
On Fri, Nov 9, 2018 at 12:34 PM Violeta Georgieva wrote: > The proposed Apache Tomcat 7.0.92 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.92/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1198/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_92/ > > The proposed 7.0.92 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 7.0.92 Stable > > Rémy
svn commit: r1846582 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/org/apache/catalina/deploy/ java/org/apache/catalina/ha/deploy/ jav
Author: markt
Date: Wed Nov 14 13:43:26 2018
New Revision: 1846582
URL: http://svn.apache.org/viewvc?rev=1846582&view=rev
Log:
More updates and additions to the Spanish translations
Added:
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_es.properties
(with props)
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_es.properties
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings_es.properties
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_es.properties
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_es.properties
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_es.properties
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_es.properties
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings_es.properties
(with props)
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_es.properties
(with props)
tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_es.properties
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
tomcat/trunk/java/org/apache/coyote/LocalStrings_es.properties
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_es.properties
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_es.properties
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_es.properties
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_es.properties
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_es.properties
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_es.properties
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties?rev=1846582&r1=1846581&r2=1846582&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties
[UTF-8] (original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties
[UTF-8] Wed Nov 14 13:43:26 2018
@@ -31,6 +31,7 @@ formAuthenticator.forwardLoginFail=Error
formAuthenticator.noErrorPage=No se ha definido página de error para la
autenticación FORM en el contexto [{0}]
formAuthenticator.noLoginPage=No se ha definido página de ingreso para la
autenticación FORM en el contexto [{0}]
+singleSignOn.debug.principalFound=SSO encontró el Principal cacheado [{0}] con
autenticación tipo [{1}]\n
singleSignOn.sessionExpire.hostNotFound=SSO es incapaz de expirar la session
[{0}] porque el Host no puede ser encontrado
spnegoAuthenticator.authHeaderNoToken=La cabecera de Negociación de
autorización enviada por el cliente no incluía una ficha
Added:
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_es.properties?rev=1846582&view=auto
==
---
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_es.properties
(added)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_es.properties
Wed Nov 14 13:43:26 2018
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+persistentProviderRegistrations.existsDelete
svn commit: r1846583 [2/2] - in /tomcat/trunk: java/javax/el/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/org/apache/catalina/connector/ java/org/apache
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties?rev=1846583&r1=1846582&r2=1846583&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
[UTF-8] (original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
[UTF-8] Wed Nov 14 13:54:21 2018
@@ -14,4 +14,8 @@
# limitations under the License.
jsse.alias_no_key_entry=Le nom alias [{0}] nidentifie pas une entrée de clé
+jsse.invalid_ssl_conf=La configuration SSL est invalide, dû à [{0}]
+jsse.noDefaultCiphers=Incapacité de déterminer un défaut pour le mode de
chiffrement de [{0}]. Indiquez une valeur explicite pour assurer le démarrage
do connecteur.
jsse.pemParseError=Impossible de parser la clé de [{0}]
+
+jsseSupport.clientCertError=Echec de l'obtention d'un certificat de la part du
client
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties?rev=1846583&r1=1846582&r2=1846583&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
Wed Nov 14 13:54:21 2018
@@ -18,3 +18,5 @@ engine.noSession=Identificateur de sessi
engine.openSSLError=Erreur OpenSSL : [{0}] message : [{1}]
openssl.keyManagerMissing=Aucun gestionnaire de clés trouvé
+
+opensslconf.checkFailed=Echec de la vérification de OpenSSLConf
Modified:
tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_fr.properties?rev=1846583&r1=1846582&r2=1846583&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_fr.properties
Wed Nov 14 13:54:21 2018
@@ -13,5 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-jarScan.classPath.badEntry=L''entrée "class path" [{0}] n''a pas ou être
convertie en URL.
+jarScan.classPath.badEntry=L''entrée "class path" [{0}] n''a pas pu être
convertie en URL.
jarScan.classloaderFail=Echec de recherche dans [{0}] de la hiérarchie de
chargeurs de classes
+jarScan.webinflibJarNoScan=Ne lit pas le JAR [{0}] de /WEB-INF/lib
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_fr.properties?rev=1846583&r1=1846582&r2=1846583&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
Wed Nov 14 13:54:21 2018
@@ -15,15 +15,21 @@
caseInsensitiveKeyMap.nullKey=Les clés nulles ne sont pas admises
-wsFrame.closed=Une novelle trame (frame) a été reçue après une trame de
contrôle de fermeture
+wsFrame.closed=Une nouvelle trame (frame) a été reçue après une trame de
contrôle de fermeture
+wsFrame.wrongRsv=La trame cliente (client frame) a les bits réservés d''un
message dont l''opCode est [{1}] définis à [{0}], et ce n''est pas supporté
par ce terminateur (endpoint)
wsHandshakeRequest.invalidUri=La chaîne de caractères [{0}] ne peut être
utilisée pour construire un URL valide
+wsRemoteEndpoint.closed=Le message ne sera pas envoyé parce que la session
WebSocket a été fermée
wsRemoteEndpoint.closedDuringMessage=Le reste du message ne sera pas envoyé
parce que la session WebSocket est déjà fermée.
wsRemoteEndpoint.flushOnCloseFailed=Messages groupés (batched) est toujours
actif après fermeture de la session. Impossible de purger le message groupé
restant.
wsRemoteEndpoint.nullData=Argument nul invalide.
wsRemoteEndpoint.wrongState=L''endpoint distant est dans l''état [{0}] ce qui
est invalide pour la méthode appelée
+wsSession.closed=La session WebSocket [{0}] a été fermée et aucune méthode
(à part close()) ne peut être appelée sur une session fermée
wsSession.created=Création de la session WebSocket [{0}]
+wsSession.doClose=Fermeture de la session WebSocket [{1}]
+wsSession.instanceNew=L'enregistrement de l'instance de l'endpoint a échoué
+wsWebSocketContainer.missingWWWAuthenticateHeader=Echec de traitement du code
HTTP de réponse [{0}] : la réponse ne conti
svn commit: r1846583 [1/2] - in /tomcat/trunk: java/javax/el/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/org/apache/catalina/connector/ java/org/apache
Author: markt Date: Wed Nov 14 13:54:21 2018 New Revision: 1846583 URL: http://svn.apache.org/viewvc?rev=1846583&view=rev Log: More updates and additions to the French translations Added: tomcat/trunk/java/org/apache/catalina/ha/authenticator/LocalStrings_fr.properties (with props) tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_fr.properties (with props) tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_fr.properties (with props) tomcat/trunk/java/org/apache/naming/factory/LocalStrings_fr.properties (with props) tomcat/trunk/java/org/apache/tomcat/util/digester/LocalStrings_fr.properties (with props) tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_fr.properties (with props) Modified: tomcat/trunk/java/javax/el/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/util/LocalStrings_fr.properties tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties tomcat/trunk/java/org/apache/coyote/LocalStrings_fr.properties tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_fr.properties tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_fr.properties tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_fr.properties tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_fr.properties tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_fr.properties tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_fr.properties tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_fr.properties tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_fr.properties tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_fr.properties tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings_fr.properties tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties tomcat/trunk/webapps/docs/changelog.xml tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties Modified: tomcat/trunk/java/javax/el/LocalStrings_fr.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/LocalStrings_fr.properties?rev=1846583&r1=1846582&r2=1846583&view=diff == --- tomcat/trunk/java/javax/el/LocalStrings_fr.properties (original) +++ tomcat/trunk/java/javax/el/LocalStrings_fr.properties Wed Nov 14 13:54:21 2018 @@ -13,4 +13,8 @@ # See the License for the specific language governing permissions an
svn commit: r1846584 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/
Author: markt Date: Wed Nov 14 13:58:45 2018 New Revision: 1846584 URL: http://svn.apache.org/viewvc?rev=1846584&view=rev Log: More updates and additions to the German translations Added: tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_de.properties (with props) tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_de.properties (with props) tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_de.properties (with props) tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_de.properties (with props) tomcat/trunk/java/org/apache/catalina/session/LocalStrings_de.properties (with props) tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_de.properties (with props) tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_de.properties (with props) tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_de.properties (with props) tomcat/trunk/java/org/apache/catalina/util/LocalStrings_de.properties (with props) tomcat/trunk/java/org/apache/coyote/LocalStrings_de.properties (with props) tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_de.properties (with props) tomcat/trunk/java/org/apache/tomcat/util/compat/LocalStrings_de.properties (with props) tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_de.properties (with props) tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_de.properties (with props) tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_de.properties (with props) tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings_de.properties (with props) Modified: tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_de.properties tomcat/trunk/java/org/apache/catalina/core/LocalStrings_de.properties tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_de.properties tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_de.properties tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_de.properties tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_de.properties tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_de.properties tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_de.properties tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_de.properties tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_de.properties tomcat/trunk/webapps/docs/changelog.xml tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_de.properties Added: tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_de.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_de.properties?rev=1846584&view=auto == --- tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_de.properties (added) +++ tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_de.properties Wed Nov 14 13:58:45 2018 @@ -0,0 +1,16 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +authenticator.certificates=Keine Client Zertifikatskette im Request Propchange: tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_de.properties -- svn:eol-style = native Modified: tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_de.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_de.properties?rev=1846584&r1=1846583&r2=1846584&view=diff == --- tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_de.properties (original) +++ tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_de.properties Wed Nov 14 13:58:45 2018 @@ -14,3 +14,5 @@ # limitations under the License. authConfigFactoryImpl.zeroLengthAppContext=Ei
svn commit: r1846587 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/org/apache/coyote/http2/
Author: markt Date: Wed Nov 14 14:12:57 2018 New Revision: 1846587 URL: http://svn.apache.org/viewvc?rev=1846587&view=rev Log: Rename for clarity / consistency Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProcessor.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 14 14:12:57 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,17627
Re: [VOTE] Release Apache Tomcat 7.0.92
On Fri, Nov 9, 2018 at 6:34 AM Violeta Georgieva wrote: > The proposed Apache Tomcat 7.0.92 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.92/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1198/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_92/ > > The proposed 7.0.92 release is: > [ ] Broken - do not release > [x] Stable - go ahead and release as 7.0.92 Stable > +1, LGTM :) > > Regards, > Violeta >
svn commit: r1846589 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/coyote/ java/org/apache/coyote/http2/ webapps/docs/
Author: markt Date: Wed Nov 14 14:52:08 2018 New Revision: 1846589 URL: http://svn.apache.org/viewvc?rev=1846589&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62899 Prevent the incorrect timing out of connections when Servlet non-blocking I/O is used to read a request body over an HTTP/2 stream. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProcessor.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 14 14:52:08 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1
[Bug 62899] Async servlet over HTTP/2 on embedded server sporadically timeout forever when reading near end of request
https://bz.apache.org/bugzilla/show_bug.cgi?id=62899 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #6 from Mark Thomas --- Fixed in: - trunk for 9.0.14 onwards - 8.5.x for 8.5.36 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1846593 - /tomcat/native/trunk/native/src/sslutils.c
Author: jfclere Date: Wed Nov 14 16:56:59 2018 New Revision: 1846593 URL: http://svn.apache.org/viewvc?rev=1846593&view=rev Log: Fix another memory leak. Modified: tomcat/native/trunk/native/src/sslutils.c Modified: tomcat/native/trunk/native/src/sslutils.c URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslutils.c?rev=1846593&r1=1846592&r2=1846593&view=diff == --- tomcat/native/trunk/native/src/sslutils.c (original) +++ tomcat/native/trunk/native/src/sslutils.c Wed Nov 14 16:56:59 2018 @@ -1052,6 +1052,7 @@ static int process_ocsp_response(OCSP_RE /* we clean up */ OCSP_CERTID_free(certid); +OCSP_BASICRESP_free(bs); return o; } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62892] Memory leak when performing client certificate validation with OCSP
https://bz.apache.org/bugzilla/show_bug.cgi?id=62892 --- Comment #10 from jfclere --- try with http://svn.apache.org/viewvc?rev=1846593&view=rev I think I have fixed all the leaks now. -- 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: JDK 12 , JDK 8u202 & Project Panama Early-Access builds available
On 10/11/2018 11:00, Mark Thomas wrote: > Thanks to some off-list help from Chuck, I have been able to make some > progress on this. The following: > > /opt/java/openjdk-12-panama-b0/bin/jextract \ > -I include \ > -I /usr/lib/gcc/x86_64-linux-gnu/7.3.0/include \ > -I /usr/include/linux \ > include/openssl/rand.h > > creates rand.h.jar > > Next up is figuring out how to use this jar and testing how portable it is. Hmm. What is produced is just a set of interfaces with some constants. I can't see anything that results in a call to native code. I'm not sure if this is something I've done wrong, a limitation of the early release or something else. I tried using a different header file with (hopefully) more functionality: /opt/java/openjdk-12-panama-b0/bin/jextract \ -I include \ -I /usr/lib/gcc/x86_64-linux-gnu/7.3.0/include \ -I /usr/include/linux \ -t org.openssl \ include/openssl/crypto.h and I get: /usr/include/linux/time.h:10:8: error: redefinition of 'timespec' /usr/include/linux/time.h:10:8: error: redefinition of 'timespec' It isn't immediately obvious to me where timespec is redefined - else I'd tweak the relevant header file. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: JDK 12 , JDK 8u202 & Project Panama Early-Access builds available
> From: Mark Thomas [mailto:ma...@apache.org] > Subject: Re: JDK 12 , JDK 8u202 & Project Panama Early-Access builds available > I tried using a different header file with (hopefully) more functionality: > /opt/java/openjdk-12-panama-b0/bin/jextract \ > -I include \ > -I /usr/lib/gcc/x86_64-linux-gnu/7.3.0/include \ > -I /usr/include/linux \ > -t org.openssl \ > include/openssl/crypto.h > and I get: > /usr/include/linux/time.h:10:8: error: redefinition of 'timespec' > /usr/include/linux/time.h:10:8: error: redefinition of 'timespec' > It isn't immediately obvious to me where timespec is redefined - else > I'd tweak the relevant header file. These are the two usual places that declare the timespec struct: /usr/include/time.h /usr/include/linux/time.h Unfortunately, they use different tags to see if timespec has already been declared, so the conflict is probably coming from those. If you put this: #define _LINUX_TIME_H somewhere early in the source code, it should prevent the inclusion of linux/time.h, which you probably don't want anyway. - Chuck THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY MATERIAL and is thus for use only by the intended recipient. If you received this in error, please contact the sender and delete the e-mail and its attachments from all computers. smime.p7s Description: S/MIME cryptographic signature
svn commit: r1846606 - /tomcat/native/trunk/native/src/sslutils.c
Author: jfclere
Date: Wed Nov 14 20:37:35 2018
New Revision: 1846606
URL: http://svn.apache.org/viewvc?rev=1846606&view=rev
Log:
remove sk_OCSP_CERTID_free() related logic, the free is done in
OCSP_REQUEST_free().
Modified:
tomcat/native/trunk/native/src/sslutils.c
Modified: tomcat/native/trunk/native/src/sslutils.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslutils.c?rev=1846606&r1=1846605&r2=1846606&view=diff
==
--- tomcat/native/trunk/native/src/sslutils.c (original)
+++ tomcat/native/trunk/native/src/sslutils.c Wed Nov 14 20:37:35 2018
@@ -723,8 +723,7 @@ static char **decode_OCSP_url(ASN1_OCTET
/* stolen from openssl ocsp command */
-static int add_ocsp_cert(OCSP_REQUEST *req, X509 *cert, X509 *issuer,
- STACK_OF(OCSP_CERTID) *ids)
+static int add_ocsp_cert(OCSP_REQUEST *req, X509 *cert, X509 *issuer)
{
OCSP_CERTID *id;
@@ -737,7 +736,7 @@ static int add_ocsp_cert(OCSP_REQUEST *r
OCSP_CERTID_free(id);
return 0;
} else {
-sk_OCSP_CERTID_push(ids, id);
+/* id will be freed by OCSP_REQUEST_free() */
return 1;
}
}
@@ -964,7 +963,6 @@ static OCSP_RESPONSE *get_ocsp_response(
BIO *bio_req;
char *hostname, *path, *c_port;
int port, use_ssl;
-STACK_OF(OCSP_CERTID) *ids = NULL;
int ok = 0;
apr_socket_t *apr_sock = NULL;
apr_pool_t *mp;
@@ -980,8 +978,7 @@ static OCSP_RESPONSE *get_ocsp_response(
if (ocsp_req == NULL)
goto end;
-ids = sk_OCSP_CERTID_new_null();
-if (add_ocsp_cert(ocsp_req,cert,issuer,ids) == 0 )
+if (add_ocsp_cert(ocsp_req,cert,issuer) == 0 )
goto free_req;
/* create the BIO with the request to send */
@@ -1008,7 +1005,6 @@ free_bio:
free_req:
OCSP_REQUEST_free(ocsp_req);
-sk_OCSP_CERTID_free(ids);
end:
OPENSSL_free(hostname);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62843] Tomcat Russian localization
https://bz.apache.org/bugzilla/show_bug.cgi?id=62843 --- Comment #4 from Mark Thomas --- You can't add anything in the java or javax package space as they are controlled by the specifications. Please update the patches to the latest source code, removing the changes that have already been applied. I think it would be better to add the l10n strings via a custom tag that looks up the provided key for the user's (not Tomcat's) locale in the resource bundle. Or similar. Unless there is something standard available that does this already. JSTL? StringManager could provide much of the required functionality but as an internal Tomcat class it would not normally by visible to a web application. I'll extract the Deploy/Undeploy fix and apply it. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/3745 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1846584 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1846609 - in /tomcat/trunk/java: javax/servlet/ javax/servlet/http/ org/apache/catalina/core/ org/apache/catalina/ha/tcp/ org/apache/catalina/manager/ org/apache/catalina/mbeans/ org/apac
Author: markt
Date: Wed Nov 14 22:23:55 2018
New Revision: 1846609
URL: http://svn.apache.org/viewvc?rev=1846609&view=rev
Log:
Fix corrupted escaping of single quotes.
The import/export process is not symmetrical. Need to figure out why.
Modified:
tomcat/trunk/java/javax/servlet/LocalStrings_fr.properties
tomcat/trunk/java/javax/servlet/http/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/naming/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Utils.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
Modified: tomcat/trunk/java/javax/servlet/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/LocalStrings_fr.properties?rev=1846609&r1=1846608&r2=1846609&view=diff
==
--- tomcat/trunk/java/javax/servlet/LocalStrings_fr.properties [UTF-8]
(original)
+++ tomcat/trunk/java/javax/servlet/LocalStrings_fr.properties [UTF-8] Wed Nov
14 22:23:55 2018
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-err.not_iso8859_1=[{0}] nest pas un caractère ISO 8859-1
+err.not_iso8859_1=[{0}] n''est pas un caractère ISO 8859-1
httpMethodConstraintElement.invalidMethod=Méthode HTTP invalide
Modified: tomcat/trunk/java/javax/servlet/http/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/LocalStrings_fr.properties?rev=1846609&r1=1846608&r2=1846609&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/LocalStrings_fr.properties [UTF-8]
(original)
+++ tomcat/trunk/java/javax/servlet/http/LocalStrings_fr.properties [UTF-8] Wed
Nov 14 22:23:55 2018
@@ -18,6 +18,6 @@ err.io.short_read=Lecture partielle
http.method_delete_not_supported=La méthode HTTP DELETE n'est pas supportée
par cette URL
http.method_get_not_supported=La méthode HTTP GET n'est pas supportée par
cette URL
-http.method_not_implemented=Le méthode [{0}] nest pas définie dans la RFC
2068 et nest pas supportée par lAPI Servlet
+http.method_not_implemented=Le méthode [{0}] n''est pas définie dans la RFC
2068 et n''est pas supportée par l''API Servlet
http.method_post_not_supported=La méthode HTTP POST n'est pas supportée par
cette URL
http.method_put_not_supported=La méthode HTTP PUT n'est pas supportée par
cette URL
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1846609&r1=1846608&r2=1846609&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
[UTF-8] Wed Nov 14 22:23:55 2018
@@ -93,9 +93,9 @@ standardContext.backgroundProcess.loader
standardContext.backgroundProcess.manager=Excepción al procesar gestor [{0}]
de proceso en segundo plano
standardContext.cluster.noManager=No se ha hallado el gestor. Revisando si hay
que usar el gestor de clúster. Clúster configurado: [{0}], Aplicación
distribuíble: [{1}]
standardContext.duplicateListener=El escuchador [{0}] ya está configurado para
este contexto. La definición duplicada ha sido ignorada.
-standardContext.errorPage.error=La localización de la página de error [{0}]
debe de comenzar con /
+standardContext.errorPage.error=La localización de la página de error [{0}]
debe de comenzar con ''/''
standardContext.errorPage.required=ErrorPage no p
svn commit: r1846611 - /tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java
Author: markt
Date: Wed Nov 14 22:34:06 2018
New Revision: 1846611
URL: http://svn.apache.org/viewvc?rev=1846611&view=rev
Log:
Remove test code
Modified:
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java
Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java?rev=1846611&r1=1846610&r2=1846611&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Export.java Wed Nov
14 22:34:06 2018
@@ -125,9 +125,6 @@ public class Export {
try (FileOutputStream fos = new FileOutputStream(out);
Writer w = new OutputStreamWriter(fos,
StandardCharsets.UTF_8)) {
for (Object key : translation.keySet()) {
-if (translation.get(key).toString().contains("''")) {
-System.out.println("");
-}
w.write(key + "=" +
Utils.formatValue(translation.getProperty((String) key)) + "\n");
}
} catch (IOException ioe) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1846612 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/apache/ca
Author: markt
Date: Wed Nov 14 22:36:30 2018
New Revision: 1846612
URL: http://svn.apache.org/viewvc?rev=1846612&view=rev
Log:
Update Spanish translations
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_es.properties
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_es.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties?rev=1846612&r1=1846611&r2=1846612&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties
[UTF-8] (original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties
[UTF-8] Wed Nov 14 22:36:30 2018
@@ -33,6 +33,7 @@ formAuthenticator.noLoginPage=No se ha d
singleSignOn.debug.principalFound=SSO encontró el Principal cacheado [{0}] con
autenticación tipo [{1}]\n
singleSignOn.sessionExpire.hostNotFound=SSO es incapaz de expirar la session
[{0}] porque el Host no puede ser encontrado
+singleSignOn.sessionExpire.managerError=SSO incapaz de expirar sesión [{0}]
porque el Gerenciador lanzó una excepción mientras buscaba la sesión
spnegoAuthenticator.authHeaderNoToken=La cabecera de Negociación de
autorización enviada por el cliente no incluía una ficha
spnegoAuthenticator.authHeaderNotNego=La cabecera de autorización enviada por
el cliente no comenzaba con Negotiate
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties?rev=1846612&r1=1846611&r2=1846612&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties
[UTF-8] Wed Nov 14 22:36:30 2018
@@ -31,6 +31,7 @@ coyoteRequest.authenticate.ise=No puedo
coyoteRequest.chunkedPostTooLarge=No se han analizado los parámetros porque la
medida de los datos enviados meiante "post" era demasiado grande. Debido a que
este requerimiento es una parte del original, no puede ser procesado. Utiliza
el atributo "maxPostSize" del conector para resolver esta situación, en caso de
que la aplicación deba de aceptar POSTs mayores.
coyoteRequest.getInputStream.ise=getReader() ya ha sido llamado para este
requerimiento
coyoteRequest.getReader.ise=getInputStream() ya ha sido llamado para este
requerimiento
+coyoteRequest.noMultipartConfig=Imposible procesar partes debido a que se ha
proveído una configuración no multipartes
coyoteRequest.parseParameters=Excepción lanzada al procesar parámetros POST
coyoteRequest.postTooLarge=No se analizaron los parámetros porque la medida de
los datos enviados era demasiado grande. Usa el atributo maxPostSize del
conector para resolver esto en caso de que la aplicación debiera de aceptar
POSTs más grandes.
coyoteRequest.sessionCreateCommitted=No puedo crear una sesión después de
llevar a cabo la respueta
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1846612&r1=1846611&r2=1846612&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
[UTF-8] Wed Nov 14 22:36:30 2018
@@ -55,6 +55,7 @@ aprListener.aprDestroy=No pude apagar la
aprListener.aprInit=La biblioteca nativa de Apache Tomcat basada en ARP que
permite un rendimiento óptimo en entornos de desarrollo no ha sido hallada en
java.library.path: [{0}]
aprListener.flags=Capacidades APR: IPv6 [{0}], enviar fichero [{1}], aceptar
filtros [{2}], aleatorio [{3}].
aprListener.initializedOpenSSL=OpenSSL inicializado correctamente [{0}]
+aprListener.initializingFIPS=Inicializando modo FIPS...
aprListener.sslInit=No pude inicializar el SSLEngine (Motor SSL)
aprLi
svn commit: r1846613 - /tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
Author: markt
Date: Wed Nov 14 23:05:00 2018
New Revision: 1846613
URL: http://svn.apache.org/viewvc?rev=1846613&view=rev
Log:
Correct escaping
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties?rev=1846613&r1=1846612&r2=1846613&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
[UTF-8] (original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
[UTF-8] Wed Nov 14 23:05:00 2018
@@ -33,7 +33,7 @@ http.noClosingBracket=The IPv6 address i
http.noOpeningBracket=The IPv6 address is missing an opening bracket.
http.singleColonEnd=An IPv6 address may not end with a single ':'.
http.singleColonStart=An IPv6 address may not start with a single ':'.
-http.tooFewHextets=An IPv6 address must consist of 8 hextets but this address
contains [{0}] hextets and no '::' sequence to represent one or more zero
hextets.
+http.tooFewHextets=An IPv6 address must consist of 8 hextets but this address
contains [{0}] hextets and no ''::'' sequence to represent one or more zero
hextets.
http.tooManyColons=An IPv6 address may not contain more than 2 sequential
colon characters.
http.tooManyDoubleColons=An IPv6 address may only contain a single '::'
sequence.
http.tooManyHextets=The IPv6 address contains [{0}] hextets but a valid IPv6
address may not have more than 8.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1846614 - in /tomcat/trunk/java: javax/el/ org/apache/catalina/core/ org/apache/catalina/loader/ org/apache/catalina/manager/ org/apache/catalina/manager/host/ org/apache/catalina/startup
Author: markt
Date: Wed Nov 14 23:11:02 2018
New Revision: 1846614
URL: http://svn.apache.org/viewvc?rev=1846614&view=rev
Log:
Update French translations
Modified:
tomcat/trunk/java/javax/el/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/coyote/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/el/Messages.properties
tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties
Modified: tomcat/trunk/java/javax/el/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/LocalStrings_fr.properties?rev=1846614&r1=1846613&r2=1846614&view=diff
==
--- tomcat/trunk/java/javax/el/LocalStrings_fr.properties (original)
+++ tomcat/trunk/java/javax/el/LocalStrings_fr.properties Wed Nov 14 23:11:02
2018
@@ -17,4 +17,6 @@ elProcessor.defineFunctionInvalidMethod=
importHandler.ambiguousStaticImport=L''import statique [{0}] ne peut pas être
traité parce qu''il est en conflit avec [{1}] qui a déjà été importé
importHandler.classNotFound=La classe [{0}] n''a pu être importée, vu qu''on
ne l''a pas trouvée
-importHandler.invalidClassNameForStatic=La classe [{0}] spécifiée pour
l''import statique [{1}] n''est pas valide
+importHandler.invalidClassNameForStatic=La classe [{0}] spécifiée pour
l''importation statique [{1}] n''est pas valide
+
+propertyNotWritable=La propriété [{1}] ne peut pas être écrite pour le
type [{0}]
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=1846614&r1=1846613&r2=1846614&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
[UTF-8] Wed Nov 14 23:11:02 2018
@@ -37,6 +37,7 @@ applicationPushBuilder.noCoyoteRequest=I
aprListener.initializingFIPS=Initialisation du mode FIPS...
aprListener.tooLateForSSLRandomSeed=setSSLRandomSeed impossible: SSL a déjà
été initialisé
+containerBase.backgroundProcess.cluster=Une exception s''est produite lors du
traitement d''arrière plan du cluster [{0}]
containerBase.backgroundProcess.unexpectedThreadDeath=Mort inattendue du fil
d''exécution d''arrière-plan ("background thread") [{0}]
defaultInstanceManager.invalidInjection=Annotation invalide pour l'injection
d'une resource méthode
@@ -50,6 +51,7 @@ naming.addEnvEntry=Ajout de l''entrée d
naming.bindFailed=Echec lors du liage à l''objet: [{0}]
naming.invalidEnvEntryType=L''entrée environnement [{0}] a un type invalide
naming.invalidEnvEntryValue=L''entrée environnement [{0}] a une valeur invalide
+naming.jmxRegistrationFailed=Echec d''enregistrement dans JMX: [{0}]
naming.namingContextCreationFailed=La création du contexte de nommage (naming
context) a échoué : [{0}]
naming.unbindFailed=Echec lors du déliage à l''objet : [{0}]
naming.wsdlFailed=fichier wsdl [{0}] non trouvé
Modified:
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties?rev=1846614&r1=1846613&r2=1846614&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties
[UTF-8] Wed Nov 14 23:11:02 2018
@@ -22,5 +22,6 @@ webappLoader.classDeploy=Déploieme
svn commit: r1846615 - /tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
Author: markt Date: Wed Nov 14 23:13:23 2018 New Revision: 1846615 URL: http://svn.apache.org/viewvc?rev=1846615&view=rev Log: Correct Russian translation Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties?rev=1846615&r1=1846614&r2=1846615&view=diff == --- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties [UTF-8] (original) +++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties [UTF-8] Wed Nov 14 23:13:23 2018 @@ -23,7 +23,7 @@ htmlManagerServlet.appsStart=Старт htmlManagerServlet.appsStop=Стоп htmlManagerServlet.appsTasks=Команды htmlManagerServlet.appsTitle=Приложения -htmlManagerServlet.appsUndeploy=Развернуть +htmlManagerServlet.appsUndeploy=Свернуть htmlManagerServlet.appsVersion=Версия htmlManagerServlet.configReloadButton=Сохранить htmlManagerServlet.configSslHostName=Имя TLS хоста @@ -77,7 +77,7 @@ htmlManagerServlet.expire.explain=с б� htmlManagerServlet.expire.unit=минут htmlManagerServlet.findleaksList=The following web applications were stopped (reloaded, undeployed), but their\n\ classes from previous runs are still loaded in memory, thus causing a memory\n\ -leak (use a profiler to confirm):\n +leak (use a profiler to confirm): htmlManagerServlet.findleaksNone=Кажется, что веб-приложения не вызвали утечку памяти при остановке, перезагрузке или распаке. htmlManagerServlet.helpHtmlManager=Справочник интерфейса htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1846616 - /tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
Author: remm
Date: Wed Nov 14 23:17:50 2018
New Revision: 1846616
URL: http://svn.apache.org/viewvc?rev=1846616&view=rev
Log:
If using configuration source, do not set the default web.xml values.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1846616&r1=1846615&r2=1846616&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Wed Nov 14
23:17:50 2018
@@ -364,6 +364,7 @@ public class Tomcat {
*/
public void init(ConfigurationSource source) {
ConfigFileLoader.setSource(source);
+addDefaultWebXmlToWebapp = false;
Catalina catalina = new Catalina();
// Load the Catalina instance with the regular configuration files
// from specified source
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1846618 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties
Author: markt
Date: Wed Nov 14 23:50:24 2018
New Revision: 1846618
URL: http://svn.apache.org/viewvc?rev=1846618&view=rev
Log:
Add [...] around inserted values for clarity
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties?rev=1846618&r1=1846617&r2=1846618&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_fr.properties
Wed Nov 14 23:50:24 2018
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-abstractStream.fileNotFound=Le fichier {0} définissant l''autorité des
certificats (CA) n''a pas été trouvé
-abstractStream.trustManagerError=Echec de création d''un gestionnaire de
confiance (trust manager) pour {0}
+abstractStream.fileNotFound=Le fichier [{0}] définissant l''autorité des
certificats (CA) n''a pas été trouvé
+abstractStream.trustManagerError=Echec de création d''un gestionnaire de
confiance (trust manager) pour [{0}]
cloudMembershipService.stopFail=Incapable d''arrêter le service
d''appartenance statique, niveau : [{0}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 23 mins 52 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dexecute.test.nio2=false -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20181115/bin/openssl -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dtest.relaxTiming=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.1-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-jni
[Bug 62910] New: tomcat-jdbc global pool transaction problem
https://bz.apache.org/bugzilla/show_bug.cgi?id=62910
Bug ID: 62910
Summary: tomcat-jdbc global pool transaction problem
Product: Tomcat 8
Version: 8.5.32
Hardware: PC
OS: Linux
Status: NEW
Severity: normal
Priority: P2
Component: Packaging
Assignee: dev@tomcat.apache.org
Reporter: zhengfc...@gmail.com
Target Milestone:
Created attachment 36261
--> https://bz.apache.org/bugzilla/attachment.cgi?id=36261&action=edit
transaction
I use tomcat-jdbc as connnection-pool, when I deploy multi web apps use the
global connection, will cause merge transaction problem.
So when app A insert a record to a table, at same time app B update a record
the oracle transaction is:
--
set transaction read write;
insert into
"GAME"."GAME_DELIVER_RECORD"("ID","GAME_ORDER_SEQ","GAME_ORDER_TIME","SKU_STOCKID","PACKAGE_SEQ","SUPPLIER_CODE","SUPPLIER_SEQ","SUPPLIER_MDSECODE","SUPPLIER_NUM","D_STATUS","SUPPLIER_INPRICE","DELIVERED_TIME","DELIVER_TIME","REMARK","CREATE_TIME","UP_TIME","BUY_INFO","LOGISTICS_SEQ","LOGISTICS_TIME","MERCH_ACCOUNT","SUPPLIER_TIME","PRIORITY_STATUS","NOTICE_COUNT","SUPPLIER_PAV")
values
('118757','364045','20181114175937','150061509296','G364045-20181114175937Z0033','Z0033',NULL,NULL,NULL,'NA',NULL,NULL,NULL,NULL,TO_DATE('14-11月-18',
'DD-MON-RR'),TO_DATE('14-11月-18',
'DD-MON-RR'),'{"businessChannelCode":"SPDB","buyNum":1,"gameAccount":"139123457","groupId":"","Ip":"10.248.192.108","mobile":"1326667","serverName":"","sellPrice":29.7,"appCode":"QB","serverId":"","groupName":"","skuStockId":"150061509296","gameCode":"20150701a7ded3ccbc4b44b58cc5c1f9bc2210f0","netWarAccount":"","channelCode":"SPDB.CW.QB"}',NULL,'20181114175937',NULL,NULL,'2','0','1');
update "GAME"."GAME_TRANSACTION_DETAIL" set "SUPPLIER_CODE" = 'Z0033',
"SUPPLIER_PRICE" = '94' where "ID" = '334872' and "GAME_TRANS_DATE" =
'20181114175937' and "GAME_ACCOUNT" = '139123457' and "NETWAR_ACCOUNT" IS NULL
and "GAME_ROLE" IS NULL and "GROUP_ID" IS NULL and "SERVER_ID" IS NULL and
"CAMP" IS NULL and "GROUP_NAME" IS NULL and "SERVER_NAME" IS NULL and
"GAME_CODE" = '20150701a7ded3ccbc4b44b58cc5c1f9bc2210f0' and "GAME_NAME" = 'Q币'
and "BUY_NUM" = '1' and "SUPPLIER_CODE" = 'Z0067' and "SUPPLIER_PRICE" =
'2970' and "SELL_PRICE" = '2970' and "PROMOTION_TYPE" IS NULL and
"PROMOTION_TOTAL_AMOUNT" = '0' and "USER_ID" = '71100221' and "CAMPNAME" IS
NULL and "SKUSTOCKID" = '150061509296' and "SKUNAME" = '30 Q币' and "PHONENUM" =
'1326667' and "GAMELEVEL" IS NULL and "CUSTOMERTELNO" IS NULL and
"BACKENDNAME" = '模拟支付' and "GAME_TRANS_SEQ" = '364045' and "JOB_CODE" IS NULL
and "JOB_NAME" IS NULL and "GAME_PWD" IS NULL and "QQNUMBER" IS NULL and
"DELIVER_TIME" IS NULL and "OPERATOR_ID" IS NULL and "OPERATOR_NAME" IS NULL
and "GAME_CIPHER" IS NULL and "RESIDUE_MONEY" IS NULL and "MDSEDESC" IS NULL
and "GAME_EXTENSION" IS NULL and "REASON_TYPE" IS NULL and "REASON_DETAIL" IS
NULL and "CHANNEL_ORDER_SEQ" IS NULL and ROWID = 'AABZBbAAEAAA3LlAAi';
update "GAME"."GAME_DELIVER_RECORD" set "SUPPLIER_MDSECODE" = '1',
"SUPPLIER_NUM" = '30', "D_STATUS" = '02', "SUPPLIER_INPRICE" = '94',
"DELIVER_TIME" = '20181114175942', "MERCH_ACCOUNT" = 'testZ0033test' where "ID"
= '118757' and "GAME_ORDER_SEQ" = '364045' and "GAME_ORDER_TIME" =
'20181114175937' and "SKU_STOCKID" = '150061509296' and "PACKAGE_SEQ" =
'G364045-20181114175937Z0033' and "SUPPLIER_CODE" = 'Z0033' and "SUPPLIER_SEQ"
IS NULL and "SUPPLIER_MDSECODE" IS NULL and "SUPPLIER_NUM" IS NULL and
"D_STATUS" = 'NA' and "SUPPLIER_INPRICE" IS NULL and "DELIVERED_TIME" IS NULL
and "DELIVER_TIME" IS NULL and "REMARK" IS NULL and "CREATE_TIME" =
TO_DATE('14-11月-18', 'DD-MON-RR') and "UP_TIME" = TO_DATE('14-11月-18',
'DD-MON-RR') and "BUY_INFO" =
'{"businessChannelCode":"SPDB","buyNum":1,"gameAccount":"139123457","groupId":"","Ip":"10.248.192.108","mobile":"1326667","serverName":"","sellPrice":29.7,"appCode":"QB","serverId":"","groupName":"","skuStockId":"150061509296","gameCode":"20150701a7ded3ccbc4b44b58cc5c1f9bc2210f0","netWarAccount":"","channelCode":"SPDB.CW.QB"}'
and "LOGISTICS_SEQ" IS NULL and "LOGISTICS_TIME" = '20181114175937' and
"MERCH_ACCOUNT" IS NULL and "SUPPLIER_TIME" IS NULL and "PRIORITY_STATUS" = '2'
and "NOTICE_COUNT" = '0' and "SUPPLIER_PAV" = '1' and ROWID =
'AABY/cAAEAAA4GRAAD';
commit;
-
I have two problem:
why two apps can got same connection?
why two apps operate merge one transaction?
I deploy the apps on jboss not get the problem.
Thanks for any reply
--
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.o
