[tomcat] branch master updated: Remove legacy NIO double close

[remm]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new e2d5a04  Remove legacy NIO double close
e2d5a04 is described below

commit e2d5a040b962a904db5264b3cb3282c6b05f823c
Author: remm 
AuthorDate: Wed May 22 00:43:09 2019 +0200

Remove legacy NIO double close

Closing the socket is not necessary. I found information on Java 1.4, 5
and 6 having possible issues that needed the socket close, but this is
now fixed. NIO2 from Java 7 doesn't give the user a choice as its
channel doesn't expose the socket to avoid abuse and bad practices.
---
 java/org/apache/tomcat/util/net/NioChannel.java  | 8 
 java/org/apache/tomcat/util/net/NioEndpoint.java | 8 
 webapps/docs/changelog.xml   | 4 
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/NioChannel.java 
b/java/org/apache/tomcat/util/net/NioChannel.java
index 9489b72..d3f2766 100644
--- a/java/org/apache/tomcat/util/net/NioChannel.java
+++ b/java/org/apache/tomcat/util/net/NioChannel.java
@@ -40,11 +40,10 @@ public class NioChannel implements ByteChannel, 
ScatteringByteChannel, Gathering
 
 protected static final ByteBuffer emptyBuf = ByteBuffer.allocate(0);
 
+protected final SocketBufferHandler bufHandler;
 protected SocketChannel sc = null;
 protected NioSocketWrapper socketWrapper = null;
 
-protected final SocketBufferHandler bufHandler;
-
 public NioChannel(SocketChannel channel, SocketBufferHandler bufHandler) {
 this.sc = channel;
 this.bufHandler = bufHandler;
@@ -102,7 +101,6 @@ public class NioChannel implements ByteChannel, 
ScatteringByteChannel, Gathering
  */
 @Override
 public void close() throws IOException {
-sc.socket().close();
 sc.close();
 }
 
@@ -114,7 +112,9 @@ public class NioChannel implements ByteChannel, 
ScatteringByteChannel, Gathering
  * @throws IOException If closing the secure channel fails.
  */
 public void close(boolean force) throws IOException {
-if (isOpen() || force ) close();
+if (isOpen() || force) {
+close();
+}
 }
 
 /**
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index a23448b..62dbab2 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -350,7 +350,6 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 protected void doCloseServerSocket() throws IOException {
 if (!getUseInheritedChannel() && serverSock != null) {
 // Close server socket
-serverSock.socket().close();
 serverSock.close();
 }
 serverSock = null;
@@ -442,13 +441,6 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 protected void closeSocket(SocketChannel socket) {
 countDownConnection();
 try {
-socket.socket().close();
-} catch (IOException ioe)  {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("endpoint.err.close"), ioe);
-}
-}
-try {
 socket.close();
 } catch (IOException ioe) {
 if (log.isDebugEnabled()) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6bc0dd5..3155c8c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -148,6 +148,10 @@
 Add support for same-site cookie attribute. Patch provided by John
 Kelly. (markt)
   
+  
+Drop legacy NIO double socket close (close channel, then close
+socket). (remm)
+  
 
   
   


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

Re: Proposal for TLS config sanity check

[Mark Thomas]

On 21/05/2019 21:46, Christopher Schultz wrote:
> All,
> 
> Looking at the legacy-versus-modern TLS configuration (Connector vs
> SSLHostConfig), it seems easy for an admin to create a configuration
> that looks like this (paraphrasing):
> 
> 
>   hostname="mysite.com"
>SSLCertificateFile="keystore.p12" />
> 
> 
> Where the expectation is that only TLSv1.2 will be enabled for virsual
> host mysite.com when in fact only the virtual host named ("_default_")
> will actually be limited to TLSv1.2 and other hosts will accept
> connections using a TLS handshake with all default enabled protocols
> (currently TLSv*).
> 
> This may be surprising and there is no indication that there is
> something "wrong" with the configuration. Only a TLS handshake probe
> such as SSL Labs's testing tool will expose the oversight.
> 
> I propose the following change to the  and 
> initialization process:
> 
> If the  contains any TLS/SSL-related configuration AND at
> least one  element is configured, refuse to start the
> connector (with an appropriate error message).
> 
> This may cause a small number of configurations to fail to start. The
> "workaround" is to re-evaluate one's configuration to (a) determine if
> there was a misconfiguration where expectation and reality don't match
> and (b) move all TLS/SSL-related configuration options from the
>  to each of the  elements.
> 
> Any objections?

None.

Given that the old style configuration is due to be removed in Tomcat
10, now is probably a good time to start doing this. I'd add logging a
warning if the deprecated config style is used.

Mark

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

Re: [tomcat] 02/03: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62841 poss deadlock

[Mark Thomas]

On 21/05/2019 13:34, Mark Thomas wrote:
> On 21/05/2019 09:03, Keiichi Fujino wrote:
>> 2019年5月16日(木) 21:55 mailto:ma...@apache.org>>:
>>
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> markt pushed a commit to branch master
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>
>> commit ab70de3278d5e506661faeb5febf71a061b89179
>> Author: Mark Thomas mailto:ma...@apache.org>>
>> AuthorDate: Thu May 16 13:36:39 2019 +0100
>>
>>     Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62841 poss
>> deadlock
>>
>>     Refactor the DeltaRequest serialization to reduce the window during
>>     which the DeltaSession is locked and to remove a potential cause of
>>     deadlocks during serialization.


>> Do you have any plan for applying this for using BackupManager ?
>> There are similar codes in AbstractReplicatedMap#replicate.
>> Do we need to apply a similar fix to AbstractReplicatedMap#replicate ?
> 
> Probably. I'll trace the call hierarchy back from
> DeltaRequest.serialize() and ensure nothing is holding the session lock.

This is proving much trickier than it first appeared.

I've had to do a fair bit of refactoring to fix this for the
DeltaManager. My first (untested) attempt is here:

https://github.com/markt-asf/tomcat/commits/bz62481-backup-manager
(the final 3 commits)

It is a bit too invasive for me to be comfortable just committing it. I
also want to run the unit tests (although they don't test this code much).

Feedback welcome.

Mark

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

[GitHub] [tomcat] rjozwik opened a new pull request #167: Use test -t command to check if STDOUT is opened on a terminal

[GitBox]

rjozwik opened a new pull request #167: Use test -t command to check if STDOUT 
is opened on a terminal
URL: https://github.com/apache/tomcat/pull/167
 
 
   Current check for TTY availability in catalina.sh doesn't work if 
non-English locales are installed and activated. This fix uses `test` command 
instead of `tty` command.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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

Proposal for TLS config sanity check

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

Looking at the legacy-versus-modern TLS configuration (Connector vs
SSLHostConfig), it seems easy for an admin to create a configuration
that looks like this (paraphrasing):


  


Where the expectation is that only TLSv1.2 will be enabled for virsual
host mysite.com when in fact only the virtual host named ("_default_")
will actually be limited to TLSv1.2 and other hosts will accept
connections using a TLS handshake with all default enabled protocols
(currently TLSv*).

This may be surprising and there is no indication that there is
something "wrong" with the configuration. Only a TLS handshake probe
such as SSL Labs's testing tool will expose the oversight.

I propose the following change to the  and 
initialization process:

If the  contains any TLS/SSL-related configuration AND at
least one  element is configured, refuse to start the
connector (with an appropriate error message).

This may cause a small number of configurations to fail to start. The
"workaround" is to re-evaluate one's configuration to (a) determine if
there was a misconfiguration where expectation and reality don't match
and (b) move all TLS/SSL-related configuration options from the
 to each of the  elements.

Any objections?

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlzkY74ACgkQHPApP6U8
pFhC2hAAn4mw6c/TVXIfeornjhtE6nQY/2iAjp+fK5OxWpNW09LmDIK6Z/6rIfgS
9kUmfWWaslfUf04f1wmt0G599dQF1gyqHhy3XttgcUER21zpvDzeW9VVBKl7t1uh
zoaXii1ClMoY7Cg3iyuV+ULW0ETI6IyFVhWzecrwPbmWvKbw47s3VDXkimM66nJV
ZEcq47yOG3fogaadflU2GMMlvnAIJBcoW4qvQ7OHEzYliCpUFfP0ZmWPd9ufLP6G
U1otUw0yjaxsItae/PfKr4oiDPhu0pW1MdPhCBgBRS1UyByqn0fE4jf3xvng+OV9
WKxAVHObOUkI8GwNSTHqC2q8OJYrAiucGjYHM8/vPzA6RxpR0qWGO4mbD5NhD9HE
Nv178HEgrL1msuJPqCX7UYil5G8HHpTcXGnKe2jx9OJDoTv0BGmjDVOb+Xd8eIWB
il1DGTh73xe0mB0irLZxRYWME7u4pdMsbB2wkFpr8TGic6wYU0ZXXeVM+0xm/bDN
jy9FNEoQYkU2vu4eFyKLmm0/C1JbJfLRtUtPpoCk+QPt5v6TPjAONweCYy+LVi0c
IaBDmxixG/9l1sRNWr9+vYuR7pVnqAPQMggrlXQU6bBEJ3NU0F/CSWB+fOTTcGhe
BS0AP+gi8+Fsc0cw/yCPodO9VIbDuJw0IGsPxk12pwLm9c7g0LI=
=BuMa
-END PGP SIGNATURE-

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

Re: [tomcat] branch master updated: Use https instead of http

[Felix Schumacher]

Am 21.05.19 um 14:20 schrieb Mark Thomas:
> On 21/05/2019 13:14, Coty Sutherland wrote:
>> On Tue, May 21, 2019 at 8:10 AM Mark Thomas > > wrote:
>>
>> On 21/05/2019 13:08, Mark Thomas wrote:
>> > On 21/05/2019 13:02, csuth...@apache.org
>>  wrote:
>> >> This is an automated email from the ASF dual-hosted git repository.
>> >>
>> >> csutherl pushed a commit to branch master
>> >> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>> >>
>> >>
>> >> The following commit(s) were added to refs/heads/master by this push:
>> >>      new beb2dca  Use https instead of http
>> >> beb2dca is described below
>> >>
>> >> commit beb2dca83bb4084432fd3b44e06973730ad4dc7d
>> >> Author: Coty Sutherland > >
>> >> AuthorDate: Tue May 21 08:01:53 2019 -0400
>> >>
>> >>     Use https instead of http
>> >
>> > -1. Please revert this. It will break the build if a mirror is
>> selected
>> > that does not support http. It is also unnecessary. Any file
>> downloaded
>>
>> s/does not support http/does not support https/
>>
>>
>> Ack. I checked the URL before pushing and noted that the mirrors I hit
>> redirected to http, but I didn't happen to get one that didn't support
>> it (and it didn't cross my mind). Reverted.
> Thanks.
>
> Some of those links may be safe to switch to https but the mirror link
> definitely isn't.
> From memory there has already been at least one trawl though the Tomcat
> repo changing everything to https that was safe to change. That was a
> while ago. It may be time for another one. Anything that is changed
> needs to be manually checked first to make sure that there is an https
> equivalent.

The eclipse link seems to be safe to switch. My -- rather small --
experiments resulted in no redirects. All downloads were directly served.

Felix

>
> Note that for the website, the recommendation is to use protocol
> relative links so that users retain the choice of using http or https.
>
> Mark
>
>>  
>>
>>
>> Mark
>>
>> > over http is also checked against the known hash.
>> >
>> > Check the history of that file for more details.
>> >
>> > Mark
>> >
>> >
>> >
>> >> ---
>> >>  build.properties.default | 10 +-
>> >>  build.xml                |  2 +-
>> >>  2 files changed, 6 insertions(+), 6 deletions(-)
>> >>
>> >> diff --git a/build.properties.default b/build.properties.default
>> >> index 1bacc19..cc217b6 100644
>> >> --- a/build.properties.default
>> >> +++ b/build.properties.default
>> >> @@ -90,7 +90,7 @@ compile.debug=true
>> >>  # Do not pass -deprecation (-Xlint:deprecation) flag to javac
>> >>  compile.deprecation=false
>> >> 
>> >>
>> 
>> -base-apache.loc.1=http://www.apache.org/dyn/closer.lua?action=download=
>> >>
>> 
>> +base-apache.loc.1=https://www.apache.org/dyn/closer.lua?action=download=
>> >>  base-apache.loc.2=https://archive.apache.org/dist
>> >>  base-commons.loc.1=${base-apache.loc.1}/commons
>> >>  base-commons.loc.2=${base-apache.loc.2}/commons
>> >> @@ -126,8 +126,8 @@
>> 
>> wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
>> >>  # See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before
>> updating
>> >>  #
>> >>  # Checksum is from "SHA512 Checksums for 4.10" link at
>> >> -#
>> http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
>> >> -#
>> 
>> http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
>> >> +#
>> 
>> https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
>> >> +#
>> 
>> https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
>> >>  #
>> >>  jdt.version=4.10
>> >>  jdt.release=R-4.10-201812060815
>> >> @@ -137,8 +137,8 @@
>> 
>> jdt.checksum.value=6528d1933d752f909e61456f1a3cbb3ae3999d263701a459e6f4fc33f97f7
>> >>  jdt.home=${base.path}/ecj-${jdt.version}
>> >>  jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
>> >>  # The download will be moved to the archive area eventually. We
>> are taking care of that in advance.
>> >>
>> 
>> -jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
>> 
>> 
>> >>
>> 
>> -jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
>> 
>> 
>> >>
>> 
>> +jdt.loc.1=https://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar

Re: NIO changes

[Rémy Maucherat]

On Tue, May 21, 2019 at 5:57 PM Mark Thomas  wrote:

> On 21/05/2019 14:57, Rémy Maucherat wrote:
> > Hi,
> >
> > In preparation for HTTPx in the future, I was looking at how to start
> > adding UDP, and:
> > - NIO2 and APR don't have datagram support, the first one is hopeless
> > and the second one is legacy.
> > - It would be better to avoid duplicating the whole NIO connector, but
> > rather add a datagram mode to it.
> > - I think the "best" way is to change NioChannel.sc to be a
> > SelectableChannel, and then use casts (to ByteChannel, etc). The class
> > hierarchy between SocketChannel and DatagramChannel is otherwise rather
> > annoying.
> > - Many of the methods are identical between SocketChannel and
> > DatagramChannel (socket properties, address access, etc etc), but
> > unfortunately they are only on the concrete class. Since I don't think
> > reflection should be used, this means some amount of duplication and
> > casting.
> > - Along the way, I noticed NioChannel.close does sc.socket.close() then
> > sc.close(). Normally that's useless. I'm pretty sure this was done to
> > workaround old bugs that are most likely fixed now (I found references
> > online for Java 4, 5 and 6, but nothing since then). So this could be
> > simplified to just close the SelectableChannel.
> >
> > Any ideas ?
>
> To be brutally honest I wouldn't do too much work on this at this point.
> There are several reasons for this.
>
> 1. The API in Java for UDP is not a good match to what you'd need to do
> for QUIC.
>
> 2. QUIC requires access to what is currently internal TLS state. It
> isn't available in Java. There is a patch to expose this for OpenSSL. If
> the UDP parts are implemented in Java there will be a LOT of JNI calls
> required which is likely to hamper performance.
>

Ok, thanks for the info. I was looking at the basics, but that's clearly a
showstopper for now.

I have to suppose QUIC is our only use case for UDP, so I'll skip the topic
for now.


>
> 3. Just going by the length of the multiple draft RFCs, QUIC looks to be
> complex to implement. Roughly, I'd say several times more complex than
> HTTP/2.
>
> My recommendation is to wait and use a QUIC native library in much the
> same way as we currently use OpenSSL. A review of the current
> implementations and their licensing might be worthwhile.
>
> An alternative approach would be to lobby for OpenJDK to implement QUIC
> (I don't know if that is on the roadmap) and/or start contributing to
> that effort.
>

+1

Rémy

Re: NIO changes

[Mark Thomas]

On 21/05/2019 14:57, Rémy Maucherat wrote:
> Hi,
> 
> In preparation for HTTPx in the future, I was looking at how to start
> adding UDP, and:
> - NIO2 and APR don't have datagram support, the first one is hopeless
> and the second one is legacy.
> - It would be better to avoid duplicating the whole NIO connector, but
> rather add a datagram mode to it.
> - I think the "best" way is to change NioChannel.sc to be a
> SelectableChannel, and then use casts (to ByteChannel, etc). The class
> hierarchy between SocketChannel and DatagramChannel is otherwise rather
> annoying.
> - Many of the methods are identical between SocketChannel and
> DatagramChannel (socket properties, address access, etc etc), but
> unfortunately they are only on the concrete class. Since I don't think
> reflection should be used, this means some amount of duplication and
> casting.
> - Along the way, I noticed NioChannel.close does sc.socket.close() then
> sc.close(). Normally that's useless. I'm pretty sure this was done to
> workaround old bugs that are most likely fixed now (I found references
> online for Java 4, 5 and 6, but nothing since then). So this could be
> simplified to just close the SelectableChannel.
> 
> Any ideas ?

To be brutally honest I wouldn't do too much work on this at this point.
There are several reasons for this.

1. The API in Java for UDP is not a good match to what you'd need to do
for QUIC.

2. QUIC requires access to what is currently internal TLS state. It
isn't available in Java. There is a patch to expose this for OpenSSL. If
the UDP parts are implemented in Java there will be a LOT of JNI calls
required which is likely to hamper performance.

3. Just going by the length of the multiple draft RFCs, QUIC looks to be
complex to implement. Roughly, I'd say several times more complex than
HTTP/2.

My recommendation is to wait and use a QUIC native library in much the
same way as we currently use OpenSSL. A review of the current
implementations and their licensing might be worthwhile.

An alternative approach would be to lobby for OpenJDK to implement QUIC
(I don't know if that is on the roadmap) and/or start contributing to
that effort.

Mark

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

Re: NIO changes

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Rémy,

On 5/21/19 09:57, Rémy Maucherat wrote:
> Hi,
> 
> In preparation for HTTPx in the future, I was looking at how to
> start adding UDP, and:
> 
> - NIO2 and APR don't have datagram support, the first one is
> hopeless and the second one is legacy.
> 
> - It would be better to avoid duplicating the whole NIO connector,
>  but rather add a datagram mode to it.
> 
> - I think the "best" way is to change NioChannel.sc to be a 
> SelectableChannel, and then use casts (to ByteChannel, etc). The 
> class hierarchy between SocketChannel and DatagramChannel is 
> otherwise rather annoying.> - Many of the methods are identical
> between SocketChannel and DatagramChannel (socket properties,
> address access, etc etc), but unfortunately they are only on the
> concrete class. Since I don't think reflection should be used, this
> means some amount of duplication and casting.
Can you avoid large numbers of casts by using a wrapper
interface/class and thin subclasses for dispatch?

> - Along the way, I noticed NioChannel.close does sc.socket.close() 
> then sc.close(). Normally that's useless. I'm pretty sure this was 
> done to workaround old bugs that are most likely fixed now (I
> found references online for Java 4, 5 and 6, but nothing since
> then). So this could be simplified to just close the
> SelectableChannel.

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlzkE+0ACgkQHPApP6U8
pFiKFA/9ENX8vNeYGoRubX+3YWmwQYXE23kRVMsBQtp8dtdpPGveVd/6Z0P6rFrn
INg4vOIU9SAez4BvxWcRycjlk3FNubi/G8Dt9K8ceJw+HUknCkZ/c60P8JxAw0A9
IrDdARX6W8f+p0chAp91ta89rUHpu50ty4IsjH5xKcko5/sfshEJIZ3ZGBy1vquQ
XVBUYk/SiLZVAKtmlLYNpzrVp/dW8fsrwS6c51P/9DdMWMfhzRYziZxs3lj8b3n9
LygR2K0Jao3msSebml2WgMfLsbWA8xoUzRLjjBFIWIu1eKP2+S7m9am45jrpZQrI
2bgIncTW3ODfyTSVHZ2/JrLlHimyWWuzmgMMBafB+msMQfQQ0LUZh7pPwcz4RduN
Jb+B0rIgoT47PkvI1XG6yjhkT3ayoBnaVtr1cm3hdHGFaPMidxeLPGdxLkrl7K17
V5hi7HC9335BmIfWKM4rioaJzJAxI4oHbJmzd6Q591P6Kslevol/1hI0iO1zfnyE
TBv0JQMFN5ZUguhfpdA3++SmflWxce9KwJlnmXvb7x5EyuTEX28zCtBWyeL7+8Z4
nDFqzT9mUrtacdOb+oAbuN/livxQoqB7Lz35Gf1+KrefoeaIpws7kSU7c4uoyRpC
3Cx95Q660iGpnbjpJA3NXItYCNySGhUu9PVe3jBiz2CzTR4DDtY=
=+HIq
-END PGP SIGNATURE-

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

NIO changes

[Rémy Maucherat]

Hi,

In preparation for HTTPx in the future, I was looking at how to start
adding UDP, and:
- NIO2 and APR don't have datagram support, the first one is hopeless and
the second one is legacy.
- It would be better to avoid duplicating the whole NIO connector, but
rather add a datagram mode to it.
- I think the "best" way is to change NioChannel.sc to be a
SelectableChannel, and then use casts (to ByteChannel, etc). The class
hierarchy between SocketChannel and DatagramChannel is otherwise rather
annoying.
- Many of the methods are identical between SocketChannel and
DatagramChannel (socket properties, address access, etc etc), but
unfortunately they are only on the concrete class. Since I don't think
reflection should be used, this means some amount of duplication and
casting.
- Along the way, I noticed NioChannel.close does sc.socket.close() then
sc.close(). Normally that's useless. I'm pretty sure this was done to
workaround old bugs that are most likely fixed now (I found references
online for Java 4, 5 and 6, but nothing since then). So this could be
simplified to just close the SelectableChannel.

Any ideas ?

Rémy

svn commit: r1859628 - in /tomcat/site/trunk: docs/legal.html xdocs/legal.xml

[markt]

Author: markt
Date: Tue May 21 12:46:39 2019
New Revision: 1859628

URL: http://svn.apache.org/viewvc?rev=1859628=rev
Log:
Fix broken links

Modified:
tomcat/site/trunk/docs/legal.html
tomcat/site/trunk/xdocs/legal.xml

Modified: tomcat/site/trunk/docs/legal.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/legal.html?rev=1859628=1859627=1859628=diff
==
--- tomcat/site/trunk/docs/legal.html (original)
+++ tomcat/site/trunk/docs/legal.html Tue May 21 12:46:39 2019
@@ -268,7 +268,7 @@ Version 2.0 (current).
 You may use the Powered by Tomcat
 logo.
 
-You may not use the Tomcat logo
+You may not use the Tomcat logo
 without the permission of the Apache Tomcat PMC.
 
 If you use the words "Tomcat" or "Apache" in your product name then

Modified: tomcat/site/trunk/xdocs/legal.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/legal.xml?rev=1859628=1859627=1859628=diff
==
--- tomcat/site/trunk/xdocs/legal.xml (original)
+++ tomcat/site/trunk/xdocs/legal.xml Tue May 21 12:46:39 2019
@@ -55,7 +55,7 @@ Version 2.0 (current).
 
 You may use the Powered by 
Tomcat
 logo.
-You may not use the Tomcat logo
+You may not use the Tomcat logo
 without the permission of the Apache Tomcat PMC.
 If you use the words "Tomcat" or "Apache" in your product name then
 you must call your product "...for Apache Tomcat". No other



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

svn commit: r1859629 - in /tomcat/site/trunk: docs/legal.html xdocs/legal.xml

[markt]

Author: markt
Date: Tue May 21 12:49:25 2019
New Revision: 1859629

URL: http://svn.apache.org/viewvc?rev=1859629=rev
Log:
Update logo links to 'official' locations rather than just pointing to our web 
site resources

Modified:
tomcat/site/trunk/docs/legal.html
tomcat/site/trunk/xdocs/legal.xml

Modified: tomcat/site/trunk/docs/legal.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/legal.html?rev=1859629=1859628=1859629=diff
==
--- tomcat/site/trunk/docs/legal.html (original)
+++ tomcat/site/trunk/docs/legal.html Tue May 21 12:49:25 2019
@@ -265,11 +265,12 @@ Version 2.0 (current).
 help file or similar. Subsequent references may refer to "Tomcat".
 
 
-You may use the Powered by Tomcat
-logo.
+You may use the
+
+Powered by Tomcat logo.
 
-You may not use the Tomcat logo
-without the permission of the Apache Tomcat PMC.
+You may not use the Tomcat
+logo without the permission of the Apache Tomcat PMC.
 
 If you use the words "Tomcat" or "Apache" in your product name then
 you must call your product "...for Apache Tomcat". No other

Modified: tomcat/site/trunk/xdocs/legal.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/legal.xml?rev=1859629=1859628=1859629=diff
==
--- tomcat/site/trunk/xdocs/legal.xml (original)
+++ tomcat/site/trunk/xdocs/legal.xml Tue May 21 12:49:25 2019
@@ -53,10 +53,11 @@ Version 2.0 (current).
 of "Apache Tomcat" for at least the first reference on any web 
page,
 help file or similar. Subsequent references may refer to "Tomcat".
 
-You may use the Powered by 
Tomcat
-logo.
-You may not use the Tomcat logo
-without the permission of the Apache Tomcat PMC.
+You may use the
+
+Powered by Tomcat logo.
+You may not use the Tomcat
+logo without the permission of the Apache Tomcat PMC.
 If you use the words "Tomcat" or "Apache" in your product name then
 you must call your product "...for Apache Tomcat". No other
 form of product name that includes "Tomcat" or "Apache" is



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

svn commit: r1859627 - in /tomcat/site/trunk: docs/legal.html xdocs/legal.xml

[markt]

Author: markt
Date: Tue May 21 12:46:02 2019
New Revision: 1859627

URL: http://svn.apache.org/viewvc?rev=1859627=rev
Log:
Fix broken links

Modified:
tomcat/site/trunk/docs/legal.html
tomcat/site/trunk/xdocs/legal.xml

Modified: tomcat/site/trunk/docs/legal.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/legal.html?rev=1859627=1859626=1859627=diff
==
--- tomcat/site/trunk/docs/legal.html (original)
+++ tomcat/site/trunk/docs/legal.html Tue May 21 12:46:02 2019
@@ -265,7 +265,7 @@ Version 2.0 (current).
 help file or similar. Subsequent references may refer to "Tomcat".
 
 
-You may use the Powered by Tomcat
+You may use the Powered by Tomcat
 logo.
 
 You may not use the Tomcat logo

Modified: tomcat/site/trunk/xdocs/legal.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/legal.xml?rev=1859627=1859626=1859627=diff
==
--- tomcat/site/trunk/xdocs/legal.xml (original)
+++ tomcat/site/trunk/xdocs/legal.xml Tue May 21 12:46:02 2019
@@ -53,7 +53,7 @@ Version 2.0 (current).
 of "Apache Tomcat" for at least the first reference on any web 
page,
 help file or similar. Subsequent references may refer to "Tomcat".
 
-You may use the Powered by Tomcat
+You may use the Powered by 
Tomcat
 logo.
 You may not use the Tomcat logo
 without the permission of the Apache Tomcat PMC.



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

[tomcat] branch master updated: Extra fixes for https://bz.apache.org/bugzilla/show_bug.cgi?id=62841

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 8551008  Extra fixes for 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62841
8551008 is described below

commit 855100831fc3d2077dfcf930c3da6ef40614d8fd
Author: Mark Thomas 
AuthorDate: Tue May 21 13:38:08 2019 +0100

Extra fixes for https://bz.apache.org/bugzilla/show_bug.cgi?id=62841

Thanks to kfujino's review
---
 java/org/apache/catalina/ha/session/DeltaManager.java | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java 
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 7f0df95..136c549 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -585,7 +585,12 @@ public class DeltaManager extends ClusterManagerBase{
  * @param deltaRequest The request to serialize
  * @return serialized delta request
  * @throws IOException IO error with serialization
+ *
+ * @deprecated Unused. This will be removed in Tomcat 10.
+ * Calling this method may result in a deadlock. See:
+ * https://bz.apache.org/bugzilla/show_bug.cgi?id=62841
  */
+@Deprecated
 protected byte[] serializeDeltaRequest(DeltaSession session, DeltaRequest 
deltaRequest)
 throws IOException {
 session.lock();
@@ -973,7 +978,7 @@ public class DeltaManager extends ClusterManagerBase{
 deltaRequest = session.replaceDeltaRequest(newDeltaRequest);
 if (deltaRequest.getSize() > 0) {
 counterSend_EVT_SESSION_DELTA++;
-byte[] data = serializeDeltaRequest(session,deltaRequest);
+byte[] data = deltaRequest.serialize();
 msg = new SessionMessageImpl(getName(),
  SessionMessage.EVT_SESSION_DELTA,
  data,


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

Re: [tomcat] 02/03: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62841 poss deadlock

[Mark Thomas]

On 21/05/2019 09:03, Keiichi Fujino wrote:
> 2019年5月16日(木) 21:55 mailto:ma...@apache.org>>:
> 
> This is an automated email from the ASF dual-hosted git repository.
> 
> markt pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> 
> commit ab70de3278d5e506661faeb5febf71a061b89179
> Author: Mark Thomas mailto:ma...@apache.org>>
> AuthorDate: Thu May 16 13:36:39 2019 +0100
> 
>     Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62841 poss
> deadlock
> 
>     Refactor the DeltaRequest serialization to reduce the window during
>     which the DeltaSession is locked and to remove a potential cause of
>     deadlocks during serialization.



> In DeltaManager#serializeDeltaRequest, the session lock has been is
> obtained.
> Do we need to remove it? or replace to deltaRequest.serialize();

You are correct. The deadlock is still going to occur. I think we need
to deprecate serializeDeltaRequest().

> Do you have any plan for applying this for using BackupManager ?
> There are similar codes in AbstractReplicatedMap#replicate.
> Do we need to apply a similar fix to AbstractReplicatedMap#replicate ?

Probably. I'll trace the call hierarchy back from
DeltaRequest.serialize() and ensure nothing is holding the session lock.

Thanks for the review.

Mark

> 
> 
>  
> 
>      // -
> HttpSession Properties
> 
> @@ -668,6 +688,8 @@ public class DeltaSession extends
> StandardSession implements Externalizable,Clus
> 
>      public void setAttribute(String name, Object value, boolean
> notify,boolean addDeltaRequest) {
> 
> +        log.info ("setAttribute name [" + name +
> ", value [" + value + "]");
> +
>          // Name cannot be null
>          if (name == null) throw new
> 
> IllegalArgumentException(sm.getString("standardSession.setAttribute.namenull"));
> 
> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
> index cfd34e2..c08fa7e 100644
> --- a/webapps/docs/changelog.xml
> +++ b/webapps/docs/changelog.xml
> @@ -132,6 +132,12 @@
>    
>      
>        
> +        62841: Refactor the DeltaRequest
> serialization
> +        to reduce the window during which the
> DeltaSession is
> +        locked and to remove a potential cause of deadlocks during
> +        serialization. (markt)
> +      
> +      
>          63441: Further streamline the processing of
> session creation
>          messages in the DeltaManager to reduce the
> possibility of a
>          session update message being processed before the session
> has been
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> 
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 
> 
> 
> 
> -- 
> Keiichi.Fujino


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

[Bug 63445] “Too many open files” after migrating from Tomcat 7 to Tomcat 9

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|REOPENED|RESOLVED

--- Comment #3 from Mark Thomas  ---
The users mailing list is the place to seek assistance with this issue.

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

Re: [tomcat] branch master updated: Use https instead of http

[Mark Thomas]

On 21/05/2019 13:14, Coty Sutherland wrote:
> On Tue, May 21, 2019 at 8:10 AM Mark Thomas  > wrote:
> 
> On 21/05/2019 13:08, Mark Thomas wrote:
> > On 21/05/2019 13:02, csuth...@apache.org
>  wrote:
> >> This is an automated email from the ASF dual-hosted git repository.
> >>
> >> csutherl pushed a commit to branch master
> >> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> >>
> >>
> >> The following commit(s) were added to refs/heads/master by this push:
> >>      new beb2dca  Use https instead of http
> >> beb2dca is described below
> >>
> >> commit beb2dca83bb4084432fd3b44e06973730ad4dc7d
> >> Author: Coty Sutherland  >
> >> AuthorDate: Tue May 21 08:01:53 2019 -0400
> >>
> >>     Use https instead of http
> >
> > -1. Please revert this. It will break the build if a mirror is
> selected
> > that does not support http. It is also unnecessary. Any file
> downloaded
> 
> s/does not support http/does not support https/
> 
> 
> Ack. I checked the URL before pushing and noted that the mirrors I hit
> redirected to http, but I didn't happen to get one that didn't support
> it (and it didn't cross my mind). Reverted.

Thanks.

Some of those links may be safe to switch to https but the mirror link
definitely isn't.

>From memory there has already been at least one trawl though the Tomcat
repo changing everything to https that was safe to change. That was a
while ago. It may be time for another one. Anything that is changed
needs to be manually checked first to make sure that there is an https
equivalent.

Note that for the website, the recommendation is to use protocol
relative links so that users retain the choice of using http or https.

Mark

>  
> 
> 
> Mark
> 
> > over http is also checked against the known hash.
> >
> > Check the history of that file for more details.
> >
> > Mark
> >
> >
> >
> >> ---
> >>  build.properties.default | 10 +-
> >>  build.xml                |  2 +-
> >>  2 files changed, 6 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/build.properties.default b/build.properties.default
> >> index 1bacc19..cc217b6 100644
> >> --- a/build.properties.default
> >> +++ b/build.properties.default
> >> @@ -90,7 +90,7 @@ compile.debug=true
> >>  # Do not pass -deprecation (-Xlint:deprecation) flag to javac
> >>  compile.deprecation=false
> >> 
> >>
> 
> -base-apache.loc.1=http://www.apache.org/dyn/closer.lua?action=download=
> >>
> 
> +base-apache.loc.1=https://www.apache.org/dyn/closer.lua?action=download=
> >>  base-apache.loc.2=https://archive.apache.org/dist
> >>  base-commons.loc.1=${base-apache.loc.1}/commons
> >>  base-commons.loc.2=${base-apache.loc.2}/commons
> >> @@ -126,8 +126,8 @@
> 
> wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
> >>  # See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before
> updating
> >>  #
> >>  # Checksum is from "SHA512 Checksums for 4.10" link at
> >> -#
> http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
> >> -#
> 
> http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
> >> +#
> https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
> >> +#
> 
> https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
> >>  #
> >>  jdt.version=4.10
> >>  jdt.release=R-4.10-201812060815
> >> @@ -137,8 +137,8 @@
> 
> jdt.checksum.value=6528d1933d752f909e61456f1a3cbb3ae3999d263701a459e6f4fc33f97f7
> >>  jdt.home=${base.path}/ecj-${jdt.version}
> >>  jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
> >>  # The download will be moved to the archive area eventually. We
> are taking care of that in advance.
> >>
> 
> -jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
> 
> 
> >>
> 
> -jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
> 
> 
> >>
> 
> +jdt.loc.1=https://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
> 
> 
> >>
> 
> +jdt.loc.2=https://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
> 
> 

Re: [tomcat] branch master updated: Use https instead of http

[Coty Sutherland]

On Tue, May 21, 2019 at 8:10 AM Mark Thomas  wrote:

> On 21/05/2019 13:08, Mark Thomas wrote:
> > On 21/05/2019 13:02, csuth...@apache.org wrote:
> >> This is an automated email from the ASF dual-hosted git repository.
> >>
> >> csutherl pushed a commit to branch master
> >> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> >>
> >>
> >> The following commit(s) were added to refs/heads/master by this push:
> >>  new beb2dca  Use https instead of http
> >> beb2dca is described below
> >>
> >> commit beb2dca83bb4084432fd3b44e06973730ad4dc7d
> >> Author: Coty Sutherland 
> >> AuthorDate: Tue May 21 08:01:53 2019 -0400
> >>
> >> Use https instead of http
> >
> > -1. Please revert this. It will break the build if a mirror is selected
> > that does not support http. It is also unnecessary. Any file downloaded
>
> s/does not support http/does not support https/
>

Ack. I checked the URL before pushing and noted that the mirrors I hit
redirected to http, but I didn't happen to get one that didn't support it
(and it didn't cross my mind). Reverted.


>
> Mark
>
> > over http is also checked against the known hash.
> >
> > Check the history of that file for more details.
> >
> > Mark
> >
> >
> >
> >> ---
> >>  build.properties.default | 10 +-
> >>  build.xml|  2 +-
> >>  2 files changed, 6 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/build.properties.default b/build.properties.default
> >> index 1bacc19..cc217b6 100644
> >> --- a/build.properties.default
> >> +++ b/build.properties.default
> >> @@ -90,7 +90,7 @@ compile.debug=true
> >>  # Do not pass -deprecation (-Xlint:deprecation) flag to javac
> >>  compile.deprecation=false
> >>
> >> -base-apache.loc.1=
> http://www.apache.org/dyn/closer.lua?action=download=
> >> +base-apache.loc.1=
> https://www.apache.org/dyn/closer.lua?action=download=
> >>  base-apache.loc.2=https://archive.apache.org/dist
> >>  base-commons.loc.1=${base-apache.loc.1}/commons
> >>  base-commons.loc.2=${base-apache.loc.2}/commons
> >> @@ -126,8 +126,8 @@
> wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
> >>  # See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before
> updating
> >>  #
> >>  # Checksum is from "SHA512 Checksums for 4.10" link at
> >> -#
> http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
> >> -#
> http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
> >> +#
> https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
> >> +#
> https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
> >>  #
> >>  jdt.version=4.10
> >>  jdt.release=R-4.10-201812060815
> >> @@ -137,8 +137,8 @@
> jdt.checksum.value=6528d1933d752f909e61456f1a3cbb3ae3999d263701a459e6f4fc33f97f7
> >>  jdt.home=${base.path}/ecj-${jdt.version}
> >>  jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
> >>  # The download will be moved to the archive area eventually. We are
> taking care of that in advance.
> >> -jdt.loc.1=
> http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
> >> -jdt.loc.2=
> http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
> >> +jdt.loc.1=
> https://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
> >> +jdt.loc.2=
> https://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
> >>
> >>  # - Tomcat native library -
> >>  tomcat-native.version=1.2.21
> >> diff --git a/build.xml b/build.xml
> >> index 6e91e91..4d76077 100644
> >> --- a/build.xml
> >> +++ b/build.xml
> >> @@ -1971,7 +1971,7 @@ Apache Tomcat ${version} native binaries for
> Win64 AMD64/EMT64 platform.
> >>
> >>
> >>
> >> -  http://docs.oracle.com/javase/8/docs/api/"/>
> >> +  https://docs.oracle.com/javase/8/docs/api/"/>
> >>https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
> >>https://javaee.github.io/javaee-spec/javadocs/"/>
> >>
> >>
> >>
> >> -
> >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> >> For additional commands, e-mail: dev-h...@tomcat.apache.org
> >>
> >
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> >
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[tomcat] branch master updated: Revert "Use https instead of http" :(

[csutherl]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 4ef8148  Revert "Use https instead of http" :(
4ef8148 is described below

commit 4ef814827cbb1401a324b4785f0e80bae8656103
Author: Coty Sutherland 
AuthorDate: Tue May 21 08:13:10 2019 -0400

Revert "Use https instead of http" :(

This reverts commit beb2dca83bb4084432fd3b44e06973730ad4dc7d.
---
 build.properties.default | 10 +-
 build.xml|  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index cc217b6..1bacc19 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -90,7 +90,7 @@ compile.debug=true
 # Do not pass -deprecation (-Xlint:deprecation) flag to javac
 compile.deprecation=false
 
-base-apache.loc.1=https://www.apache.org/dyn/closer.lua?action=download=
+base-apache.loc.1=http://www.apache.org/dyn/closer.lua?action=download=
 base-apache.loc.2=https://archive.apache.org/dist
 base-commons.loc.1=${base-apache.loc.1}/commons
 base-commons.loc.2=${base-apache.loc.2}/commons
@@ -126,8 +126,8 @@ 
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
 # See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
 #
 # Checksum is from "SHA512 Checksums for 4.10" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
-# 
https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
+# 
http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
 #
 jdt.version=4.10
 jdt.release=R-4.10-201812060815
@@ -137,8 +137,8 @@ 
jdt.checksum.value=6528d1933d752f909e61456f1a3cbb3ae3999d263701a459e6f4fc33f97f7
 jdt.home=${base.path}/ecj-${jdt.version}
 jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
 # The download will be moved to the archive area eventually. We are taking 
care of that in advance.
-jdt.loc.1=https://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
-jdt.loc.2=https://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
 
 # - Tomcat native library -
 tomcat-native.version=1.2.21
diff --git a/build.xml b/build.xml
index 4d76077..6e91e91 100644
--- a/build.xml
+++ b/build.xml
@@ -1971,7 +1971,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   
   
   
-  https://docs.oracle.com/javase/8/docs/api/"/>
+  http://docs.oracle.com/javase/8/docs/api/"/>
   https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
   https://javaee.github.io/javaee-spec/javadocs/"/>
   


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

Re: [tomcat] branch master updated: Use https instead of http

[Mark Thomas]

On 21/05/2019 13:08, Mark Thomas wrote:
> On 21/05/2019 13:02, csuth...@apache.org wrote:
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> csutherl pushed a commit to branch master
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>
>>
>> The following commit(s) were added to refs/heads/master by this push:
>>  new beb2dca  Use https instead of http
>> beb2dca is described below
>>
>> commit beb2dca83bb4084432fd3b44e06973730ad4dc7d
>> Author: Coty Sutherland 
>> AuthorDate: Tue May 21 08:01:53 2019 -0400
>>
>> Use https instead of http
> 
> -1. Please revert this. It will break the build if a mirror is selected
> that does not support http. It is also unnecessary. Any file downloaded

s/does not support http/does not support https/

Mark

> over http is also checked against the known hash.
> 
> Check the history of that file for more details.
> 
> Mark
> 
> 
> 
>> ---
>>  build.properties.default | 10 +-
>>  build.xml|  2 +-
>>  2 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/build.properties.default b/build.properties.default
>> index 1bacc19..cc217b6 100644
>> --- a/build.properties.default
>> +++ b/build.properties.default
>> @@ -90,7 +90,7 @@ compile.debug=true
>>  # Do not pass -deprecation (-Xlint:deprecation) flag to javac
>>  compile.deprecation=false
>>  
>> -base-apache.loc.1=http://www.apache.org/dyn/closer.lua?action=download=
>> +base-apache.loc.1=https://www.apache.org/dyn/closer.lua?action=download=
>>  base-apache.loc.2=https://archive.apache.org/dist
>>  base-commons.loc.1=${base-apache.loc.1}/commons
>>  base-commons.loc.2=${base-apache.loc.2}/commons
>> @@ -126,8 +126,8 @@ 
>> wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
>>  # See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
>>  #
>>  # Checksum is from "SHA512 Checksums for 4.10" link at
>> -# http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
>> -# 
>> http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
>> +# https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
>> +# 
>> https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
>>  #
>>  jdt.version=4.10
>>  jdt.release=R-4.10-201812060815
>> @@ -137,8 +137,8 @@ 
>> jdt.checksum.value=6528d1933d752f909e61456f1a3cbb3ae3999d263701a459e6f4fc33f97f7
>>  jdt.home=${base.path}/ecj-${jdt.version}
>>  jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
>>  # The download will be moved to the archive area eventually. We are taking 
>> care of that in advance.
>> -jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
>> -jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
>> +jdt.loc.1=https://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
>> +jdt.loc.2=https://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
>>  
>>  # - Tomcat native library -
>>  tomcat-native.version=1.2.21
>> diff --git a/build.xml b/build.xml
>> index 6e91e91..4d76077 100644
>> --- a/build.xml
>> +++ b/build.xml
>> @@ -1971,7 +1971,7 @@ Apache Tomcat ${version} native binaries for Win64 
>> AMD64/EMT64 platform.
>>
>>
>>
>> -  http://docs.oracle.com/javase/8/docs/api/"/>
>> +  https://docs.oracle.com/javase/8/docs/api/"/>
>>> href="https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
>>https://javaee.github.io/javaee-spec/javadocs/"/>
>>
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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

Re: [tomcat] branch master updated: Use https instead of http

[Mark Thomas]

On 21/05/2019 13:02, csuth...@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
> 
> csutherl pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> 
> 
> The following commit(s) were added to refs/heads/master by this push:
>  new beb2dca  Use https instead of http
> beb2dca is described below
> 
> commit beb2dca83bb4084432fd3b44e06973730ad4dc7d
> Author: Coty Sutherland 
> AuthorDate: Tue May 21 08:01:53 2019 -0400
> 
> Use https instead of http

-1. Please revert this. It will break the build if a mirror is selected
that does not support http. It is also unnecessary. Any file downloaded
over http is also checked against the known hash.

Check the history of that file for more details.

Mark



> ---
>  build.properties.default | 10 +-
>  build.xml|  2 +-
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/build.properties.default b/build.properties.default
> index 1bacc19..cc217b6 100644
> --- a/build.properties.default
> +++ b/build.properties.default
> @@ -90,7 +90,7 @@ compile.debug=true
>  # Do not pass -deprecation (-Xlint:deprecation) flag to javac
>  compile.deprecation=false
>  
> -base-apache.loc.1=http://www.apache.org/dyn/closer.lua?action=download=
> +base-apache.loc.1=https://www.apache.org/dyn/closer.lua?action=download=
>  base-apache.loc.2=https://archive.apache.org/dist
>  base-commons.loc.1=${base-apache.loc.1}/commons
>  base-commons.loc.2=${base-apache.loc.2}/commons
> @@ -126,8 +126,8 @@ 
> wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
>  # See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
>  #
>  # Checksum is from "SHA512 Checksums for 4.10" link at
> -# http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
> -# 
> http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
> +# https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
> +# 
> https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
>  #
>  jdt.version=4.10
>  jdt.release=R-4.10-201812060815
> @@ -137,8 +137,8 @@ 
> jdt.checksum.value=6528d1933d752f909e61456f1a3cbb3ae3999d263701a459e6f4fc33f97f7
>  jdt.home=${base.path}/ecj-${jdt.version}
>  jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
>  # The download will be moved to the archive area eventually. We are taking 
> care of that in advance.
> -jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
> -jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
> +jdt.loc.1=https://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
> +jdt.loc.2=https://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
>  
>  # - Tomcat native library -
>  tomcat-native.version=1.2.21
> diff --git a/build.xml b/build.xml
> index 6e91e91..4d76077 100644
> --- a/build.xml
> +++ b/build.xml
> @@ -1971,7 +1971,7 @@ Apache Tomcat ${version} native binaries for Win64 
> AMD64/EMT64 platform.
>
>
>
> -  http://docs.oracle.com/javase/8/docs/api/"/>
> +  https://docs.oracle.com/javase/8/docs/api/"/>
> href="https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
>https://javaee.github.io/javaee-spec/javadocs/"/>
>
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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

[tomcat] branch master updated: Use https instead of http

[csutherl]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new beb2dca  Use https instead of http
beb2dca is described below

commit beb2dca83bb4084432fd3b44e06973730ad4dc7d
Author: Coty Sutherland 
AuthorDate: Tue May 21 08:01:53 2019 -0400

Use https instead of http
---
 build.properties.default | 10 +-
 build.xml|  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 1bacc19..cc217b6 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -90,7 +90,7 @@ compile.debug=true
 # Do not pass -deprecation (-Xlint:deprecation) flag to javac
 compile.deprecation=false
 
-base-apache.loc.1=http://www.apache.org/dyn/closer.lua?action=download=
+base-apache.loc.1=https://www.apache.org/dyn/closer.lua?action=download=
 base-apache.loc.2=https://archive.apache.org/dist
 base-commons.loc.1=${base-apache.loc.1}/commons
 base-commons.loc.2=${base-apache.loc.2}/commons
@@ -126,8 +126,8 @@ 
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
 # See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
 #
 # Checksum is from "SHA512 Checksums for 4.10" link at
-# http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
-# 
http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
+# 
https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
 #
 jdt.version=4.10
 jdt.release=R-4.10-201812060815
@@ -137,8 +137,8 @@ 
jdt.checksum.value=6528d1933d752f909e61456f1a3cbb3ae3999d263701a459e6f4fc33f97f7
 jdt.home=${base.path}/ecj-${jdt.version}
 jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
 # The download will be moved to the archive area eventually. We are taking 
care of that in advance.
-jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
-jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.1=https://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.2=https://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
 
 # - Tomcat native library -
 tomcat-native.version=1.2.21
diff --git a/build.xml b/build.xml
index 6e91e91..4d76077 100644
--- a/build.xml
+++ b/build.xml
@@ -1971,7 +1971,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   
   
   
-  http://docs.oracle.com/javase/8/docs/api/"/>
+  https://docs.oracle.com/javase/8/docs/api/"/>
   https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
   https://javaee.github.io/javaee-spec/javadocs/"/>
   


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

[GitHub] [tomcat] dusiema commented on issue #166: Corrected typo "Bescrheibung" to "Beschreibung"

[GitBox]

dusiema commented on issue #166: Corrected typo "Bescrheibung" to "Beschreibung"
URL: https://github.com/apache/tomcat/pull/166#issuecomment-494354942
 
 
   Thanks for the link. I created an account and will try to contribute some...


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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

[tomcat] branch master updated: Update German Translations.

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 39476b0  Update German Translations.
39476b0 is described below

commit 39476b0c5251c4e97f2a47e41a855bb290f98651
Author: Mark Thomas 
AuthorDate: Tue May 21 11:24:50 2019 +0100

Update German Translations.
---
 java/org/apache/catalina/connector/LocalStrings_de.properties| 3 +++
 java/org/apache/catalina/core/LocalStrings_de.properties | 3 +++
 .../{tribes/tipis => ha/authenticator}/LocalStrings_de.properties| 5 +
 java/org/apache/catalina/ha/deploy/LocalStrings_de.properties| 1 +
 java/org/apache/catalina/ha/session/LocalStrings_de.properties   | 1 +
 java/org/apache/catalina/manager/LocalStrings_de.properties  | 2 ++
 java/org/apache/catalina/manager/host/LocalStrings_de.properties | 1 +
 java/org/apache/catalina/session/LocalStrings_de.properties  | 1 +
 java/org/apache/catalina/tribes/tipis/LocalStrings_de.properties | 1 +
 java/org/apache/catalina/valves/LocalStrings_de.properties   | 3 ++-
 java/org/apache/coyote/LocalStrings_de.properties| 2 ++
 java/org/apache/coyote/http2/LocalStrings_de.properties  | 2 ++
 java/org/apache/jasper/resources/LocalStrings_de.properties  | 3 +++
 java/org/apache/tomcat/util/net/LocalStrings_de.properties   | 1 +
 java/org/apache/tomcat/websocket/LocalStrings_de.properties  | 1 +
 webapps/docs/changelog.xml   | 5 +
 16 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/connector/LocalStrings_de.properties 
b/java/org/apache/catalina/connector/LocalStrings_de.properties
index a53692e9..d1826ce 100644
--- a/java/org/apache/catalina/connector/LocalStrings_de.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_de.properties
@@ -13,12 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+coyoteAdapter.checkRecycled.response=Eine nicht recycelte Antwort wurde 
erkannt und recylet
 coyoteAdapter.debug=Die Variable [{0}] hat den Wert [{1}]
+coyoteAdapter.parsePathParam=Das Parsen der Pfadparameter ist schlug mit der 
Kodierung [{0}] fehl. Die Parameter im Pfad werden ignoriert
 
 coyoteConnector.invalidEncoding=Das Encoding [{0}] wird von der JRE nicht 
erkannt. Der Konnektor wird weiterhin [{1}] nutzen
 coyoteConnector.invalidPort=Der Konnektor kann nicht starten, da der als Port 
angegebene Wert [{0}] nicht gültig ist.
 coyoteConnector.protocolHandlerStartFailed=Der Start des Protokoll-Handlers 
ist fehlgeschlagen
 
+coyoteRequest.filterAsyncSupportUnknown=Es konnte nicht ermittelt werden ob 
einer der Filter asyncrone Bearbeitung nicht unterstützt
 coyoteRequest.gssLifetimeFail=Die verbleibende Lebenzeit für den Principal 
[{0}] konnte nicht ermittelt werden.
 
 responseFacade.nullResponse=Das Response Objekt ist wiederverwendet worden und 
nicht mehr mit der Facade verknüpft.
diff --git a/java/org/apache/catalina/core/LocalStrings_de.properties 
b/java/org/apache/catalina/core/LocalStrings_de.properties
index 669de75..fc39807 100644
--- a/java/org/apache/catalina/core/LocalStrings_de.properties
+++ b/java/org/apache/catalina/core/LocalStrings_de.properties
@@ -28,6 +28,8 @@ containerBase.backgroundProcess.cluster=Ausnahme beim 
Abarbeiten des Cluster [{0
 containerBase.backgroundProcess.error=Während der Hintergrund Thread 
abgearbeitet wurde trat eine Exception auf
 containerBase.backgroundProcess.unexpectedThreadDeath=Unerwarteter Tod des 
Hintergrund-Threads [{0}]
 
+defaultInstanceManager.invalidInjection=Ungültige ressource injection 
Annotation
+
 filterChain.filter=Während der Filter Bearbeitung trat eine Exception auf
 
 jreLeakListener.ldapPoolManagerFail=Konnte die Erzeugung der Klasse 
com.sun.jndi.ldap.LdapPoolManager während des Starts von Tomcat nicht auslösen. 
Dies sollte zur Vermeidung von Memory-Leaks dienen. Der Fehlschlag ist ein 
erwartetes Verhalten bei nicht-Sun JVMs.
@@ -55,3 +57,4 @@ standardHost.nullName=Hostname wird benötigt
 
 standardWrapper.isUnavailable=Das Servlet [{0}] ist zur Zeit nicht verfügbar
 standardWrapper.notFound=Servlet [{0}] ist nicht verfügbar
+standardWrapper.unloading=Das Servlet [{0}] kann nicht allokiert werden, weil 
es entladen wurde
diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_de.properties 
b/java/org/apache/catalina/ha/authenticator/LocalStrings_de.properties
similarity index 72%
copy from java/org/apache/catalina/tribes/tipis/LocalStrings_de.properties
copy to java/org/apache/catalina/ha/authenticator/LocalStrings_de.properties
index 9322ab4..482dc1e 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_de.properties
+++ 

[tomcat] branch master updated: Update Czech translations

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 8b899fa  Update Czech translations
8b899fa is described below

commit 8b899fa1959a4fd97a3238864f21586645e5dd34
Author: Mark Thomas 
AuthorDate: Tue May 21 11:13:58 2019 +0100

Update Czech translations
---
 java/org/apache/catalina/authenticator/LocalStrings_cs.properties | 1 +
 java/org/apache/catalina/connector/LocalStrings_cs.properties | 1 +
 java/org/apache/catalina/filters/LocalStrings_cs.properties   | 2 ++
 java/org/apache/catalina/ha/deploy/LocalStrings_cs.properties | 1 +
 java/org/apache/catalina/manager/LocalStrings_cs.properties   | 3 +++
 java/org/apache/catalina/session/LocalStrings_cs.properties   | 1 +
 java/org/apache/catalina/valves/LocalStrings_cs.properties| 1 +
 java/org/apache/tomcat/util/net/LocalStrings_cs.properties| 2 ++
 webapps/docs/changelog.xml| 4 
 9 files changed, 16 insertions(+)

diff --git a/java/org/apache/catalina/authenticator/LocalStrings_cs.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_cs.properties
index fd27dcd..2dabeb0 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_cs.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_cs.properties
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+authenticator.formlogin=Neplatná přímá reference na formulář přihlašovací 
stránky
 authenticator.jaspicCleanSubjectFail=Chyba čištění JASPIC  předmětu
 authenticator.jaspicServerAuthContextFail=Získání instance JASPIC 
ServerAuthContext selhalo
 authenticator.sessionExpired=Časový rámec pro přihlášení byl překročen. Pokud 
chcete pokrařovat, tak musíte kliknout dvakrát zpět a znovu kliknout na 
požadovaný link, nebo zavřít a znovu otevřít Váš prohlížeč
diff --git a/java/org/apache/catalina/connector/LocalStrings_cs.properties 
b/java/org/apache/catalina/connector/LocalStrings_cs.properties
index 7925311..bceb1ff 100644
--- a/java/org/apache/catalina/connector/LocalStrings_cs.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_cs.properties
@@ -26,5 +26,6 @@ coyoteInputStream.nbNotready=V neblokujícím módu nelze číst 
ServletInputStr
 coyoteRequest.filterAsyncSupportUnknown=Nelze určit, zda některý filtr 
nepodporuje asynchronní zpracování
 coyoteRequest.gssLifetimeFail=Selhalo získání zbývající doby trvání pro 
uživatele [{0}]
 coyoteRequest.noMultipartConfig=Nelze zpracovat částí, neboť multi-part 
konfigurace nebyla dodána
+coyoteRequest.sessionEndAccessFail=Výjimka vyvolala ukončení přístupu k 
session během recykllování dotazu
 
 responseFacade.nullResponse=Objekt odpovědi byl recyklován a již není 
asociován s touto fasádou
diff --git a/java/org/apache/catalina/filters/LocalStrings_cs.properties 
b/java/org/apache/catalina/filters/LocalStrings_cs.properties
index dd2830c..9352837 100644
--- a/java/org/apache/catalina/filters/LocalStrings_cs.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_cs.properties
@@ -17,6 +17,8 @@ corsFilter.invalidPreflightMaxAge=Nelze načíst preflightMaxAge
 
 csrfPrevention.invalidRandomClass=Nelze vytvořit zdroj Random pomocí třídy 
[{0}]
 
+expiresFilter.noExpirationConfigured=\n\
+Dotaz [{0}] se statusem odpovědi [{1}] content-type [{2}], bez vypršení 
nakonfigurován
 expiresFilter.noExpirationConfiguredForContentType=Nebyla nalezena konfigurace 
vypršení pro content-type [{0}]
 expiresFilter.startingPointInvalid=Neplatný počáteční bod 
(access|now|modification|a|m) [{0}] v předpisu [{1}]
 expiresFilter.unsupportedStartingPoint=Nepodporovaný začátek [{0}]
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_cs.properties 
b/java/org/apache/catalina/ha/deploy/LocalStrings_cs.properties
index 3671351..399e8ad 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_cs.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_cs.properties
@@ -19,6 +19,7 @@ farmWarDeployer.modInstallFail=Nelze nainstalovat WAR soubor
 farmWarDeployer.msgIoe=Nelze přečíst zprávu z farmy pro nasazení WAR.
 farmWarDeployer.removeFailRemote=Lokální odstranění z [{0}] selhalo, jiný 
manager má aplikaci v provozu!
 farmWarDeployer.servicingUndeploy=Aplikace [{0}] je provozována anemůže být 
odebrána ze záložního nódu clusteru
+farmWarDeployer.undeployEnd=Odstranění [{0}] ukončeno.
 
 warWatcher.cantListWatchDir=Nelze vypsat soubory v WatchDir [{0}]: 
překontrolujte, zda jde o adresář a má nastaveny práva pro čtení.
 warWatcher.checkingWar=Kontrola WAR souboru [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_cs.properties 
b/java/org/apache/catalina/manager/LocalStrings_cs.properties
index 62f28bb..42c51cc 100644
--- 

[GitHub] [tomcat] markt-asf closed pull request #166: Corrected typo "Bescrheibung" to "Beschreibung"

[GitBox]

markt-asf closed pull request #166: Corrected typo "Bescrheibung" to 
"Beschreibung"
URL: https://github.com/apache/tomcat/pull/166
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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

[GitHub] [tomcat] markt-asf commented on issue #166: Corrected typo "Bescrheibung" to "Beschreibung"

[GitBox]

markt-asf commented on issue #166: Corrected typo "Bescrheibung" to 
"Beschreibung"
URL: https://github.com/apache/tomcat/pull/166#issuecomment-494323962
 
 
   Thanks for the report and the fix.
   We manage translations via https://poeditor.com/projects/view?id=221603 (and 
some custom export/import) code. I have updated the translation there and will 
import it shortly.
   You are very welcome to create yourself an account on POEditor and fix any 
other errors you have spotted and/or contribute to expanding the coverage of 
the translations.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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

[tomcat] branch master updated (d2752e5 -> 91a1c5c)

[markt]

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

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


from d2752e5  Improve NIO2 flush
 new d0d9fd2  Fix order
 new 91a1c5c  Expand TLS docs for deprecated attribute conversion

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


Summary of changes:
 webapps/docs/changelog.xml   |  24 +++--
 webapps/docs/config/http.xml | 240 +--
 2 files changed, 179 insertions(+), 85 deletions(-)


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

[tomcat] 02/02: Expand TLS docs for deprecated attribute conversion

[markt]

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

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

commit 91a1c5c86bcd695c3a605c6b629b8b5fb62fde24
Author: Mark Thomas 
AuthorDate: Tue May 21 10:43:39 2019 +0100

Expand TLS docs for deprecated attribute conversion
---
 webapps/docs/changelog.xml   |   8 ++
 webapps/docs/config/http.xml | 240 +--
 2 files changed, 171 insertions(+), 77 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cdefb57..269ea21 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -174,6 +174,14 @@
   
 
   
+  
+
+  
+Expand the explanation of how deprecated TLS configuration attributes
+are converted to the new TLS configuration style. (markt)
+  
+
+  
   
 
   
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index a2dccfe..b56e42d 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -1561,148 +1561,202 @@
 
   The following NIO and NIO2 SSL configuration attributes have been
   deprecated in favor of the default
-  SSLHostConfig element.
+  SSLHostConfig element with
+  the hostName of _default_. If this
+  SSLHostConfig element is not
+  explicitly defined, it will be created..
   
 
   
 
 
   This is an alias for the keyManagerAlgorithm attribute of
-  the default SSLHostConfig
-  element.
+  the SSLHostConfig element with
+  the hostName of _default_. If this
+  SSLHostConfig element is not
+  explicitly defined, it will be created.
 
 
 
-  This is an alias for the ciphers attribute of the default
-  SSLHostConfig element.
+  This is an alias for the ciphers attribute of the
+  SSLHostConfig element with the
+  hostName of _default_. If this
+  SSLHostConfig element is not
+  explicitly defined, it will be created.
 
 
 
   This is an alias for the certificateVerification 
attribute
-  of the default SSLHostConfig
-  element.
+  of the SSLHostConfig element
+  with the hostName of _default_. If this
+  SSLHostConfig element is not
+  explicitly defined, it will be created.
 
 
 
   This is an alias for the certificateRevocationListFile
-  attribute of the default
-  SSLHostConfig element.
+  attribute of the SSLHostConfig
+  element with the hostName of _default_. If this
+  SSLHostConfig element is not
+  explicitly defined, it will be created.
 
 
 
   This is an alias for the certificateKeyAlias attribute of
   the first Certificate element
-  nested in the default
-  SSLHostConfig element.
+  nested in the SSLHostConfig
+  element with the hostName of _default_. If this
+  Certificate and/or
+  SSLHostConfig element is not
+  explicitly defined, they will be created.
 
 
 
   This is an alias for the certificateKeyPassword attribute
   of the first Certificate element
-  nested in the default
-  SSLHostConfig element.
+  nested in the SSLHostConfig
+  element with the hostName of _default_. If this
+  Certificate and/or
+  SSLHostConfig element is not
+  explicitly defined, they will be created.
 
 
 
   This is an alias for the certificateKeystoreFile 
attribute
   of the first Certificate element
-  nested in the default
-  SSLHostConfig element.
+  nested in the SSLHostConfig
+  element with the hostName of _default_. If this
+  Certificate and/or
+  SSLHostConfig element is not
+  explicitly defined, they will be created.
 
 
 
   This is an alias for the certificateKeystorePassword
   attribute of the first
   Certificate element nested in 
the
-  default SSLHostConfig
-  element.
+  SSLHostConfig
+  element with the hostName of _default_. If this
+  Certificate and/or
+  SSLHostConfig element is not
+  explicitly defined, they will be created.
 
 
 
   This is an alias for the certificateKeystoreProvider
   attribute of the first
   Certificate element nested in 
the
-  default SSLHostConfig
-  element.
+  SSLHostConfig
+  element with the hostName of _default_. If this
+  Certificate and/or
+  SSLHostConfig element is not
+  explicitly defined, they will be created.
 
 
 
   This is an alias for the certificateKeystoreType 
attribute
   of the first Certificate element
-  nested in the default
-  SSLHostConfig element.
+  nested in the SSLHostConfig
+  element with the hostName of _default_. If this
+  Certificate and/or
+  SSLHostConfig element is not
+  explicitly defined, they will be created.
 
 
 
   This is an alias for the sessionCacheSize attribute of 
the
-  

[tomcat] 01/02: Fix order

[markt]

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

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

commit d0d9fd213206b4c185379e0a8728fbc2f7b8f20a
Author: Mark Thomas 
AuthorDate: Tue May 21 10:41:39 2019 +0100

Fix order
---
 webapps/docs/changelog.xml | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index dc552cf..cdefb57 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -166,6 +166,14 @@
   
 
   
+  
+
+  
+Fix timeout logic for async non blocking writes. Identified by
+Coverity Scan. (remm)
+  
+
+  
   
 
   
@@ -177,14 +185,6 @@
   
 
   
-  
-
-  
-Fix timeout logic for async non blocking writes. Identified by
-Coverity Scan. (remm)
-  
-
-  
   
 
   


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

Re: [tomcat] 02/03: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62841 poss deadlock

[Keiichi Fujino]

2019年5月16日(木) 21:55 :

> This is an automated email from the ASF dual-hosted git repository.
>
> markt pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
> commit ab70de3278d5e506661faeb5febf71a061b89179
> Author: Mark Thomas 
> AuthorDate: Thu May 16 13:36:39 2019 +0100
>
> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62841 poss deadlock
>
> Refactor the DeltaRequest serialization to reduce the window during
> which the DeltaSession is locked and to remove a potential cause of
> deadlocks during serialization.
> ---
>  .../apache/catalina/ha/session/DeltaManager.java   | 19
> ++-
>  .../apache/catalina/ha/session/DeltaSession.java   | 22
> ++
>  webapps/docs/changelog.xml |  6 ++
>  3 files changed, 42 insertions(+), 5 deletions(-)
>
> diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
> b/java/org/apache/catalina/ha/session/DeltaManager.java
> index 9f3abef..7f0df95 100644
> --- a/java/org/apache/catalina/ha/session/DeltaManager.java
> +++ b/java/org/apache/catalina/ha/session/DeltaManager.java
> @@ -39,6 +39,7 @@ import org.apache.catalina.tribes.io.ReplicationStream;
>  import org.apache.juli.logging.Log;
>  import org.apache.juli.logging.LogFactory;
>  import org.apache.tomcat.util.ExceptionUtils;
> +import org.apache.tomcat.util.collections.SynchronizedStack;
>  import org.apache.tomcat.util.res.StringManager;
>
>  /**
> @@ -88,6 +89,7 @@ public class DeltaManager extends ClusterManagerBase{
>  private boolean receiverQueue = false ;
>  private boolean stateTimestampDrop = true ;
>  private volatile long stateTransferCreateSendTime;
> +private SynchronizedStack deltaRequestPool = new
> SynchronizedStack<>();
>
>  //  stats
> attributes
>
> @@ -952,10 +954,10 @@ public class DeltaManager extends ClusterManagerBase{
>   *whether this method has been called during session
> expiration
>   * @return a SessionMessage to be sent,
>   */
> -@SuppressWarnings("null") // session can't be null when it is used
>  public ClusterMessage requestCompleted(String sessionId, boolean
> expires) {
>  DeltaSession session = null;
>  SessionMessage msg = null;
> +DeltaRequest deltaRequest = null;
>  try {
>  session = (DeltaSession) findSession(sessionId);
>  if (session == null) {
> @@ -963,8 +965,12 @@ public class DeltaManager extends ClusterManagerBase{
>  // removed the session from the Manager.
>  return null;
>  }
> -DeltaRequest deltaRequest = session.getDeltaRequest();
> -session.lock();
> +DeltaRequest newDeltaRequest = deltaRequestPool.pop();
> +if (newDeltaRequest == null) {
> +// Will be configured in replaceDeltaRequest()
> +newDeltaRequest = new DeltaRequest();
> +}
> +deltaRequest = session.replaceDeltaRequest(newDeltaRequest);
>  if (deltaRequest.getSize() > 0) {
>  counterSend_EVT_SESSION_DELTA++;
>  byte[] data = serializeDeltaRequest(session,deltaRequest);
> @@ -973,14 +979,17 @@ public class DeltaManager extends ClusterManagerBase{
>   data,
>   sessionId,
>   sessionId + "-" +
> System.currentTimeMillis());
> -session.resetDeltaRequest();
>  }
>  } catch (IOException x) {
>
>  log.error(sm.getString("deltaManager.createMessage.unableCreateDeltaRequest",
>  sessionId), x);
>  return null;
>  } finally {
> -if (session!=null) session.unlock();
> +if (deltaRequest != null) {
> +// Reset the instance before it is returned to the pool
> +deltaRequest.reset();
> +deltaRequestPool.push(deltaRequest);
> +}
>  }
>  if(msg == null) {
>  if(!expires && !session.isPrimarySession()) {
> diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java
> b/java/org/apache/catalina/ha/session/DeltaSession.java
> index d25f622..8a186ce 100644
> --- a/java/org/apache/catalina/ha/session/DeltaSession.java
> +++ b/java/org/apache/catalina/ha/session/DeltaSession.java
> @@ -608,6 +608,26 @@ public class DeltaSession extends StandardSession
> implements Externalizable,Clus
>  return deltaRequest;
>  }
>
> +/**
> + * Replace the existing deltaRequest with the provided replacement.
> + *
> + * @param deltaRequest The new deltaRequest. Expected to be either a
> newly
> + * created object or an instance that has been
> reset.
> + *
> + * @return The old 

[GitHub] [tomcat] dusiema opened a new pull request #166: Corrected typo "Bescrheibung" to "Beschreibung"

[GitBox]

dusiema opened a new pull request #166: Corrected typo "Bescrheibung" to 
"Beschreibung"
URL: https://github.com/apache/tomcat/pull/166
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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