date:20181123

buildbot failure in on tomcat-trunk

2018-11-23 Thread buildbot

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

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] 1847326
Blamelist: markt

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

Re: Container packaging

2018-11-23 Thread Mark Thomas

On 23/11/2018 12:57, Rémy Maucherat wrote:
> On Fri, Nov 23, 2018 at 1:22 PM Mark Thomas  wrote:



>> This is a docker image, right?
>>
> 
> A bit. There are standard Tomcat images already
> https://hub.docker.com/_/tomcat/ but they are more complex.
> So this one is a Maven pom to get an embedded "standalone" Tomcat with the
> specified Tomcat components, it can be used for that (people like Maven).
> Then there is a simple dockerfile to build a custom image with it. I'll
> refine it, but I used it to redo the kubernetes testing.

So do should we be aiming to get the POM on Maven central? What about
the other files? In some sort of archive?

Separately, do we want this git repo somewhere official as far as the
ASF in concerned? I see no reason why not.

Mark

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

svn commit: r1847326 - /tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java

2018-11-23 Thread markt

Author: markt
Date: Fri Nov 23 23:08:41 2018
New Revision: 1847326

URL: http://svn.apache.org/viewvc?rev=1847326=rev
Log:
Fix IDE nags

Modified:

tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java

Modified: 
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java?rev=1847326=1847325=1847326=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
 Fri Nov 23 23:08:41 2018
@@ -350,7 +350,7 @@ public class TestEncryptInterceptor {
 dest.messageReceived(msg);
 }
 
-/**
+/*
  * This test isn't guaranteed to catch any multithreaded issues, but it
  * gives a good exercise.
  */
@@ -367,6 +367,7 @@ public class TestEncryptInterceptor {
 dest.start(Channel.SND_TX_SEQ);
 
 Runnable job = new Runnable() {
+@Override
 public void run() {
 try {
 ChannelData msg = new ChannelData(false);
@@ -456,7 +457,7 @@ public class TestEncryptInterceptor {
 private static class ValuesCaptureInterceptor
 extends ChannelInterceptorBase
 {
-private ArrayList messages = new ArrayList();
+private ArrayList messages = new ArrayList<>();
 
 @Override
 public void sendMessage(Member[] destination, ChannelMessage msg, 
InterceptorPayload payload)



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

svn commit: r1847324 [3/3] - in /tomcat/trunk/java: javax/el/ javax/servlet/http/ org/apache/catalina/authenticator/ org/apache/catalina/authenticator/jaspic/ org/apache/catalina/connector/ org/apache

2018-11-23 Thread markt

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties?rev=1847324=1847323=1847324=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties 
Fri Nov 23 23:06:23 2018
@@ -13,12 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+serverContainer.addNotAllowed=Aucun point d'entrÃ©e ne peut Ãªtre enregistrÃ© 
une fois qu'une tentative d'utilisation d'un des points d'entrÃ©e 
prÃ©cÃ©demment enregistrÃ© a Ã©tÃ© faite
 serverContainer.configuratorFail=Echec de crÃ©ation du configurateur de type 
[{0}] pour le POJO de type [{1}]
 serverContainer.duplicatePaths=Plusieurs points de terminaison ne peuvent pas 
Ãªtre dÃ©ployÃ©s vers le mÃªme chemin [{0}]: le point de terminaison existant 
Ã©tait [{1}] et le nouveau est [{2}]
 serverContainer.encoderFail=Impossible de crÃ©er un encodeur de type [{0}]
+serverContainer.endpointDeploy=Le point d''entrÃ©e de la classe [{0}] est 
dÃ©ployÃ© sur le chemin [{1}] dans le ServletContext [{2}]
+serverContainer.missingAnnotation=Impossible de dÃ©ployer la classe POJO [{0}] 
car elle n''a pas Ã©tÃ© annotÃ©e avec @ServerEndpoint
+serverContainer.missingEndpoint=Une instance d''Endpoint a Ã©tÃ© demandÃ©e 
pour le chemin [{0}] mais aucune classe d''Endpoint correspondante n''a Ã©tÃ© 
trouvÃ©e
 serverContainer.pojoDeploy=La classe d''objet (POJO) [{0}] est dÃ©ployÃ©e au 
chemin [{1}] dans le contexte [{2}]
+serverContainer.servletContextMismatch=Tentative d''enregistrer un POJO 
annotÃ© pour WebSocket au chemin [{0}] dans le ServletContext qui a un chemin 
de contexte [{1}], alors que le ServerContainer est allouÃ© au ServletContext 
avec le chemin de contexte [{2}]
 serverContainer.servletContextMissing=Aucun ServletContext n'a Ã©tÃ© spÃ©cifiÃ©
 
+upgradeUtil.incompatibleRsv=Des extensions qui ont Ã©tÃ© spÃ©cifiÃ©es ont une 
utilisation incompatible du bit RSV
+
+uriTemplate.duplicateParameter=Le paramÃ¨tre [{0}] apparaÃ®t plus d''une fois 
dans le chemin ce qui n''est pas permis
 uriTemplate.emptySegment=Le chemin [{0}] contient un ou plusieurs segments 
vide ce qui n''est pas autorisÃ©
 uriTemplate.invalidPath=Le chemin [{0}] est invalide
 uriTemplate.invalidSegment=Le segment [{0}] est invalide pour le chemin fourni 
[{1}]
@@ -27,6 +35,8 @@ wsFrameServer.bytesRead=Lu [{0}] octets
 wsFrameServer.illegalReadState=Etat de lecture inattendu [{0}]
 wsFrameServer.onDataAvailable=EntrÃ©e de mÃ©thode
 
+wsHttpUpgradeHandler.closeOnError=Fermeture de la connection WebSocket Ã  
cause d'une erreur
+wsHttpUpgradeHandler.destroyFailed=Echec de la fermeture de la WebConnection 
lors de la destruction du HttpUpgradeHandler de WebSocket
 wsHttpUpgradeHandler.noPreInit=La mÃ©thode preInit() doit Ãªtre appelÃ©e pour 
configurer le HttpUpgradeHandler de Websockets avant que le container n'appelle 
init(), cela veut habituellement dire que le Servlet qui a crÃ©e l'instance du 
WsHttpUpgradeHandler doit aussi appeler preInit()
 wsHttpUpgradeHandler.serverStop=Le serveur est en train de s'arrÃªter
 



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

svn commit: r1847324 [1/3] - in /tomcat/trunk/java: javax/el/ javax/servlet/http/ org/apache/catalina/authenticator/ org/apache/catalina/authenticator/jaspic/ org/apache/catalina/connector/ org/apache

2018-11-23 Thread markt

Author: markt
Date: Fri Nov 23 23:06:23 2018
New Revision: 1847324

URL: http://svn.apache.org/viewvc?rev=1847324=rev
Log:
Update French translations

Added:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_fr.properties
   (with props)
Modified:
tomcat/trunk/java/javax/el/LocalStrings_fr.properties
tomcat/trunk/java/javax/servlet/http/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/filters/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/ha/context/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/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/storeconfig/LocalStrings_fr.properties

tomcat/trunk/java/org/apache/catalina/tribes/group/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/jmx/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/bio/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/users/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/catalina/webresources/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/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/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/digester/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_fr.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/pojo/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=1847324=1847323=1847324=diff
==
--- tomcat/trunk/java/javax/el/LocalStrings_fr.properties (original)
+++ tomcat/trunk/java/javax/el/LocalStrings_fr.properties Fri Nov 23 23:06:23 
2018
@@ -13,13 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+beanNameELResolver.beanReadOnly=Le nom de bean [{0}] est en lecture seule
+
 elProcessor.defineFunctionInvalidClass=La

svn commit: r1847324 [2/3] - in /tomcat/trunk/java: javax/el/ javax/servlet/http/ org/apache/catalina/authenticator/ org/apache/catalina/authenticator/jaspic/ org/apache/catalina/connector/ org/apache

2018-11-23 Thread markt

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties?rev=1847324=1847323=1847324=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_fr.properties 
Fri Nov 23 23:06:23 2018
@@ -14,14 +14,19 @@
 # limitations under the License.
 
 abstractReplicatedMap.broadcast.noReplies=La diffusion (broadcast) n'a pas 
recu de rÃ©ponse, probablement un dÃ©passement du temps imparti
+abstractReplicatedMap.heartbeat.failed=Impossible d'envoyer le message 
AbstractReplicatedMap.ping
 abstractReplicatedMap.init.completed=L''initialisation de 
l''AbstractReplicatedMap[{0}] s''est terminÃ© en [{1}] ms
 abstractReplicatedMap.init.start=Initialisation de l''AbstractReplicatedMap 
avec le nom de contexte [{0}]
 abstractReplicatedMap.leftOver.ignored=Le message [{0}] a Ã©tÃ© ignorÃ©.
+abstractReplicatedMap.leftOver.pingMsg=Le dÃ©lai d''attente a Ã©tÃ© dÃ©passÃ© 
pour le message PING, le membre [{0}] a pu Ãªtre enlevÃ© de la structure de 
gestion des membres
 abstractReplicatedMap.mapMember.unavailable=Le membre [{0}] n''est pas encore 
disponible
+abstractReplicatedMap.mapMemberAdded.added=Le membre de la structure a Ã©tÃ© 
ajoutÃ©: [{0}]
 abstractReplicatedMap.mapMemberAdded.nullMember=NotifiÃ© que le membre n''est 
pas disponible dans le gestionnaire de membre: [{0}]
 abstractReplicatedMap.member.disappeared=Le membre [{0}] a disparu, les 
entrÃ©es correspondantes seront dÃ©placÃ©es sur le nouveau nÅud
+abstractReplicatedMap.ping.stateTransferredMember=L''Ã©tat du membre [{0}] est 
transfÃ©rÃ© mais il n''est pas encore disponible
 abstractReplicatedMap.ping.timeout=Le membre [{0}] dans la carte rÃ©pliquÃ©e 
[{1}] a fait un timeout lors du traitement d''un ping
 abstractReplicatedMap.relocate.complete=La relocation des entrÃ©es de la 
structure a Ã©tÃ© finie en [{0}] ms
+abstractReplicatedMap.transferState.noReplies=
 abstractReplicatedMap.unable.deserialize.MapMessage=Impossible de 
dÃ©sÃ©rialiser MapMessage
 abstractReplicatedMap.unable.diffObject=Impossible d'obtenir les diffÃ©rences 
de l'objet, il sera entiÃ¨rement rÃ©pliquÃ©
 abstractReplicatedMap.unable.get=Incapable de rÃ©pliquer les donnÃ©es pour une 
opÃ©ration AbstractReplicatedMap.get
@@ -31,12 +36,17 @@ abstractReplicatedMap.unable.remove=Impo
 abstractReplicatedMap.unable.replicate=Impossible de rÃ©pliquer les donnÃ©es
 abstractReplicatedMap.unable.retrieve=Impossible de rÃ©cupÃ©rer les objets 
distants pour les clÃ©s: [{0}]
 abstractReplicatedMap.unable.transferState=Impossible de transfÃ©rer l'Ã©tat 
de la AbstractReplicatedMap
+abstractReplicatedMap.unableApply.diff=Impossible d''appliquer le diff Ã  la 
clÃ©: [{0}]
 abstractReplicatedMap.unableSelect.backup=Impossible de choisir un nÅud de 
sauvegarde
+abstractReplicatedMap.unableSend.startMessage=
 abstractReplicatedMap.unableStart=Impossible de dÃ©marrer la structure 
rÃ©pliquÃ©e
 
 lazyReplicatedMap.unableReplicate.backup=Impossible de rÃ©pliquer la clÃ© de 
sauvegarde: [{0}]
 lazyReplicatedMap.unableReplicate.proxy=Incapable de rÃ©pliquer la clÃ© de 
proxy : [{0}] vers le secours (backup) : [{1}]. Raison : [{2}]
 
+mapMessage.deserialize.error.key=Erreur de dÃ©sÃ©rialisation de MapMessage.key
+mapMessage.deserialize.error.value=Erreur de dÃ©sÃ©rialisation de 
MapMessage.value
+
 replicatedMap.member.disappeared=Le membre [{0}] a disparu, les entrÃ©es 
correspondantes seront dÃ©placÃ©es sur un nouveau nÅud
 replicatedMap.relocate.complete=La relocation des entrÃ©es de la collection a 
Ã©tÃ© accomplie en [{0}] ms
 replicatedMap.unable.relocate=Impossible de dÃ©placer [{0}] sur un nouveau 
noeud auxiliaire.

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_fr.properties?rev=1847324=1847323=1847324=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_fr.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_fr.properties
 Fri Nov 23 23:06:23 2018
@@ -15,7 +15,10 @@
 
 PooledSender.senderDisconnectFail=Impossible de se dÃ©connecter de l'envoyeur
 
+pooledSender.closed.queue=La queue est fermÃ©e
+
 receiverBase.bind.failed=Ãchec d''attachement en Ã©coute de la rÃ©plication Ã 
 l''adresse [{0}]
+receiverBase.socket.bind=
 receiverBase.udp.bind=Le socket serveur receveur est associÃ© avec [{0}]
 receiverBase.unable.bind=Impossible d''attacher la socket serveur Ã  [{0}], 
cela provoque une erreur.
 receiverBase.unable.bind.udp=Impossible d''associer le socket UDP Ã  [{0}], 
propagation

Re: svn commit: r1847318 - in /tomcat/trunk: java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java w

2018-11-23 Thread Mark Thomas

On 23/11/2018 21:18, schu...@apache.org wrote:
> Author: schultz
> Date: Fri Nov 23 21:18:48 2018
> New Revision: 1847318
> 
> URL: http://svn.apache.org/viewvc?rev=1847318=rev
> Log:
> Fix EncryptInterceptor to be thread-safe.
> Add multi-threaded unit test.

Calling setProviderName() while the Interceptor is running may have some
interesting side-effects. I'd recommend caching it during initInternal().

You can cache the result of cipher.getBlockSize() and then take
advantage of that to reduce the time the Cipher objects are out of the
pool. For example, in decrypt you can then construct the IV before you
obtain the cipher object. Likewise in encrypt you can reduce the time
both the SecureRandom and Cipher are out of the pool.

There is a trade-off here between clarity of code and efficiency. I
don't have any hard numbers to support my views (so they are probably
wrong) but my instinct would always be to reduce the time the objects
are out of the pool as much as practical.

I think the first point should be addressed. The remaining points are
certainly debatable so feel free to follow your own instincts on those.

Mark

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

svn commit: r1847323 - /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java

2018-11-23 Thread markt

Author: markt
Date: Fri Nov 23 21:43:15 2018
New Revision: 1847323

URL: http://svn.apache.org/viewvc?rev=1847323=rev
Log:
Remove unnecessary throws

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java?rev=1847323=1847322=1847323=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
 Fri Nov 23 21:43:15 2018
@@ -329,7 +329,7 @@ public class EncryptInterceptor extends
 cipherPool.offer(cipher);
 }
 
-private SecureRandom getRandom() throws GeneralSecurityException {
+private SecureRandom getRandom() {
 SecureRandom random = randomPool.poll();
 
 if(null == random) {



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

svn commit: r1847322 - /tomcat/trunk/res/findbugs/filter-false-positives.xml

2018-11-23 Thread markt

Author: markt
Date: Fri Nov 23 21:35:00 2018
New Revision: 1847322

URL: http://svn.apache.org/viewvc?rev=1847322=rev
Log:
Silence a false positive

Modified:
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1847322=1847321=1847322=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Fri Nov 23 21:35:00 
2018
@@ -549,6 +549,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 



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

svn commit: r1847321 - /tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java

2018-11-23 Thread markt

Author: markt
Date: Fri Nov 23 21:34:41 2018
New Revision: 1847321

URL: http://svn.apache.org/viewvc?rev=1847321=rev
Log:
Make code easier to check for correctness

Modified:
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1847321=1847320=1847321=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Fri Nov 
23 21:34:41 2018
@@ -82,9 +82,9 @@ public class JspServletWrapper {
 // Logger
 private final Log log = LogFactory.getLog(JspServletWrapper.class); // 
must not be static
 
-private Servlet theServlet;
+private volatile Servlet theServlet;
 private final String jspUri;
-private Class tagHandlerClass;
+private volatile Class tagHandlerClass;
 private final JspCompilationContext ctxt;
 private long available = 0L;
 private final ServletConfig config;
@@ -281,7 +281,6 @@ public class JspServletWrapper {
 synchronized (this) {
 if (getReloadInternal() || tagHandlerClass == null) {
 tagHandlerClass = ctxt.load();
-// Volatile 'reload' forces in order write of 
'tagHandlerClass'
 reload = false;
 }
 }



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

svn commit: r1847320 - /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java

2018-11-23 Thread schultz

Author: schultz
Date: Fri Nov 23 21:25:37 2018
New Revision: 1847320

URL: http://svn.apache.org/viewvc?rev=1847320=rev
Log:
Simplify. Re-name method that no longer actually initializes any ciphers.

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java?rev=1847320=1847319=1847320=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
 Fri Nov 23 21:25:37 2018
@@ -73,12 +73,7 @@ public class EncryptInterceptor extends
 @Override
 public void start(int svc) throws ChannelException {
 if(Channel.SND_TX_SEQ == (svc & Channel.SND_TX_SEQ)) {
-try {
-initCiphers();
-} catch (GeneralSecurityException gse) {
-log.fatal(sm.getString("encryptInterceptor.init.failed"));
-throw new 
ChannelException(sm.getString("encryptInterceptor.init.failed"), gse);
-}
+initInternal();
 }
 
 super.start(svc);
@@ -274,7 +269,7 @@ public class EncryptInterceptor extends
 return algorithmName;
 }
 
-private void initCiphers() throws GeneralSecurityException {
+private void initInternal() {
 if(null == getEncryptionKey())
 throw new 
IllegalStateException(sm.getString("encryptInterceptor.key.required"));
 



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

svn commit: r1847319 - /tomcat/trunk/test/org/apache/coyote/http2/TestAsync.java

2018-11-23 Thread markt

Author: markt
Date: Fri Nov 23 21:23:14 2018
New Revision: 1847319

URL: http://svn.apache.org/viewvc?rev=1847319=rev
Log:
Add some debug code to help diagnose intermittent test failures

Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestAsync.java

Modified: tomcat/trunk/test/org/apache/coyote/http2/TestAsync.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestAsync.java?rev=1847319=1847318=1847319=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestAsync.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestAsync.java Fri Nov 23 
21:23:14 2018
@@ -153,9 +153,11 @@ public class TestAsync extends Http2Test
 // Body
 
 if (!connectionUnlimited || !streamUnlimited) {
-
+// TODO Remove debug code
+System.out.println("Read loop 1");
 while (output.getBytesRead() < startingWindowSize) {
 parser.readFrame(true);
+System.out.println(output.getBytesRead());
 }
 
 // Check that the right number of bytes were received
@@ -171,8 +173,11 @@ public class TestAsync extends Http2Test
 sendWindowUpdate(0, windowSizeIncrease);
 }
 
+// TODO Remove debug code
+System.out.println("Read loop 2");
 while (output.getBytesRead() < startingWindowSize + 
windowSizeIncrease) {
 parser.readFrame(true);
+System.out.println(output.getBytesRead());
 }
 
 // Check that the right number of bytes were received
@@ -188,8 +193,11 @@ public class TestAsync extends Http2Test
 }
 }
 
+// TODO Remove debug code
+System.out.println("Read loop 3");
 while (!output.getTrace().endsWith("3-EndOfStream\n")) {
 parser.readFrame(true);
+System.out.println(output.getBytesRead());
 }
 
 // Check that the right number of bytes were received



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

svn commit: r1847318 - in /tomcat/trunk: java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java webap

2018-11-23 Thread schultz

Author: schultz
Date: Fri Nov 23 21:18:48 2018
New Revision: 1847318

URL: http://svn.apache.org/viewvc?rev=1847318=rev
Log:
Fix EncryptInterceptor to be thread-safe.
Add multi-threaded unit test.

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java

tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestEncryptInterceptor.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java?rev=1847318=1847317=1847318=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
 Fri Nov 23 21:18:48 2018
@@ -17,13 +17,10 @@
 package org.apache.catalina.tribes.group.interceptors;
 
 import java.security.GeneralSecurityException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
 import java.security.SecureRandom;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
-import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
@@ -61,10 +58,14 @@ public class EncryptInterceptor extends
 private String encryptionAlgorithm = DEFAULT_ENCRYPTION_ALGORITHM;
 private byte[] encryptionKeyBytes;
 private String encryptionKeyString;
-private SecretKeySpec secretKey;
 
-private Cipher encryptionCipher;
-private Cipher decryptionCipher;
+/**
+ * This is the name of the core encryption algorithm e.g. AES.
+ */
+private String algorithmName;
+private SecretKeySpec secretKey;
+private ConcurrentLinkedQueue cipherPool;
+private ConcurrentLinkedQueue randomPool;
 
 public EncryptInterceptor() {
 }
@@ -84,6 +85,17 @@ public class EncryptInterceptor extends
 }
 
 @Override
+public void stop(int svc) throws ChannelException {
+if(Channel.SND_TX_SEQ == (svc & Channel.SND_TX_SEQ)) {
+// Individual Cipher and SecureRandom objects need no explicit 
teardown
+cipherPool.clear();
+randomPool.clear();
+}
+
+super.stop(svc);
+}
+
+@Override
 public void sendMessage(Member[] destination, ChannelMessage msg, 
InterceptorPayload payload)
 throws ChannelException {
 try {
@@ -101,18 +113,9 @@ public class EncryptInterceptor extends
 
 super.sendMessage(destination, msg, payload);
 
-} catch (IllegalBlockSizeException ibse) {
-log.error(sm.getString("encryptInterceptor.encrypt.failed"));
-throw new ChannelException(ibse);
-} catch (BadPaddingException bpe) {
-log.error(sm.getString("encryptInterceptor.encrypt.failed"));
-throw new ChannelException(bpe);
-} catch (InvalidKeyException ike) {
+} catch (GeneralSecurityException gse) {
 log.error(sm.getString("encryptInterceptor.encrypt.failed"));
-throw new ChannelException(ike);
-} catch (InvalidAlgorithmParameterException iape) {
-log.error(sm.getString("encryptInterceptor.encrypt.failed"));
-throw new ChannelException(iape);
+throw new ChannelException(gse);
 }
 }
 
@@ -130,14 +133,8 @@ public class EncryptInterceptor extends
 xbb.append(data, 0, data.length);
 
 super.messageReceived(msg);
-} catch (IllegalBlockSizeException ibse) {
-log.error(sm.getString("encryptInterceptor.decrypt.failed"), ibse);
-} catch (BadPaddingException bpe) {
-log.error(sm.getString("encryptInterceptor.decrypt.failed"), bpe);
-} catch (InvalidKeyException ike) {
-log.error(sm.getString("encryptInterceptor.decrypt.failed"), ike);
-} catch (InvalidAlgorithmParameterException iape) {
-log.error(sm.getString("encryptInterceptor.decrypt.failed"), iape);
+} catch (GeneralSecurityException gse) {
+log.error(sm.getString("encryptInterceptor.decrypt.failed"), gse);
 }
 }
 
@@ -261,6 +258,22 @@ public class EncryptInterceptor extends
 return providerName;
 }
 
+private void setSecretKey(SecretKeySpec secretKey) {
+this.secretKey = secretKey;
+}
+
+private SecretKeySpec getSecretKey() {
+return secretKey;
+}
+
+private void setAlgorithmName(String algorithm) {
+algorithmName = algorithm;
+}
+
+private String getAlgorithmName() {
+return algorithmName;
+}
+
 private void initCiphers() throws

buildbot success in on tomcat-trunk

2018-11-23 Thread buildbot

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

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] 1847310
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: r1847310 - /tomcat/trunk/java/org/apache/coyote/http2/Stream.java

2018-11-23 Thread markt

Author: markt
Date: Fri Nov 23 19:50:33 2018
New Revision: 1847310

URL: http://svn.apache.org/viewvc?rev=1847310=rev
Log:
Simplify code

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Stream.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1847310=1847309=1847310=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Fri Nov 23 19:50:33 
2018
@@ -733,7 +733,8 @@ class Stream extends AbstractStream impl
 throw new IllegalStateException(
 sm.getString("stream.closed", getConnectionId(), 
getIdentifier()));
 }
-int totalThisTime = 0;
+// chunk is always fully written
+int result = chunk.remaining();
 if (writeBuffer.isEmpty()) {
 int chunkLimit = chunk.limit();
 while (chunk.remaining() > 0) {
@@ -741,23 +742,20 @@ class Stream extends AbstractStream impl
 chunk.limit(chunk.position() + thisTime);
 buffer.put(chunk);
 chunk.limit(chunkLimit);
-totalThisTime += thisTime;
 if (chunk.remaining() > 0 && !buffer.hasRemaining()) {
 // Only flush if we have more data to write and the 
buffer
 // is full
 if (flush(true, coyoteResponse.getWriteListener() == 
null)) {
-totalThisTime += chunk.remaining();
 writeBuffer.add(chunk);
 break;
 }
 }
 }
 } else {
-totalThisTime = chunk.remaining();
 writeBuffer.add(chunk);
 }
-written += totalThisTime;
-return totalThisTime;
+written += result;
+return result;
 }
 
 final synchronized boolean flush(boolean block) throws IOException {



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

Re: Tagging Tomcat Native 1.2.19

2018-11-23 Thread Rainer Jung


One correction: using openssl s_client correctly does not hang.

Only curl build with OpenSSL hangs. I tried my old curl builds and it 
seems it starts to hang with curl 7.24.0. Version 7.23.1 does not hang. 
The OpenSSL lib version on the client side does not seem to matter.


I'll do some more debugging (eg. check whether APR also hangs or only 
NIO+native) but eventually this might end up being a curl bug.


Regards,

Rainer

Am 23.11.2018 um 17:19 schrieb Rainer Jung:
Short addition: When using Apache httpd 2.4.37 build with OpenSSL 
1.1.1a, there are no hangs with TLS 1.0. So it seems we have a relevant 
difference in our server-side use of the OpenSSL API. Easy to reproduce, 
but not easy to debug ...


Regards,

Rainer

Am 23.11.2018 um 15:50 schrieb Rainer Jung:

Am 23.11.2018 um 14:54 schrieb Mark Thomas:

Hi all,

Given bugs 62662 and  62944, I plan to tag 1.2.19 early next week with a
view to including 1.2.19 in the next round of Tomcat releases.


I observed a problem with TLS 1.0 under the following conditions:

- using 9.0.13 with NIO plus tcnative 1.2 head build against OpenSSL 
1.1.1a
- in combination with clients that also are based on OpenSSL (but even 
for older OpenSSL version like 1.0.2) and try to use TLS 1.0. The 
handshake works, but then the request times out after a minute. 
Observed for curl and "openssl s_client".


 From the server Logs:

2018-11-23 14:48:47,494 42891 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.modeler.modules.MbeansDescriptorsIntrospectionSource 
(MbeansDescriptorsIntrospectionSource.java:326) - Introspected 
attribute currentUri public java.lang.String 
org.apache.coyote.RequestInfo.getCurrentUri() null
2018-11-23 14:48:47,494 42891 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.modeler.modules.MbeansDescriptorsIntrospectionSource 
(MbeansDescriptorsIntrospectionSource.java:326) - Introspected 
attribute lastRequestProcessingTime public long 
org.apache.coyote.RequestInfo.getLastRequestProcessingTime() public 
void org.apache.coyote.RequestInfo.setLastRequestProcessingTime(long)
2018-11-23 14:48:47,494 42891 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.modeler.modules.MbeansDescriptorsIntrospectionSource 
(MbeansDescriptorsIntrospectionSource.java:326) - Introspected 
attribute errorCount public int 
org.apache.coyote.RequestInfo.getErrorCount() public void 
org.apache.coyote.RequestInfo.setErrorCount(int)
2018-11-23 14:48:47,494 42891 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.modeler.modules.MbeansDescriptorsIntrospectionSource 
(MbeansDescriptorsIntrospectionSource.java:359) - Setting name: 
org.apache.coyote.RequestInfo
2018-11-23 14:48:47,495 42892 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.modeler.BaseModelMBean 
(BaseModelMBean.java:887) - preRegister 
org.apache.coyote.RequestInfo@5750c763 
Catalina:type=RequestProcessor,worker="https-openssl-nio-8143",name=HttpRequest1 

2018-11-23 14:48:47,496 42893 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.net.SocketWrapperBase 
(SocketWrapperBase.java:333) - Socket: 
[org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper@5761c8c:org.apache.tomcat.util.net.SecureNioChannel@87dd2cc:java.nio.channels.SocketChannel[connected 
local=/0:0:0:0:0:0:0:1:8143 remote=/0:0:0:0:0:0:0:1:42343]], Read from 
buffer: [0]
2018-11-23 14:48:47,497 42894 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.net.NioEndpoint (NioEndpoint.java:1144) - 
Socket: 
[org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper@5761c8c:org.apache.tomcat.util.net.SecureNioChannel@87dd2cc:java.nio.channels.SocketChannel[connected 
local=/0:0:0:0:0:0:0:1:8143 remote=/0:0:0:0:0:0:0:1:42343]], Read 
direct from socket: [0]
2018-11-23 14:48:47,498 42895 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.coyote.http11.Http11Processor 
(AbstractProcessorLight.java:74) - Socket: 
[org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper@5761c8c:org.apache.tomcat.util.net.SecureNioChannel@87dd2cc:java.nio.channels.SocketChannel[connected 
local=/0:0:0:0:0:0:0:1:8143 remote=/0:0:0:0:0:0:0:1:42343]], Status 
in: [OPEN_READ], State out: [OPEN]
2018-11-23 14:48:47,498 42895 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.coyote.http11.Http11NioProtocol (AbstractProtocol.java:981) 
- Pushed Processor [org.apache.coyote.http11.Http11Processor@54ccb89e]


... hang ...

2018-11-23 14:49:47,579 102976 DEBUG [https-openssl-nio-8143-exec-3] 
org.apache.coyote.http11.Http11NioProtocol (AbstractProtocol.java:697) 
- Processing socket 
[org.apache.tomcat.util.net.SecureNioChannel@87dd2cc:java.nio.channels.SocketChannel[connected 
local=/0:0:0:0:0:0:0:1:8143 remote=/0:0:0:0:0:0:0:1:42343]] with 
status [ERROR]
2018-11-23 14:49:47,579 102976 DEBUG [https-openssl-nio-8143-exec-3] 
org.apache.coyote.http11.Http11NioProtocol (AbstractProtocol.java:709) 
- Found processor [null] for socket

Re: Tagging Tomcat Native 1.2.19

2018-11-23 Thread Rainer Jung

Short addition: When using Apache httpd 2.4.37 build with OpenSSL 
1.1.1a, there are no hangs with TLS 1.0. So it seems we have a relevant 
difference in our server-side use of the OpenSSL API. Easy to reproduce, 
but not easy to debug ...


Regards,

Rainer

Am 23.11.2018 um 15:50 schrieb Rainer Jung:

Am 23.11.2018 um 14:54 schrieb Mark Thomas:

Hi all,

Given bugs 62662 and  62944, I plan to tag 1.2.19 early next week with a
view to including 1.2.19 in the next round of Tomcat releases.


I observed a problem with TLS 1.0 under the following conditions:

- using 9.0.13 with NIO plus tcnative 1.2 head build against OpenSSL 1.1.1a
- in combination with clients that also are based on OpenSSL (but even 
for older OpenSSL version like 1.0.2) and try to use TLS 1.0. The 
handshake works, but then the request times out after a minute. Observed 
for curl and "openssl s_client".


 From the server Logs:

2018-11-23 14:48:47,494 42891 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.modeler.modules.MbeansDescriptorsIntrospectionSource 
(MbeansDescriptorsIntrospectionSource.java:326) - Introspected attribute 
currentUri public java.lang.String 
org.apache.coyote.RequestInfo.getCurrentUri() null
2018-11-23 14:48:47,494 42891 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.modeler.modules.MbeansDescriptorsIntrospectionSource 
(MbeansDescriptorsIntrospectionSource.java:326) - Introspected attribute 
lastRequestProcessingTime public long 
org.apache.coyote.RequestInfo.getLastRequestProcessingTime() public void 
org.apache.coyote.RequestInfo.setLastRequestProcessingTime(long)
2018-11-23 14:48:47,494 42891 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.modeler.modules.MbeansDescriptorsIntrospectionSource 
(MbeansDescriptorsIntrospectionSource.java:326) - Introspected attribute 
errorCount public int org.apache.coyote.RequestInfo.getErrorCount() 
public void org.apache.coyote.RequestInfo.setErrorCount(int)
2018-11-23 14:48:47,494 42891 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.modeler.modules.MbeansDescriptorsIntrospectionSource 
(MbeansDescriptorsIntrospectionSource.java:359) - Setting name: 
org.apache.coyote.RequestInfo
2018-11-23 14:48:47,495 42892 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.modeler.BaseModelMBean (BaseModelMBean.java:887) 
- preRegister org.apache.coyote.RequestInfo@5750c763 
Catalina:type=RequestProcessor,worker="https-openssl-nio-8143",name=HttpRequest1 

2018-11-23 14:48:47,496 42893 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.net.SocketWrapperBase 
(SocketWrapperBase.java:333) - Socket: 
[org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper@5761c8c:org.apache.tomcat.util.net.SecureNioChannel@87dd2cc:java.nio.channels.SocketChannel[connected 
local=/0:0:0:0:0:0:0:1:8143 remote=/0:0:0:0:0:0:0:1:42343]], Read from 
buffer: [0]
2018-11-23 14:48:47,497 42894 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.net.NioEndpoint (NioEndpoint.java:1144) - Socket: 
[org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper@5761c8c:org.apache.tomcat.util.net.SecureNioChannel@87dd2cc:java.nio.channels.SocketChannel[connected 
local=/0:0:0:0:0:0:0:1:8143 remote=/0:0:0:0:0:0:0:1:42343]], Read direct 
from socket: [0]
2018-11-23 14:48:47,498 42895 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.coyote.http11.Http11Processor 
(AbstractProcessorLight.java:74) - Socket: 
[org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper@5761c8c:org.apache.tomcat.util.net.SecureNioChannel@87dd2cc:java.nio.channels.SocketChannel[connected 
local=/0:0:0:0:0:0:0:1:8143 remote=/0:0:0:0:0:0:0:1:42343]], Status in: 
[OPEN_READ], State out: [OPEN]
2018-11-23 14:48:47,498 42895 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.coyote.http11.Http11NioProtocol (AbstractProtocol.java:981) - 
Pushed Processor [org.apache.coyote.http11.Http11Processor@54ccb89e]


... hang ...

2018-11-23 14:49:47,579 102976 DEBUG [https-openssl-nio-8143-exec-3] 
org.apache.coyote.http11.Http11NioProtocol (AbstractProtocol.java:697) - 
Processing socket 
[org.apache.tomcat.util.net.SecureNioChannel@87dd2cc:java.nio.channels.SocketChannel[connected 
local=/0:0:0:0:0:0:0:1:8143 remote=/0:0:0:0:0:0:0:1:42343]] with status 
[ERROR]
2018-11-23 14:49:47,579 102976 DEBUG [https-openssl-nio-8143-exec-3] 
org.apache.coyote.http11.Http11NioProtocol (AbstractProtocol.java:709) - 
Found processor [null] for socket 
[org.apache.tomcat.util.net.SecureNioChannel@87dd2cc:java.nio.channels.SocketChannel[connected 
local=/0:0:0:0:0:0:0:1:8143 remote=/0:0:0:0:0:0:0:1:42343]]
2018-11-23 14:49:47,581 102978 DEBUG [https-openssl-nio-8143-exec-3] 
org.apache.tomcat.util.threads.LimitLatch (LimitLatch.java:128) - 
Counting down[https-openssl-nio-8143-exec-3] latch=1
2018-11-23 14:49:47,581 102978 DEBUG [https-openssl-nio-8143-exec-3] 
org.apache.tomcat.util.net.NioEndpoint (NioEndpoint.java:475) - Socket:

Re: Tagging Tomcat Native 1.2.19

2018-11-23 Thread Rainer Jung


Am 23.11.2018 um 14:54 schrieb Mark Thomas:

Hi all,

Given bugs 62662 and  62944, I plan to tag 1.2.19 early next week with a
view to including 1.2.19 in the next round of Tomcat releases.


I observed a problem with TLS 1.0 under the following conditions:

- using 9.0.13 with NIO plus tcnative 1.2 head build against OpenSSL 1.1.1a
- in combination with clients that also are based on OpenSSL (but even 
for older OpenSSL version like 1.0.2) and try to use TLS 1.0. The 
handshake works, but then the request times out after a minute. Observed 
for curl and "openssl s_client".


From the server Logs:

2018-11-23 14:48:47,494 42891 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.modeler.modules.MbeansDescriptorsIntrospectionSource 
(MbeansDescriptorsIntrospectionSource.java:326) - Introspected attribute 
currentUri public java.lang.String 
org.apache.coyote.RequestInfo.getCurrentUri() null
2018-11-23 14:48:47,494 42891 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.modeler.modules.MbeansDescriptorsIntrospectionSource 
(MbeansDescriptorsIntrospectionSource.java:326) - Introspected attribute 
lastRequestProcessingTime public long 
org.apache.coyote.RequestInfo.getLastRequestProcessingTime() public void 
org.apache.coyote.RequestInfo.setLastRequestProcessingTime(long)
2018-11-23 14:48:47,494 42891 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.modeler.modules.MbeansDescriptorsIntrospectionSource 
(MbeansDescriptorsIntrospectionSource.java:326) - Introspected attribute 
errorCount public int org.apache.coyote.RequestInfo.getErrorCount() 
public void org.apache.coyote.RequestInfo.setErrorCount(int)
2018-11-23 14:48:47,494 42891 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.modeler.modules.MbeansDescriptorsIntrospectionSource 
(MbeansDescriptorsIntrospectionSource.java:359) - Setting name: 
org.apache.coyote.RequestInfo
2018-11-23 14:48:47,495 42892 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.modeler.BaseModelMBean (BaseModelMBean.java:887) 
- preRegister org.apache.coyote.RequestInfo@5750c763 
Catalina:type=RequestProcessor,worker="https-openssl-nio-8143",name=HttpRequest1
2018-11-23 14:48:47,496 42893 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.net.SocketWrapperBase 
(SocketWrapperBase.java:333) - Socket: 
[org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper@5761c8c:org.apache.tomcat.util.net.SecureNioChannel@87dd2cc:java.nio.channels.SocketChannel[connected 
local=/0:0:0:0:0:0:0:1:8143 remote=/0:0:0:0:0:0:0:1:42343]], Read from 
buffer: [0]
2018-11-23 14:48:47,497 42894 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.tomcat.util.net.NioEndpoint (NioEndpoint.java:1144) - Socket: 
[org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper@5761c8c:org.apache.tomcat.util.net.SecureNioChannel@87dd2cc:java.nio.channels.SocketChannel[connected 
local=/0:0:0:0:0:0:0:1:8143 remote=/0:0:0:0:0:0:0:1:42343]], Read direct 
from socket: [0]
2018-11-23 14:48:47,498 42895 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.coyote.http11.Http11Processor 
(AbstractProcessorLight.java:74) - Socket: 
[org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper@5761c8c:org.apache.tomcat.util.net.SecureNioChannel@87dd2cc:java.nio.channels.SocketChannel[connected 
local=/0:0:0:0:0:0:0:1:8143 remote=/0:0:0:0:0:0:0:1:42343]], Status in: 
[OPEN_READ], State out: [OPEN]
2018-11-23 14:48:47,498 42895 DEBUG [https-openssl-nio-8143-exec-2] 
org.apache.coyote.http11.Http11NioProtocol (AbstractProtocol.java:981) - 
Pushed Processor [org.apache.coyote.http11.Http11Processor@54ccb89e]


... hang ...

2018-11-23 14:49:47,579 102976 DEBUG [https-openssl-nio-8143-exec-3] 
org.apache.coyote.http11.Http11NioProtocol (AbstractProtocol.java:697) - 
Processing socket 
[org.apache.tomcat.util.net.SecureNioChannel@87dd2cc:java.nio.channels.SocketChannel[connected 
local=/0:0:0:0:0:0:0:1:8143 remote=/0:0:0:0:0:0:0:1:42343]] with status 
[ERROR]
2018-11-23 14:49:47,579 102976 DEBUG [https-openssl-nio-8143-exec-3] 
org.apache.coyote.http11.Http11NioProtocol (AbstractProtocol.java:709) - 
Found processor [null] for socket 
[org.apache.tomcat.util.net.SecureNioChannel@87dd2cc:java.nio.channels.SocketChannel[connected 
local=/0:0:0:0:0:0:0:1:8143 remote=/0:0:0:0:0:0:0:1:42343]]
2018-11-23 14:49:47,581 102978 DEBUG [https-openssl-nio-8143-exec-3] 
org.apache.tomcat.util.threads.LimitLatch (LimitLatch.java:128) - 
Counting down[https-openssl-nio-8143-exec-3] latch=1
2018-11-23 14:49:47,581 102978 DEBUG [https-openssl-nio-8143-exec-3] 
org.apache.tomcat.util.net.NioEndpoint (NioEndpoint.java:475) - Socket: 
[org.apache.tomcat.util.net.SecureNioChannel@87dd2cc:java.nio.channels.SocketChannel[closed]] 
closed


The client shows the handshake t finish, but then the actual 
request/response exchange hangs.


The problem does not occur when using platform curl on RHEL (based on 
NSS instead of OpenSSL) and also not when using a Java 8 client. It also 
does not occur, when

Re: Tagging Tomcat Native 1.2.19

2018-11-23 Thread Rémy Maucherat

On Fri, Nov 23, 2018 at 2:54 PM Mark Thomas  wrote:

> Hi all,
>
> Given bugs 62662 and  62944, I plan to tag 1.2.19 early next week with a
> view to including 1.2.19 in the next round of Tomcat releases.
>

+1

Rémy

svn commit: r1847270 - /tomcat/native/trunk/xdocs/miscellaneous/changelog.xml

2018-11-23 Thread markt

Author: markt
Date: Fri Nov 23 14:01:14 2018
New Revision: 1847270

URL: http://svn.apache.org/viewvc?rev=1847270=rev
Log:
Add BZ 62892 to change log

Modified:
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1847270=1847269=1847270=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Fri Nov 23 14:01:14 
2018
@@ -37,6 +37,9 @@
 
   
 
+  62862: Fix memory leaks in OCSP handling. (jfclere)
+
+
   62944: Fix copy/paste error that prevented TLS 1.0 and TLS 1.1
   from being used if TLS 1.3 was available. Patch provided by Dean Rasheed.
   (markt)



-
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

2018-11-23 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

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

Tagging Tomcat Native 1.2.19

2018-11-23 Thread Mark Thomas

Hi all,

Given bugs 62662 and  62944, I plan to tag 1.2.19 early next week with a
view to including 1.2.19 in the next round of Tomcat releases.

Mark

-
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

2018-11-23 Thread buildbot

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

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] 1847260
Blamelist: remm

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

svn commit: r1847260 - /tomcat/trunk/java/org/apache/catalina/core/StandardService.java

2018-11-23 Thread remm

Author: remm
Date: Fri Nov 23 12:58:58 2018
New Revision: 1847260

URL: http://svn.apache.org/viewvc?rev=1847260=rev
Log:
Fix thread configuration for the utility threads.

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardService.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=1847260=1847259=1847260=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Fri Nov 23 
12:58:58 2018
@@ -96,7 +96,7 @@ public class StandardService extends Lif
 /**
  * The number of threads available to process utility tasks in this 
service.
  */
-protected int utilityThreads = 0;
+protected int utilityThreads = 1;
 
 /**
  * The utility threads daemon flag.
@@ -235,14 +235,14 @@ public class StandardService extends Lif
 /**
  * Handles the special values.
  */
-private int getUtilityThreadsInternal() {
-int result = getUtilityThreads();
+private static int getUtilityThreadsInternal(int utilityThreads) {
+int result = utilityThreads;
 if (result > 0) {
 return result;
 }
 
-// Zero == Runtime.getRuntime().availableProcessors()
-// -ve  == Runtime.getRuntime().availableProcessors() + value
+// Zero == Runtime.getRuntime().availableProcessors() / 2
+// -ve  == Runtime.getRuntime().availableProcessors() / 2 + value
 // These two are the same
 result = (Runtime.getRuntime().availableProcessors() / 2) + result;
 if (result < 1) {
@@ -253,7 +253,7 @@ public class StandardService extends Lif
 
 @Override
 public void setUtilityThreads(int utilityThreads) {
-if (utilityThreads < getUtilityThreadsInternal()) {
+if (getUtilityThreadsInternal(utilityThreads) < 
getUtilityThreadsInternal(this.utilityThreads)) {
 return;
 }
 int oldUtilityThreads = this.utilityThreads;
@@ -261,19 +261,19 @@ public class StandardService extends Lif
 
 // Use local copies to ensure thread safety
 if (oldUtilityThreads != utilityThreads && utilityExecutor != null) {
-reconfigureUtilityExecutor(getUtilityThreadsInternal());
+
reconfigureUtilityExecutor(getUtilityThreadsInternal(utilityThreads));
 }
 }
 
 
 private synchronized void reconfigureUtilityExecutor(int threads) {
+// The ScheduledThreadPoolExecutor doesn't use MaximumPoolSize, only 
CorePoolSize is available
 if (utilityExecutor != null) {
-utilityExecutor.setMaximumPoolSize(threads);
+utilityExecutor.setCorePoolSize(threads);
 } else {
 ScheduledThreadPoolExecutor scheduledThreadPoolExecutor =
-new ScheduledThreadPoolExecutor(1,
+new ScheduledThreadPoolExecutor(threads,
 new TaskThreadFactory(getName() + "-utility-", 
utilityThreadsAsDaemon, Thread.NORM_PRIORITY));
-scheduledThreadPoolExecutor.setMaximumPoolSize(threads);
 scheduledThreadPoolExecutor.setKeepAliveTime(10, TimeUnit.SECONDS);
 scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true);
 
scheduledThreadPoolExecutor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
@@ -613,7 +613,7 @@ public class StandardService extends Lif
 
 super.initInternal();
 
-reconfigureUtilityExecutor(getUtilityThreadsInternal());
+reconfigureUtilityExecutor(getUtilityThreadsInternal(utilityThreads));
 register(utilityExecutor, "type=UtilityExecutor");
 
 if (engine != null) {



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

Re: Container packaging

2018-11-23 Thread Rémy Maucherat

On Fri, Nov 23, 2018 at 1:22 PM Mark Thomas  wrote:

> On 22/11/2018 15:45, Rémy Maucherat wrote:
> > Hi,
> >
> > After a bit of experimenting, the docker image works well, and is nicer
> > (IMO) to configure and customize with the embedded updates from 9.0.14. I
> > have verified that Kubernetes based discovery works without being too
> > difficult to configure. Custom code and components can be plugged in
> easily
> > as anything in src/main/java will get compiled and packaged in the jar.
> >
> > https://github.com/rmaucher/tomcat-maven
> >
> > Now, distributing this sort of package is "easy" but is usually done
> with a
> > standalone git repo like this one. Where could I put this packaging
> instead
> > since we probably cannot do that in Tomcat-land ?
>
> This is a docker image, right?
>

A bit. There are standard Tomcat images already
https://hub.docker.com/_/tomcat/ but they are more complex.
So this one is a Maven pom to get an embedded "standalone" Tomcat with the
specified Tomcat components, it can be used for that (people like Maven).
Then there is a simple dockerfile to build a custom image with it. I'll
refine it, but I used it to redo the kubernetes testing.

>
> It should be possible to have an ASF git repo for this. Am I missing
> some blocking issue?
>
> How about Docker Hub for the output?
>

Rémy

[Bug 62944] Enabling TLSv1.3 with the APR connector breaks TLSv1.0 and TLSv1.1

2018-11-23 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Mark Thomas  ---
Thanks for the report and the patch. I've applied the patch for 1.2.19 onwards.

I'll start looking at getting a release out with a view to picking up this fix
in the next round of Tomcat releases.

-- 
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: r1847259 - in /tomcat/native/trunk: native/src/sslcontext.c xdocs/miscellaneous/changelog.xml

2018-11-23 Thread markt

Author: markt
Date: Fri Nov 23 12:43:07 2018
New Revision: 1847259

URL: http://svn.apache.org/viewvc?rev=1847259=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62944
Fix copy/paste error that prevented TLS 1.0 and TLS 1.1 from being used if TLS 
1.3 was available.
Patch provided by Dean Rasheed.

Modified:
tomcat/native/trunk/native/src/sslcontext.c
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/trunk/native/src/sslcontext.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1847259=1847258=1847259=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Fri Nov 23 12:43:07 2018
@@ -287,8 +287,7 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
 #ifdef HAVE_TLSV1_3
 if (prot == TLS1_3_VERSION && protocol & SSL_PROTOCOL_TLSV1_2) {
 prot = TLS1_2_VERSION;
-} else
-/* NOTE the dangling else above: take care to preserve it */
+}
 #endif
 if (prot == TLS1_2_VERSION && protocol & SSL_PROTOCOL_TLSV1_1) {
 prot = TLS1_1_VERSION;

Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1847259=1847258=1847259=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Fri Nov 23 12:43:07 
2018
@@ -34,6 +34,15 @@
   This is the Changelog for Tomcat Native 1.2.
   
 
+
+  
+
+  62944: Fix copy/paste error that prevented TLS 1.0 and TLS 1.1
+  from being used if TLS 1.3 was available. Patch provided by Dean Rasheed.
+  (markt)
+
+  
+
 
   
 



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

Re: svn commit: r1846116 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/tomcat/util/threads/ test/org/apache/catalina/mbeans/ webapps/docs/ webapps/docs/c

2018-11-23 Thread Rémy Maucherat

On Fri, Nov 23, 2018 at 1:05 PM Mark Thomas  wrote:

> On 08/11/2018 10:17, r...@apache.org wrote:
> > Author: remm
> > Date: Thu Nov  8 10:17:43 2018
> > New Revision: 1846116
> >
> > URL: http://svn.apache.org/viewvc?rev=1846116=rev
> > Log:
> > Add a scheduled executor service to the Service, which can be used to
> process utility tasks including periodic ones.
> > Add a simple wrapper to prevent random lifecycle and configuration
> operations.
> > Add a bean for it.
>
> 
>
> > Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
> > URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=1846116=1846115=1846116=diff
>
> 
>
> > +private synchronized void reconfigureUtilityExecutor(int threads) {
> > +if (utilityExecutor != null) {
> > +utilityExecutor.setMaximumPoolSize(threads);
>
> I'm seeing a SpotBugs warning on the above line that calling
> setMaximumPoolSize() is a NO-OP. From the Javadoc:
>
> 
> In particular, because it acts as a fixed-sized pool using {@code
> corePoolSize} threads and an unbounded queue, adjustments to {@code
> maximumPoolSize} have no useful effect.
> 
>
> Should this be calling setCorePoolSize() ?
>

Ok, I will make adjustments then. Another bad idea as well: using
allowCoreThreadTimeOut, all is does is endlessly stopping and restarting
immediately the core threads.

Rémy

Re: Container packaging

2018-11-23 Thread Mark Thomas

On 22/11/2018 15:45, Rémy Maucherat wrote:
> Hi,
> 
> After a bit of experimenting, the docker image works well, and is nicer
> (IMO) to configure and customize with the embedded updates from 9.0.14. I
> have verified that Kubernetes based discovery works without being too
> difficult to configure. Custom code and components can be plugged in easily
> as anything in src/main/java will get compiled and packaged in the jar.
> 
> https://github.com/rmaucher/tomcat-maven
> 
> Now, distributing this sort of package is "easy" but is usually done with a
> standalone git repo like this one. Where could I put this packaging instead
> since we probably cannot do that in Tomcat-land ?

This is a docker image, right?

It should be possible to have an ASF git repo for this. Am I missing
some blocking issue?

How about Docker Hub for the output?

Mark

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

Re: svn commit: r1846116 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/tomcat/util/threads/ test/org/apache/catalina/mbeans/ webapps/docs/ webapps/docs/c

2018-11-23 Thread Mark Thomas

On 08/11/2018 10:17, r...@apache.org wrote:
> Author: remm
> Date: Thu Nov  8 10:17:43 2018
> New Revision: 1846116
> 
> URL: http://svn.apache.org/viewvc?rev=1846116=rev
> Log:
> Add a scheduled executor service to the Service, which can be used to process 
> utility tasks including periodic ones.
> Add a simple wrapper to prevent random lifecycle and configuration operations.
> Add a bean for it.



> Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=1846116=1846115=1846116=diff



> +private synchronized void reconfigureUtilityExecutor(int threads) {
> +if (utilityExecutor != null) {
> +utilityExecutor.setMaximumPoolSize(threads);

I'm seeing a SpotBugs warning on the above line that calling
setMaximumPoolSize() is a NO-OP. From the Javadoc:


In particular, because it acts as a fixed-sized pool using {@code
corePoolSize} threads and an unbounded queue, adjustments to {@code
maximumPoolSize} have no useful effect.


Should this be calling setCorePoolSize() ?

Mark

> +} else {
> +ScheduledThreadPoolExecutor scheduledThreadPoolExecutor =
> +new ScheduledThreadPoolExecutor(1, new 
> UtilityThreadFactory(getName() + "-utility-"));
> +scheduledThreadPoolExecutor.setMaximumPoolSize(threads);
> +scheduledThreadPoolExecutor.setKeepAliveTime(10, 
> TimeUnit.SECONDS);
> +scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true);
> +
> scheduledThreadPoolExecutor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
> +utilityExecutor = scheduledThreadPoolExecutor;
> +utilityExecutorWrapper = new 
> org.apache.tomcat.util.threads.ScheduledThreadPoolExecutor(utilityExecutor);
> +}

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

[Bug 62945] JarScanFilter with tldSkip in context.xml still produce INFO msg. if one jar is scanned due to another reason

2018-11-23 Thread bugzilla

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

Remy Maucherat  changed:

   What|Removed |Added

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

--- Comment #1 from Remy Maucherat  ---
In many cases you should investigate on the user list, especially since you
sound a bit unsure.
Here, although you looked at the jarsToSkip property, you didn't look at
jarsToScan.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 62945] New: JarScanFilter with tldSkip in context.xml still produce INFO msg. if one jar is scanned due to another reason

2018-11-23 Thread bugzilla

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

Bug ID: 62945
   Summary: JarScanFilter with tldSkip in context.xml still
produce INFO msg. if one jar is scanned due to another
reason
   Product: Tomcat 9
   Version: 9.0.13
  Hardware: PC
Status: NEW
  Severity: minor
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: costescuand...@skymail.ro
  Target Milestone: -

I wanted to get rid of this message (and skip unneeded tld scans) that appears
at each war deployment:

23-Nov-2018 13:07:34.485 INFO [main]
org.apache.jasper.servlet.TldScanner.scanJars At least one JAR was scanned for
TLDs yet contained no TLDs. Enable debug logging for this logger for a complete
list of JARs that were scanned but no TLDs were found in them. Skipping
unneeded JARs during scanning can improve startup time and JSP compilation
time.

When I enabled FINE logging via

  org.apache.jasper.compiler.TldLocationsCache.level = FINE
  org.apache.jasper.servlet.TldScanner.level = FINE

it listed many jars that were scanned for TLDs but had none.

So according to
http://tomcat.apache.org/tomcat-8.0-doc/config/jar-scan-filter.html I added in
META-INF/context.xml this:








This only partially worked. One jar file was still listed as scanned for TLDs
yet it has none:

23-Nov-2018 13:07:34.483 FINE [main]
org.apache.jasper.servlet.TldScanner$TldScannerCallback.scan No TLD files were
found in
[file:/D:/Tomcats/apache-tomcat-9.0.13/webapps/myWar/WEB-INF/lib/log4j-web.jar].
Consider adding the JAR to the
tomcat.util.scan.StandardJarScanFilter.jarsToSkip property in
CATALINA_BASE/conf/catalina.properties file.

This seems to be a bug. That jar is indeed scanned because it needs to be
scanned for something else (it has a log4j-web.jar\META-INF\web-fragment.xml). 

In WEB-INF/web.xml of the .war I do have this (although this is probably not
relevant)

  
(...)
log4j
(...)
  

So it is a bug that it still gives that info/warning message after I added the
JarScanFilter right?

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 62944] New: Enabling TLSv1.3 with the APR connector breaks TLSv1.0 and TLSv1.1

2018-11-23 Thread bugzilla

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

Bug ID: 62944
   Summary: Enabling TLSv1.3 with the APR connector breaks TLSv1.0
and TLSv1.1
   Product: Tomcat Native
   Version: 1.2.18
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Library
  Assignee: dev@tomcat.apache.org
  Reporter: dean.a.rash...@gmail.com
  Target Milestone: ---

Created attachment 36275
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=36275=edit
Fix the code that scans for the minimal protocol version number if TLSv1.3 is
enabled

I'm using Tomcat 8.5 with the APR connector and OpenSSL 1.1.1. I just
upgraded to Tomcat 8.5.35 / Tomcat Native 1.2.18 and found that if
TLSv1.3 is enabled (which it is by default with the default setting of
protocols="all"), support for TLSv1.0 and TLSv1.1 gets disabled, breaking
older clients.

I can work around this by disabling TLSv1.3, for example, by setting

   protocols="SSLv2Hello,TLSv1,TLSv1.1,TLSv1.2"

but as soon as I add TLSv1.3, TLSv1.0 and TLSv1.1 get disabled.

Looking into it, this appears to be a fairly trivial copy-and-paste
error in the Tomcat Native code in sslcontext.c -- when scanning for
the minimal protocol version number to pass to
SSL_CTX_set_min_proto_version(), the code in the "#ifdef HAVE_TLSV1_3"
block should not have a dangling "else" clause, because (unlike the
preceding code to find the maximum protocol version number), this is a
series of "if" tests, not an if-else-if-else chain.

Attached is a patch which I've tested using SSLLabs, and confirmed that it 
allows all TLS versions to be enabled, and retains compatibility against 
older clients.

-- 
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: r1847239 - in /tomcat/trunk/java: javax/el/ org/apache/catalina/authenticator/ org/apache/catalina/core/ org/apache/catalina/filters/ org/apache/catalina/ha/deploy/ org/apache/catalina/rea

2018-11-23 Thread markt

Author: markt
Date: Fri Nov 23 09:53:29 2018
New Revision: 1847239

URL: http://svn.apache.org/viewvc?rev=1847239=rev
Log:
German translation updates

Added:
tomcat/trunk/java/javax/el/LocalStrings_de.properties   (with props)

tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_de.properties
   (with props)
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_de.properties   
(with props)
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_de.properties   (with 
props)
tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_de.properties   
(with props)
Modified:

tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_de.properties
tomcat/trunk/java/org/apache/catalina/startup/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/LocalStrings_de.properties
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_de.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_de.properties
tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_de.properties
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_de.properties
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_de.properties

Added: tomcat/trunk/java/javax/el/LocalStrings_de.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/LocalStrings_de.properties?rev=1847239=auto
==
--- tomcat/trunk/java/javax/el/LocalStrings_de.properties (added)
+++ tomcat/trunk/java/javax/el/LocalStrings_de.properties Fri Nov 23 09:53:29 
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.
+
+importHandler.invalidClassNameForStatic=UngÃ¼ltige Klasse [{0}] fÃ¼r 
angegebenen static import [{1}]

Propchange: tomcat/trunk/java/javax/el/LocalStrings_de.properties
--
svn:eol-style = native

Modified: 
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=1847239=1847238=1847239=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_de.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_de.properties 
Fri Nov 23 09:53:29 2018
@@ -14,3 +14,5 @@
 # limitations under the License.
 
 authenticator.certificates=Keine Client Zertifikatskette im Request
+
+singleSignOn.sessionExpire.hostNotFound=SSO kann Session [{0}] nicht ablaufen 
lassen, da der Host nicht gefunden werden konnte

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_de.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_de.properties?rev=1847239=1847238=1847239=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_de.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_de.properties Fri 
Nov 23 09:53:29 2018
@@ -22,3 +22,4 @@ naming.wsdlFailed=Die WSDL Datei [{0}] w
 
 standardContext.listenerStart=Fehler beim Senden der ''Context Initialized'' 
Benachrichtigung an den Listener aus der Klasse [{0}]
 standardContext.notStarted=Context mit Name [{0}] wurde noch nicht gestartet
+standardContext.securityConstraint.mixHttpMethod= und 
 dÃ¼rfen nicht in derselben Web-Ressource-Kollektion 
verwendet werden

Modified:

svn commit: r1847238 - in /tomcat/trunk: java/org/apache/catalina/authenticator/jaspic/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/ap

2018-11-23 Thread markt

Author: markt
Date: Fri Nov 23 09:52:24 2018
New Revision: 1847238

URL: http://svn.apache.org/viewvc?rev=1847238=rev
Log:
Russian translation updates

Added:

tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ru.properties
   (with props)
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ru.properties  
 (with props)
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ru.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_ru.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_ru.properties  
 (with props)
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ru.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ru.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_ru.properties   
(with props)
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_ru.properties  
 (with props)

tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_ru.properties
   (with props)
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_ru.properties   
(with props)
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_ru.properties   
(with props)
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ru.properties   
(with props)
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_ru.properties   
(with props)

tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ru.properties   
(with props)

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_ru.properties 
  (with props)
tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_ru.properties   
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ru.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ru.properties
tomcat/trunk/webapps/docs/changelog.xml

Added: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ru.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ru.properties?rev=1847238=auto
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ru.properties
 (added)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ru.properties
 Fri Nov 23 09:52:24 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.existsDeleteFail=ÐÑÐµÐ¼ÐµÐ½Ð½ÑÐ¹ ÑÐ°Ð¹Ð» 
[{0}] ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÐ´Ð°Ð»ÑÐ½

Propchange: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ru.properties
--
svn:eol-style = native

Added: 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ru.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ru.properties?rev=1847238=auto
==
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ru.properties 
(added)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_ru.properties 
Fri Nov 23 09:52:24 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

svn commit: r1847237 - in /tomcat/trunk: java/org/apache/coyote/LocalStrings_ko.properties webapps/docs/changelog.xml

2018-11-23 Thread markt

Author: markt
Date: Fri Nov 23 09:47:09 2018
New Revision: 1847237

URL: http://svn.apache.org/viewvc?rev=1847237=rev
Log:
Korean translation updates

Modified:
tomcat/trunk/java/org/apache/coyote/LocalStrings_ko.properties
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/coyote/LocalStrings_ko.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/LocalStrings_ko.properties?rev=1847237=1847236=1847237=diff
==
--- tomcat/trunk/java/org/apache/coyote/LocalStrings_ko.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings_ko.properties Fri Nov 23 
09:47:09 2018
@@ -15,6 +15,8 @@
 
 abstractConnectionHandler.processorPop=ìºìë¡ë¶í° íë¡ì¸ì 
[{0}]ì(ë¥¼) ì¶ì¶í¨.
 
+abstractProcessor.httpupgrade.notsupported=HTTP ìê·¸ë ì´ëë ì´ 
íë¡í ì½ë¡ ì§ìëì§ ììµëë¤.
+
 asyncStateMachine.invalidAsyncState=Async ìíê° [{1}]ì¸ requestì 
ëíì¬ [{0}]ì(ë¥¼) í¸ì¶íë ê²ì ì í¨íì§ ììµëë¤.
 
 response.writeListenerSet=Non-blocking writer listenerê° ì´ë¯¸ ì¤ì 
ëììµëë¤.

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1847237=1847236=1847237=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 23 09:47:09 2018
@@ -183,7 +183,7 @@
   
   
 Add Korean translations to Apache Tomcat. Includes contributions from
-woonsan, JunSang Park and song choe. (markt)
+woonsan, JunSang Park, song choe and OhChan. (markt)
   
   
 Expand the coverage and quality of the Spanish translations provided



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

svn commit: r1847236 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ java/org/apache/catalina/ha/deploy/ java/org/apache/catalin

2018-11-23 Thread markt

Author: markt
Date: Fri Nov 23 09:44:51 2018
New Revision: 1847236

URL: http://svn.apache.org/viewvc?rev=1847236=rev
Log:
Simplified Chinese translation updates

Modified:

tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/naming/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_zh_CN.properties
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties

tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties?rev=1847236=1847235=1847236=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties 
Fri Nov 23 09:44:51 2018
@@ -32,6 +32,9 @@ coyoteRequest.noMultipartConfig=ç±ä
 
coyoteRequest.setAttribute.namenull=ä¸è½å¨ä¸ä¸ªç©ºçååä¸è°ç¨setAttribute
 
 coyoteResponse.encoding.invalid=JREæ æ³è¯å«ç¼ç [{0}]
+coyoteResponse.sendRedirect.note=éå®åå°{0}
+
+request.asyncNotSupported=å½åé¾ççéå¨æservletä¸æ¯æå¼æ¥æä½ã
 
 requestFacade.nullRequest=è¯·æ±å¯¹è±¡å·²è¢«åæ¶ï¼ä¸åä¸æ¤facadeå³è
 

Modified: 
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
URL:

svn commit: r1847235 - in /tomcat/trunk/java/org/apache: catalina/filters/ catalina/ha/deploy/ catalina/mapper/ catalina/startup/ catalina/tribes/group/interceptors/ catalina/tribes/io/ catalina/tribe

2018-11-23 Thread markt

Author: markt
Date: Fri Nov 23 09:38:07 2018
New Revision: 1847235

URL: http://svn.apache.org/viewvc?rev=1847235=rev
Log:
Spanish translation updates

Added:

tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_es.properties 
  (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_es.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_es.properties

tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_es.properties

tomcat/trunk/java/org/apache/catalina/tribes/transport/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/http11/upgrade/LocalStrings_es.properties
tomcat/trunk/java/org/apache/coyote/http2/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/util/net/jsse/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/java/org/apache/tomcat/websocket/server/LocalStrings_es.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties?rev=1847235=1847234=1847235=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties 
[UTF-8] Fri Nov 23 09:38:07 2018
@@ -36,4 +36,6 @@ filterbase.noSuchProperty=La propiedad [
 
 http.403=El acceso al recurso especificado [{0}] ha sido prohibido.
 
-requestFilter.deny=Solicitud [{0]} en base a propiedad [{1]} ha sido negada
+httpHeaderSecurityFilter.clickjack.invalid=An invalid value [{0}] was 
specified for the anti click-jacking header
+
+requestFilter.deny=Solicitud [{0]} denegada debido a propiedad [{1]}

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_es.properties?rev=1847235=1847234=1847235=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_es.properties 
Fri Nov 23 09:38:07 2018
@@ -14,5 +14,6 @@
 # limitations under the License.
 
 farmWarDeployer.hostOnly=FarmWarDeployer sÃ³lo puede operar como un 
subelemento de una mÃ¡quina del cluster!
+farmWarDeployer.removeFailRemote=El borrado local de [{0}] fallÃ³, otro 
manager tiene la aplicaciÃ³n en servicio!
 
 warWatcher.checkingWar=Verificando archivo WAR [{0}]

Modified: 
tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_es.properties?rev=1847235=1847234=1847235=diff
==
--- tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_es.properties Fri 
Nov 23 09:38:07 2018
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+mapper.addHostAlias.success=Alias [{0}] registrado para el servidor [{1}]
+
 mapperListener.registerHost=Registrar mÃ¡quina [{0}] en dominio [{1}] para el 
conector [{2}]
 mapperListener.unknownDefaultHost=MÃ¡quina por defecto desconocida: [{0}] para 
el conector [{1}]
 mapperListener.unregisterHost=Desregistrar mÃ¡quina [{0}] en dominio [{1}] 
para el conector [{2}]

Modified: 
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties?rev=1847235=1847234=1847235=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties 
[UTF-8] (original)
+++

svn commit: r1847233 [1/3] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/o

2018-11-23 Thread markt

Author: markt
Date: Fri Nov 23 09:33:46 2018
New Revision: 1847233

URL: http://svn.apache.org/viewvc?rev=1847233=rev
Log:
More French translations along with a handful of corrections/improvements.

Added:

tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_fr.properties   
(with props)

tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/LocalStrings_fr.properties
   (with props)
Modified:
tomcat/trunk/java/javax/el/LocalStrings_fr.properties
tomcat/trunk/java/javax/servlet/LocalStrings_fr.properties
tomcat/trunk/java/javax/servlet/http/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/context/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/mapper/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/security/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/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/jmx/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/bio/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/users/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/catalina/webresources/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/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/naming/factory/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/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/compat/LocalStrings_fr.properties

tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalStrings_fr.properties

tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_fr.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/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/util/threads/res/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_fr.properties

svn commit: r1847233 [3/3] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/o

2018-11-23 Thread markt

Modified: 
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1847233=1847232=1847233=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties 
[UTF-8] Fri Nov 23 09:33:46 2018
@@ -23,9 +23,11 @@ jsp.error.attr.quoted=La valeur de l'att
 jsp.error.attribute.custom.non_rt_with_expr=D''après la TLD, l''attribut [{0}] 
n''accepte aucune expression
 jsp.error.attribute.deferredmix=Impossible d''utiliser des expressions EL ${} 
et #{} dans la même valeur d''attribut
 jsp.error.attribute.duplicate=Les noms qualifiés d’attributs doivent être 
uniques au sein d'un élément
+jsp.error.attribute.invalidPrefix=Le préfixe d''attribut [{0}] ne correspond à 
aucune librairie de tags importée
 jsp.error.attribute.noequal=Symbole égal (equal) attendu
 jsp.error.attribute.noquote=Symbole guillemet (quote) attendu
 jsp.error.attribute.nowhitespace=La spécification JSP requiert un caractère 
d'espacement devant le nom d'un attribut
+jsp.error.attribute.standard.non_rt_with_expr=L''attribut [{0}] de l''action 
standard [{1}] n''accepte pas d''expressions
 jsp.error.attribute.unterminated=L''attribut pour [{0}] n''est pas 
correctement terminé
 jsp.error.attributes.not.allowed=[{0}] ne doit avoir aucun attribut
 jsp.error.bad.scratch.dir=Le paramètre "scratchDir" que vous avez spécifié: 
[{0}] est inutilisable.
@@ -40,17 +42,25 @@ jsp.error.beans.property.conversion=Impo
 jsp.error.beans.propertyeditor.notregistered=L'éditeur de propriétés n'est pas 
enregistré avec le PropertyEditorManager
 jsp.error.beans.setproperty.noindexset=Impossible de renseigner la propriété 
indéxée
 jsp.error.classname=Impossible de déterminer le nom de classe d'après le 
fichier .class
+jsp.error.coerce_to_type=Impossible de convertir la valeur [{2}] de 
l''attribut [{0}] vers le type [{1}]
+jsp.error.compilation=Erreur de compilation du fichier: [{0}] [{1}]
 jsp.error.compiler=Aucun compilateur Java disponible
+jsp.error.compiler.config=Aucun compilateur Java disponible pour les options 
de configuration compilerClassName: [{0}] et compiler: [{1}]
 jsp.error.config_pagedir_encoding_mismatch=L''encode de page (Page-encoding) 
indiqué dans le jsp-property-group [{0}] est différent de celui indiqué dans la 
directive de page [{1}]
 jsp.error.corresponding.servlet=Erreur de servlet générée:
 jsp.error.could.not.add.taglibraries=Impossible d'ajouter une ou plusieurs 
bibliothèques de tag.
 jsp.error.data.file.processing=Erreur durant le traitement du fichier [{0}]
+jsp.error.data.file.read=Erreur lors de la lecture du fichier [{0}]
 jsp.error.data.file.write=Erreur lors de l'écriture du fichier de données
+jsp.error.deferredmethodandvalue='deferredValue' et 'deferredMethod' ne 
peuvent être toutes deux 'true'
+jsp.error.deferredmethodsignaturewithoutdeferredmethod=Impossible de sécifier 
une signature de méthode si 'deferredMethod' n'est pas 'true'
 jsp.error.deferredvaluetypewithoutdeferredvalue=Impossible de spécifier un 
value type si 'deferredValue' n'est pas 'true'
 jsp.error.directive.isnottagfile=La directive [{0}] ne peut être utilisée que 
dans un fichier tag
 jsp.error.directive.istagfile=La directive [{0}] ne peut être utilisée dans un 
fichier tag
 jsp.error.duplicate.name.jspattribute=L''attribut [{0}] indiqué dans l''action 
standard ou spécifique (custom) apparait aussi comme valeur de l''attribut de 
nom dans le jsp:attribute inclus
+jsp.error.duplicateqname=Un attribut avec un nom qualifié [{0}] en double a 
été trouvé, ils doivent être uniques au sein d''un élément
 jsp.error.dynamic.attributes.not.implemented=Le tag [{0}] indique qu''il 
accepte des attributs dynamics mais n''implémente pas l''interface requise
+jsp.error.el.parse=[{0}] : [{1}]
 jsp.error.el.template.deferred=#{...} n''est pas admis dans le texte d''un 
modèle (template)
 jsp.error.el_interpreter_class.instantiation=Impossible de charger ou 
d''instancier la classe ELInterpreter [{0}]
 jsp.error.fallback.invalidUse=jsp:fallback doit être un enfant direct de 
jsp:plugin
@@ -58,26 +68,35 @@ jsp.error.file.already.registered=Inclus
 jsp.error.file.cannot.read=Impossible de lire le fichier: [{0}]
 jsp.error.file.not.found=Le fichier [{0}] n''a pas été trouvé
 jsp.error.file.not.registered=Le fichier [{0}] n''apparaît pas dans 
l''inclusion (include)
+jsp.error.flush=Une exception s'est produite lors de l'envoi des données
 jsp.error.fragmentwithtype=On ne peut indiquer à la fois les attributs 
'fragment' et 'type'.  Si 'fragment' est présent, 'type' est fixé comme 
'javax.servlet.jsp.tagext.JspFragment'
 jsp.error.include.exception=Impossible d''inclure (include) [{0}]
 jsp.error.include.tag=Tag jsp:include incorrect

svn commit: r1847233 [2/3] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/o

2018-11-23 Thread markt

Modified: 
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties?rev=1847233=1847232=1847233=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties 
[UTF-8] Fri Nov 23 09:33:46 2018
@@ -15,41 +15,66 @@
 
 catalina.noCluster=le RuleSet du cluster n''a pas été trouvé à cause de [{0}], 
la configuration du cluster est désactivée
 catalina.serverStartFail=Le composant Server requis n'a pas démarré, en 
conséquence Tomcat ne peut démarrer.
+catalina.shutdownHookFail=Le crochet d'arrêt a rencontré une erreur en tentant 
d'arrêter le serveur
+catalina.stopServer=Pas de port d'arrêt configuré, l'arrêt du serveur se fera 
via un signal du système d'exploitation; le serveur est en cours d'exécution
 
 catalinaConfigurationSource.cannotObtainURL=Impossible d''obtenir l''URL pour 
le chemin relatif [{0}]. Vérifiez que catalina.base est défini.
 
+connector.noSetExecutor=Le connecteur [{0}] ne supporte pas les exécuteurs 
externes, la méthode setExecutor(java.util.concurrent.Executor) n''a pas été 
trouvée
+
 contextConfig.altDDNotFound=fichier alt-dd [{0}] pas trouvé
+contextConfig.annotationsStackOverflow=Impossible de finir l''analyse des 
annotations de l''application web [{0}] à cause d''une StackOverflowError, les 
causes possibles sont une valeur trop petite pour -Xss et des dépendances 
d''héritage cycliques; la hiérarchie de classe qui était traitée était [{1}]
 contextConfig.applicationMissing=Le fichier web.xml de l'application est 
absent, utilisation des paramètres par défaut
 contextConfig.applicationParse=Erreur d''évaluation (parse) dans le fichier 
web.xml de l''application à [{0}]
 contextConfig.applicationPosition=S''est produite à la ligne [{0}] colonne 
[{1}]
+contextConfig.applicationStart=Traitement du fichier web.xml de l''application 
à [{0}]
 contextConfig.applicationUrl=Impossible de déterminer l'URL pour le fichier 
d'application web.xml
 contextConfig.authenticatorConfigured=Configuration d''un authentificateur 
(authenticator) pour la méthode [{0}]
 contextConfig.authenticatorInstantiate=Impossible d''instancier un 
authentificateur (authenticator) pour la classe [{0}]
 contextConfig.authenticatorMissing=Impossible de configurer un 
authentificateur (authenticator) pour la méthode [{0}]
 contextConfig.authenticatorResources=Impossible de charger la liste de 
correspondance des authentificateurs (authenticators)
+contextConfig.badUrl=Impossible de traiter le descripteur de contexte [{0}]
+contextConfig.baseError=Impossible de déterminer la localisation de la 
configuration globale, habituellement $CATALINA_BASE/conf
 contextConfig.cce=L''objet donnée évènement cycle de vie (Lifecycle event data 
object) [{0}] n''est pas un Contexte
+contextConfig.contextClose=Erreur lors de la fermeture de context.xml
 contextConfig.contextMissing=context.xml manquant: [{0}]
+contextConfig.contextParse=Erreur de traitement de context.xml pour [{0}]
 contextConfig.defaultError=Erreur de traitement du web.xml par défaut appelé 
[{0}] à [{1}]
 contextConfig.defaultMissing=Fichier web.xml global non trouvé
 contextConfig.defaultPosition=S''est produite à la ligne [{0}] colonne [{1}]
+contextConfig.destroy=ContextConfig: Destruction
+contextConfig.fileUrl=Impossible de créer un objet fichier à partir de l''URL 
[{0}]
 contextConfig.fixDocBase=Exception durant la fixation du "docBase" pour le 
contexte [{0}]
 contextConfig.init=ContextConfig: Initialisation
 contextConfig.inputStreamFile=Impossible de traiter les annotations du fichier 
[{0}]
+contextConfig.inputStreamJar=Impossible de traiter l''entrée [{0}] du JAR 
[{1}] pour les annotations
+contextConfig.inputStreamJndi=Impossible de traiter l''élément ressource [{0}] 
pour les annotations
 contextConfig.inputStreamWebResource=Incapable de traiter les annotations de 
la ressource web [{0}]
+contextConfig.invalidSci=Le ServletContainerInitializer [{0}] n''a pas pu être 
crée
+contextConfig.invalidSciHandlesTypes=Impossible de charger la classe [{0}] 
pour la vérifier avec l''annotation @HandlesTypes d''un ou plusieurs 
ServletContainerInitializer
 contextConfig.jarFile=Impossible de traiter les annotations du JAR [{0}]
 contextConfig.jndiUrl=Impossible de traiter l''URL JNDI [{0}] pour les 
annotations
+contextConfig.jndiUrlNotDirContextConn=La connection créée pour l''URL [{0}] 
n''était pas une DirContextURLConnection
 contextConfig.jspFile.error=Le fichier JSP [{0}] doit commencer par un ''/''
 contextConfig.jspFile.warning=ATTENTION: Le fichier JSP [{0}] doit commencer 
par un  ''/'' dans l''API Servlet 2.4
 contextConfig.missingRealm=Aucun royaume (realm) n'a été configuré pour 
réaliser l'authentification

svn commit: r1847230 - /tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties

2018-11-23 Thread markt

Author: markt
Date: Fri Nov 23 09:26:07 2018
New Revision: 1847230

URL: http://svn.apache.org/viewvc?rev=1847230=rev
Log:
Fix escaping of single quotes

Modified:
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties?rev=1847230=1847229=1847230=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties 
Fri Nov 23 09:26:07 2018
@@ -29,7 +29,7 @@ contextConfig.defaultPosition=åç
 contextConfig.fixDocBase=ä¸ä¸æ[{0}]çå¼å¸¸ä¿®å¤docBase
 contextConfig.inputStreamWebResource=ä¸è½å¤çæ³¨éçWebèµæº[{0}]
 contextConfig.jndiUrlNotDirContextConn=ä¸ºURL [{0}] 
åå»ºçè¿æ¥ä¸æ¯DirContextURLConnection
-contextConfig.jspFile.error=JSPæä»¶[{0}]å¿é¡»ä»¥''/'å¼å¤´ã
+contextConfig.jspFile.error=JSPæä»¶[{0}]å¿é¡»ä»¥''/''å¼å¤´ã
 contextConfig.processAnnotationsDir.debug=ä½¿ç¨æ³¨è§£ 
[{0}]æ«æç®å½ä¸çç±»æä»¶
 contextConfig.processAnnotationsWebDir.debug=æ«æ web 
åºç¨ç¨åºç®å½ä¸å«æ [{0}] æ³¨è§£ç class æä»¶
 contextConfig.role.runas= ä¸ä½¿ç¨çå®å¨è§è²å [{0}]ï¼æªå¨ 
 ä¸å®ä¹



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

42 matches

Mail list logo