date:20200306

[Bug 64202] Upload is broken in version 9.0.31

2020-03-06 Thread bugzilla

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

--- Comment #1 from ishaigorod...@yahoo.com ---
The upload fails with 400 status code error in org.jvnet.mimepull.MIMEParser.
Depending on the browser used it can be:
* Reached EOF, but there is no closing MIME boundary.
* Missing start boundary

-- 
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 64202] New: Upload is broken in version 9.0.31

2020-03-06 Thread bugzilla

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

Bug ID: 64202
   Summary: Upload is broken in version 9.0.31
   Product: Tomcat 9
   Version: 9.0.31
  Hardware: Other
OS: Linux
Status: NEW
  Severity: regression
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: ishaigorod...@yahoo.com
  Target Milestone: -

Created attachment 37067
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=37067=edit
The sample example that demonstrates the breakage

Jersey Multi-part upload is broken when using Mac OS 10.14.6 browsers and CenOS
6/Ubuntu 16 server with Tomcat version 9.0.31 over HTTPS for binary content. 
The upload is working with Tomcat version 9.0.30 for the same client and
server.
To reproduce, unzip the sample attached and follow the steps.
The upload is known to work:
* locally
* over HTTP
* for text content such as CSV and JSON

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

[GitHub] [tomcat] rmaucher commented on issue #256: Added extension point for custom delta requests

2020-03-06 Thread GitBox

rmaucher commented on issue #256: Added extension point for custom delta 
requests
URL: https://github.com/apache/tomcat/pull/256#issuecomment-595968865
 
 
   The change implies all methods of concrete classes become supported stable 
APIs. I think this is too much and we cannot / should not promise that the 
added methods are not going to be refactored away.
   Also, as I pointed out, there's pretty much an infinity of convenient hooks 
that can be added everywhere for extensibility.
   When extending into custom components, I don't think some amount of code 
duplication is that bad. Sure, you may miss bugfixes but it's more likely to 
remain stable that way. And when things work and you have no problems, you 
don't need magic bugfixes and random behavior changes IMO.


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

Re: [VOTE] Release Apache Tomcat 8.5.52

2020-03-06 Thread Michael Osipov


Am 2020-03-06 um 12:51 schrieb Mark Thomas:

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

The major changes compared to the 8.5.51 release are:

- Add new attribute persistAuthentication to both StandardManager and
   PersistentManager to support authentication persistence.
   Patch provided by Carsten Klein

- A zero length AJP secret will now behave as if it has not been
   specified.

- Add the TLS request attributes used by IIS to the attributes that
   an AJP Connector will always accept.


Along with lots of other bug fixes and improvements.

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

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

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

The tag is:
https://github.com/apache/tomcat/tree/8.5.52
c83fd06b3cd0c96ffd7dc660107a1283b714483b


Stable for me with
* apr 1.7.0
* tcnative 1.2.23
* openssl 1.1.1d-freebsd

and


Java version: 1.8.0_242, vendor: Oracle Corporation, runtime: 
/usr/local/openjdk8/jre
Default locale: de_DE, platform encoding: UTF-8
OS name: "freebsd", version: "12.1-stable", arch: "amd64", family: "unix"


Suprisingly, some tests fail repeatedly with 1.2.21.

+1 from me.

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

[GitHub] [tomcat] ChristopherSchultz commented on issue #256: Added extension point for custom delta requests

2020-03-06 Thread GitBox

ChristopherSchultz commented on issue #256: Added extension point for custom 
delta requests
URL: https://github.com/apache/tomcat/pull/256#issuecomment-595893950
 
 
   I think this is the same as #240; I just haven't back-ported it.
   
   Can we discuss on #240 what your objections are? The alternative is for a 
user to re-implement 100% of e.g. DeltaManager just to change one aspect of 
it's behavior.


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

[Bug 63691] Add a no-op JarScanner

2020-03-06 Thread bugzilla

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

Remy Maucherat  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|REOPENED|RESOLVED

--- Comment #9 from Remy Maucherat  ---
This is an enhancement that got implemented, so don't reopen this BZ. If you
have an issue, you need to open a new BZ. If you are unsure about it, you can
also ask on the users list.

-- 
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 63691] Add a no-op JarScanner

2020-03-06 Thread bugzilla

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

Joshua Lipstone  changed:

   What|Removed |Added

 Resolution|FIXED   |---
 Status|RESOLVED|REOPENED

--- Comment #8 from Joshua Lipstone  ---
Can you please either undo this or change it so that the Jars are only scanned
if they match the inclusion filter.
As of 9.0.30, if you wanted to set the logic so that it only scans a short list
of jars, you could do:
jarsToSkip=*
jarsToScan=jar1.jar,jar2.jar
As of 9.0.31, this now causes cascading startup failures.

-- 
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: [VOTE] Release Apache Tomcat 9.0.32

2020-03-06 Thread jean-frederic clere


On 06/03/2020 11:12, Mark Thomas wrote:

[X] Stable - go ahead and release as 9.0.32


Tested on fedora32 with tc-native-1.2.23

--
Cheers

Jean-Frederic

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

[tomcat] branch master updated: Expand SSL POST test to exercise the poller more

2020-03-06 Thread 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 f8ef08d  Expand SSL POST test to exercise the poller more
f8ef08d is described below

commit f8ef08de1c40bd5e4c414845a9187e8227a579df
Author: remm 
AuthorDate: Fri Mar 6 16:55:39 2020 +0100

Expand SSL POST test to exercise the poller more

No issue found so far.
---
 test/org/apache/tomcat/util/net/TestSsl.java | 88 ++--
 1 file changed, 56 insertions(+), 32 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TestSsl.java 
b/test/org/apache/tomcat/util/net/TestSsl.java
index 03fe357..7cb5c47 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -24,6 +24,8 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.Reader;
 import java.util.Arrays;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.net.SocketFactory;
 import javax.net.ssl.HandshakeCompletedEvent;
@@ -88,39 +90,61 @@ public class TestSsl extends TomcatBaseTest {
 Tomcat.addServlet(ctxt, "post", new SimplePostServlet());
 ctxt.addServletMappingDecoded("/post", "post");
 tomcat.start();
-
-SSLSocket socket = (SSLSocket) socketFactory.createSocket("localhost",
-getPort());
-
-OutputStream os = socket.getOutputStream();
-
-byte[] bytes = new byte[1024 * 1024]; // 1MB
-Arrays.fill(bytes, (byte) 1);
-
-os.write("POST /post HTTP/1.1\r\n".getBytes());
-os.write("Host: localhost\r\n".getBytes());
-os.write("Content-Length: 1048576\r\n\r\n".getBytes());
-os.write(bytes);
-os.flush();
-
-InputStream is = socket.getInputStream();
-
-// Skip to the end of the headers
-byte[] endOfHeaders = "\r\n\r\n".getBytes();
-int found = 0;
-while (found != endOfHeaders.length) {
-if (is.read() == endOfHeaders[found]) {
-found++;
-} else {
-found = 0;
-}
-}
-
-for (byte c : bytes) {
-int read = is.read();
-Assert.assertEquals(c, read);
+int iterations = 8;
+CountDownLatch latch = new CountDownLatch(iterations);
+AtomicInteger errorCount = new AtomicInteger(0);
+for (int i = 0; i < iterations; i++) {
+new Thread() {
+public void run() {
+try {
+SSLSocket socket = (SSLSocket) 
socketFactory.createSocket("localhost",
+getPort());
+
+OutputStream os = socket.getOutputStream();
+
+byte[] bytes = new byte[16 * 1024 * 1024]; // 16MB
+Arrays.fill(bytes, (byte) 1);
+
+os.write("POST /post HTTP/1.1\r\n".getBytes());
+os.write("Host: localhost\r\n".getBytes());
+os.write(("Content-Length: " + 
Integer.valueOf(bytes.length) + "\r\n\r\n").getBytes());
+// Write in 128KB blocks
+for (int i = 0; i < bytes.length / (128 * 1024); i++) {
+os.write(bytes, 0, 1024 * 128);
+Thread.sleep(10);
+}
+os.flush();
+
+InputStream is = socket.getInputStream();
+
+// Skip to the end of the headers
+byte[] endOfHeaders = "\r\n\r\n".getBytes();
+int found = 0;
+while (found != endOfHeaders.length) {
+if (is.read() == endOfHeaders[found]) {
+found++;
+} else {
+found = 0;
+}
+}
+
+for (byte c : bytes) {
+int read = is.read();
+if (c != read) {
+errorCount.incrementAndGet();
+break;
+}
+}
+} catch (Exception e) {
+errorCount.incrementAndGet();
+} finally {
+latch.countDown();
+}
+}
+}.start();
 }
-
+latch.await();
+Assert.assertEquals(0, errorCount.get());
 }
 
 @Test


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

[tomcat] branch 8.5.x updated: Prevent test hanging if it fails.

2020-03-06 Thread remm

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new a266f95  Prevent test hanging if it fails.
a266f95 is described below

commit a266f953a6ebaa026d88b35f3370f8a0395c44fd
Author: Mark Thomas 
AuthorDate: Wed Mar 4 16:52:27 2020 +

Prevent test hanging if it fails.
---
 test/org/apache/coyote/http2/TestLargeUpload.java | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestLargeUpload.java 
b/test/org/apache/coyote/http2/TestLargeUpload.java
index ca1ed0e..ac38b92 100644
--- a/test/org/apache/coyote/http2/TestLargeUpload.java
+++ b/test/org/apache/coyote/http2/TestLargeUpload.java
@@ -100,11 +100,14 @@ public class TestLargeUpload extends Http2TestBase {
 byte[] buf = new byte[8192];
 InputStream is = req.getInputStream();
 int n = is.read(buf);
-while (n > 0) {
-read += n;
-n = is.read(buf);
+try {
+while (n > 0) {
+read += n;
+n = is.read(buf);
+}
+} finally {
+done.countDown();
 }
-done.countDown();
 if (read != bodySize * bodyCount) {
 resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 } else {


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

[tomcat] 06/06: Jakarta to javax

2020-03-06 Thread remm

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

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

commit 8d162557a52fc705baf2cde30997d45b04db0329
Author: remm 
AuthorDate: Wed Mar 4 22:33:46 2020 +0100

Jakarta to javax
---
 test/org/apache/tomcat/util/net/TestSsl.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TestSsl.java 
b/test/org/apache/tomcat/util/net/TestSsl.java
index 03fe357..1a691d7 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -32,10 +32,10 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
 import org.junit.Assume;


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

[tomcat] 05/06: Add test for BZ64195

2020-03-06 Thread remm

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

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

commit 8af39c6700aa648fb3879f6898a5b14f138e0e41
Author: remm 
AuthorDate: Wed Mar 4 19:07:39 2020 +0100

Add test for BZ64195

It works for me, will see on CI.
---
 test/org/apache/tomcat/util/net/TestSsl.java | 78 
 1 file changed, 78 insertions(+)

diff --git a/test/org/apache/tomcat/util/net/TestSsl.java 
b/test/org/apache/tomcat/util/net/TestSsl.java
index b777f2c..03fe357 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -16,19 +16,27 @@
  */
 package org.apache.tomcat.util.net;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.Reader;
+import java.util.Arrays;
 
+import javax.net.SocketFactory;
 import javax.net.ssl.HandshakeCompletedEvent;
 import javax.net.ssl.HandshakeCompletedListener;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
@@ -70,6 +78,52 @@ public class TestSsl extends TomcatBaseTest {
 }
 
 @Test
+public void testPost() throws Exception {
+SocketFactory socketFactory = TesterSupport.configureClientSsl();
+
+Tomcat tomcat = getTomcatInstance();
+TesterSupport.initSsl(tomcat);
+
+Context ctxt = tomcat.addContext("", null);
+Tomcat.addServlet(ctxt, "post", new SimplePostServlet());
+ctxt.addServletMappingDecoded("/post", "post");
+tomcat.start();
+
+SSLSocket socket = (SSLSocket) socketFactory.createSocket("localhost",
+getPort());
+
+OutputStream os = socket.getOutputStream();
+
+byte[] bytes = new byte[1024 * 1024]; // 1MB
+Arrays.fill(bytes, (byte) 1);
+
+os.write("POST /post HTTP/1.1\r\n".getBytes());
+os.write("Host: localhost\r\n".getBytes());
+os.write("Content-Length: 1048576\r\n\r\n".getBytes());
+os.write(bytes);
+os.flush();
+
+InputStream is = socket.getInputStream();
+
+// Skip to the end of the headers
+byte[] endOfHeaders = "\r\n\r\n".getBytes();
+int found = 0;
+while (found != endOfHeaders.length) {
+if (is.read() == endOfHeaders[found]) {
+found++;
+} else {
+found = 0;
+}
+}
+
+for (byte c : bytes) {
+int read = is.read();
+Assert.assertEquals(c, read);
+}
+
+}
+
+@Test
 public void testKeyPass() throws Exception {
 TesterSupport.configureClientSsl();
 
@@ -195,4 +249,28 @@ public class TestSsl extends TomcatBaseTest {
 return complete;
 }
 }
+
+public class SimplePostServlet extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void doPost(HttpServletRequest req, HttpServletResponse 
resp) throws ServletException, IOException {
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
+byte[] in = new byte[1500];
+InputStream input = req.getInputStream();
+while (true) {
+int n = input.read(in);
+if (n > 0) {
+baos.write(in, 0, n);
+} else {
+break;
+}
+}
+byte[] out = baos.toByteArray();
+resp.setContentLength(out.length);
+resp.getOutputStream().write(out);
+}
+
+}
 }


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

[tomcat] 02/06: Use a BAOS

2020-03-06 Thread remm

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

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

commit 62de8ffbc779b02da88cd598a8367593092e283e
Author: remm 
AuthorDate: Wed Mar 4 14:31:05 2020 +0100

Use a BAOS

Attempt to make the test avoid frame buffering.
Remove HTTP header output.
---
 test/org/apache/coyote/http2/Http2TestBase.java   |  3 ---
 test/org/apache/coyote/http2/TestLargeUpload.java | 11 ---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/org/apache/coyote/http2/Http2TestBase.java 
b/test/org/apache/coyote/http2/Http2TestBase.java
index b3e10b1..1a1ae9d 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -638,9 +638,6 @@ public abstract class Http2TestBase extends TomcatBaseTest {
 
 boolean readHttpUpgradeResponse() throws IOException {
 String[] responseHeaders = readHttpResponseHeaders();
-for (String header : responseHeaders) {
-System.out.println("HEADER: " + header);
-}
 
 if (responseHeaders.length < 3) {
 return false;
diff --git a/test/org/apache/coyote/http2/TestLargeUpload.java 
b/test/org/apache/coyote/http2/TestLargeUpload.java
index 1e657af..ce366ce 100644
--- a/test/org/apache/coyote/http2/TestLargeUpload.java
+++ b/test/org/apache/coyote/http2/TestLargeUpload.java
@@ -16,6 +16,7 @@
  */
 package org.apache.coyote.http2;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
@@ -44,8 +45,8 @@ public class TestLargeUpload extends Http2TestBase {
 
 ((AbstractHttp11Protocol) 
http2Protocol.getHttp11Protocol()).setAllowedTrailerHeaders(TRAILER_HEADER_NAME);
 
-int bodySize = 16384;
-int bodyCount = 20;
+int bodySize = 15000;
+int bodyCount = 100;
 
 byte[] headersFrameHeader = new byte[9];
 ByteBuffer headersPayload = ByteBuffer.allocate(128);
@@ -60,9 +61,13 @@ public class TestLargeUpload extends Http2TestBase {
 // Write the headers
 writeFrame(headersFrameHeader, headersPayload);
 // Body
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
 for (int i = 0; i < bodyCount; i++) {
-writeFrame(dataFrameHeader, dataPayload);
+baos.write(dataFrameHeader);
+baos.write(dataPayload.array(), dataPayload.arrayOffset(), 
dataPayload.limit());
 }
+os.write(baos.toByteArray());
+os.flush();
 
 // Trailers
 writeFrame(trailerFrameHeader, trailerPayload);


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

[tomcat] 04/06: Jakarta to javax

2020-03-06 Thread remm

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

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

commit ade4fc28aa36cc410d9c81649df12870fb794833
Author: remm 
AuthorDate: Wed Mar 4 17:12:35 2020 +0100

Jakarta to javax
---
 test/org/apache/coyote/http2/TestLargeUpload.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestLargeUpload.java 
b/test/org/apache/coyote/http2/TestLargeUpload.java
index 7acedaa..ca1ed0e 100644
--- a/test/org/apache/coyote/http2/TestLargeUpload.java
+++ b/test/org/apache/coyote/http2/TestLargeUpload.java
@@ -22,9 +22,9 @@ import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.util.concurrent.CountDownLatch;
 
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
 import org.junit.Test;


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

[tomcat] 03/06: Compromise with the window update

2020-03-06 Thread remm

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

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

commit 69c43c6cd60c0228d55b272b6f301b5585c1743c
Author: remm 
AuthorDate: Wed Mar 4 17:08:09 2020 +0100

Compromise with the window update
---
 test/org/apache/coyote/http2/TestLargeUpload.java | 16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestLargeUpload.java 
b/test/org/apache/coyote/http2/TestLargeUpload.java
index ce366ce..7acedaa 100644
--- a/test/org/apache/coyote/http2/TestLargeUpload.java
+++ b/test/org/apache/coyote/http2/TestLargeUpload.java
@@ -36,18 +36,19 @@ import org.apache.coyote.http11.AbstractHttp11Protocol;
 
 public class TestLargeUpload extends Http2TestBase {
 
+int bodySize = 13107;
+int bodyCount = 5;
+
+volatile int read = 0;
+CountDownLatch done = new CountDownLatch(1);
+
 @Test
 public void testLargePostRequest() throws Exception {
-// FIXME: Skip test for now, some control flow errors with non async
-org.junit.Assume.assumeFalse(true);
 
 http2Connect(true);
 
 ((AbstractHttp11Protocol) 
http2Protocol.getHttp11Protocol()).setAllowedTrailerHeaders(TRAILER_HEADER_NAME);
 
-int bodySize = 15000;
-int bodyCount = 100;
-
 byte[] headersFrameHeader = new byte[9];
 ByteBuffer headersPayload = ByteBuffer.allocate(128);
 byte[] dataFrameHeader = new byte[9];
@@ -90,9 +91,6 @@ public class TestLargeUpload extends Http2TestBase {
 tomcat.start();
 }
 
-volatile int read = 0;
-CountDownLatch done = new CountDownLatch(1);
-
 private class DataReadServlet extends SimpleServlet {
 
 private static final long serialVersionUID = 1L;
@@ -107,7 +105,7 @@ public class TestLargeUpload extends Http2TestBase {
 n = is.read(buf);
 }
 done.countDown();
-if (read < 16384 * 20) {
+if (read != bodySize * bodyCount) {
 resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 } else {
 resp.setStatus(HttpServletResponse.SC_OK);


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

[tomcat] 01/06: Hack in TLS support for HTTP/2 tests

2020-03-06 Thread remm

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

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

commit 932685c1fca196d9a6a6b41c0fda76b44d463ad4
Author: remm 
AuthorDate: Wed Mar 4 12:02:27 2020 +0100

Hack in TLS support for HTTP/2 tests

Try to reproduce BZ64192 but it's not misbehaving as expected. Finding
flow control problems with non async.
---
 test/org/apache/coyote/http2/Http2TestBase.java|  42 +++-
 test/org/apache/coyote/http2/TestLargeUpload.java  | 112 +
 test/org/apache/tomcat/util/net/TesterSupport.java |   2 +-
 3 files changed, 150 insertions(+), 6 deletions(-)

diff --git a/test/org/apache/coyote/http2/Http2TestBase.java 
b/test/org/apache/coyote/http2/Http2TestBase.java
index 3e611c5..b3e10b1 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -52,6 +52,7 @@ import org.apache.coyote.http2.Http2Parser.Output;
 import org.apache.tomcat.util.codec.binary.Base64;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
 import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.net.TesterSupport;
 
 /**
  * Tests for compliance with the https://tools.ietf.org/html/rfc7540;>
@@ -103,9 +104,13 @@ public abstract class Http2TestBase extends TomcatBaseTest 
{
  * that the first response is correctly received.
  */
 protected void http2Connect() throws Exception {
-enableHttp2();
+http2Connect(false);
+}
+
+protected void http2Connect(boolean tls) throws Exception {
+enableHttp2(tls);
 configureAndStartWebApplication();
-openClientConnection();
+openClientConnection(tls);
 doHttpUpgrade();
 sendClientPreface();
 validateHttp2InitialResponse();
@@ -538,8 +543,17 @@ public abstract class Http2TestBase extends TomcatBaseTest 
{
 }
 
 protected void enableHttp2(long maxConcurrentStreams) {
-Connector connector = getTomcatInstance().getConnector();
-http2Protocol = new Http2Protocol();
+enableHttp2(maxConcurrentStreams, false);
+}
+
+protected void enableHttp2(boolean tls) {
+enableHttp2(200, tls);
+}
+
+protected void enableHttp2(long maxConcurrentStreams, boolean tls) {
+Tomcat tomcat = getTomcatInstance();
+Connector connector = tomcat.getConnector();
+http2Protocol = new UpgradableHttp2Protocol();
 // Short timeouts for now. May need to increase these for CI systems.
 http2Protocol.setReadTimeout(6000);
 http2Protocol.setWriteTimeout(6000);
@@ -548,8 +562,18 @@ public abstract class Http2TestBase extends TomcatBaseTest 
{
 http2Protocol.setStreamWriteTimeout(3000);
 http2Protocol.setMaxConcurrentStreams(maxConcurrentStreams);
 connector.addUpgradeProtocol(http2Protocol);
+if (tls) {
+// Enable TLS
+TesterSupport.initSsl(tomcat);
+}
 }
 
+private class UpgradableHttp2Protocol extends Http2Protocol {
+@Override
+public String getHttpUpgradeName(boolean isSSLEnabled) {
+return "h2c";
+}
+}
 
 protected void configureAndStartWebApplication() throws LifecycleException 
{
 Tomcat tomcat = getTomcatInstance();
@@ -571,8 +595,13 @@ public abstract class Http2TestBase extends TomcatBaseTest 
{
 
 
 protected void openClientConnection() throws IOException {
+openClientConnection(false);
+}
+
+protected void openClientConnection(boolean tls) throws IOException {
+SocketFactory socketFactory = tls ? TesterSupport.configureClientSsl() 
: SocketFactory.getDefault();
 // Open a connection
-s = SocketFactory.getDefault().createSocket("localhost", getPort());
+s = socketFactory.createSocket("localhost", getPort());
 s.setSoTimeout(3);
 
 os = s.getOutputStream();
@@ -609,6 +638,9 @@ public abstract class Http2TestBase extends TomcatBaseTest {
 
 boolean readHttpUpgradeResponse() throws IOException {
 String[] responseHeaders = readHttpResponseHeaders();
+for (String header : responseHeaders) {
+System.out.println("HEADER: " + header);
+}
 
 if (responseHeaders.length < 3) {
 return false;
diff --git a/test/org/apache/coyote/http2/TestLargeUpload.java 
b/test/org/apache/coyote/http2/TestLargeUpload.java
new file mode 100644
index 000..1e657af
--- /dev/null
+++ b/test/org/apache/coyote/http2/TestLargeUpload.java
@@ -0,0 +1,112 @@
+/*
+ *  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

[tomcat] branch 8.5.x updated (8e05e9f -> 8d16255)

2020-03-06 Thread remm

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

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


from 8e05e9f  A handful of additional false positives
 new 932685c  Hack in TLS support for HTTP/2 tests
 new 62de8ff  Use a BAOS
 new 69c43c6  Compromise with the window update
 new ade4fc2  Jakarta to javax
 new 8af39c6  Add test for BZ64195
 new 8d16255  Jakarta to javax

The 6 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:
 test/org/apache/coyote/http2/Http2TestBase.java| 39 +--
 ...TestAbortedUpload.java => TestLargeUpload.java} | 76 +
 test/org/apache/tomcat/util/net/TestSsl.java   | 78 ++
 test/org/apache/tomcat/util/net/TesterSupport.java |  2 +-
 4 files changed, 144 insertions(+), 51 deletions(-)
 copy test/org/apache/coyote/http2/{TestAbortedUpload.java => 
TestLargeUpload.java} (58%)


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

Re: [VOTE] Release Apache Tomcat 8.5.52

2020-03-06 Thread Rémy Maucherat

On Fri, Mar 6, 2020 at 12:52 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 8.5.52 release is now available for voting.
>
> The major changes compared to the 8.5.51 release are:
>
> - Add new attribute persistAuthentication to both StandardManager and
>   PersistentManager to support authentication persistence.
>   Patch provided by Carsten Klein
>
> - A zero length AJP secret will now behave as if it has not been
>   specified.
>
> - Add the TLS request attributes used by IIS to the attributes that
>   an AJP Connector will always accept.
>
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat85/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.52/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1252/
>
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.52
> c83fd06b3cd0c96ffd7dc660107a1283b714483b
>
> The proposed 8.5.51 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.52
>

Rémy

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

Re: [VOTE] Release Apache Tomcat 9.0.32

2020-03-06 Thread Rémy Maucherat

On Fri, Mar 6, 2020 at 11:12 AM Mark Thomas  wrote:

> The proposed Apache Tomcat 9.0.32 release is now available for voting.
>
> The major changes compared to the 9.0.31 release are:
>
> - Add new attribute persistAuthentication to both StandardManager and
>   PersistentManager to support authentication persistence.
>   Patch provided by Carsten Klein
>
> - A zero length AJP secret will now behave as if it has not been
>   specified.
>
> - Add the TLS request attributes used by IIS to the attributes that
>   an AJP Connector will always accept.
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.32/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1251/
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.32
> 3a9578990e4e90bcc04bf7d5ef3bc47445e827e6
>
> The proposed 9.0.32 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 9.0.32
>

Rémy


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

[tomcat] 02/02: A handful of additional false positives

2020-03-06 Thread markt

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

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

commit 8e05e9f901bc7f5225bf8823e0edcf55dbebc43a
Author: Mark Thomas 
AuthorDate: Fri Mar 6 12:49:26 2020 +

A handful of additional false positives
---
 res/findbugs/filter-false-positives.xml | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/res/findbugs/filter-false-positives.xml 
b/res/findbugs/filter-false-positives.xml
index 23c272a..ba2e9a2 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/findbugs/filter-false-positives.xml
@@ -1458,6 +1458,21 @@
 
   
   
+
+
+
+
+  
+  
+
+
+
+  
+  
+
+
+  
+  
 
 
 


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

[tomcat] branch 8.5.x updated (fef28be -> 8e05e9f)

2020-03-06 Thread markt

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

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


from fef28be  Increment version for next development cycle
 new 1544833  Fix SpotBugs issues in unit tests
 new 8e05e9f  A handful of additional false positives

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:
 res/findbugs/filter-false-positives.xml| 22 ++
 .../http11/upgrade/TestUpgradeInternalHandler.java |  2 +-
 test/org/apache/coyote/http2/TestAsyncTimeout.java |  6 +++---
 3 files changed, 26 insertions(+), 4 deletions(-)


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

[tomcat] 01/02: Fix SpotBugs issues in unit tests

2020-03-06 Thread markt

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

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

commit 154483315d7dab3b6949979a58c1d200d43b12b8
Author: Mark Thomas 
AuthorDate: Fri Mar 6 12:33:29 2020 +

Fix SpotBugs issues in unit tests
---
 res/findbugs/filter-false-positives.xml| 7 +++
 .../apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java   | 2 +-
 test/org/apache/coyote/http2/TestAsyncTimeout.java | 6 +++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/res/findbugs/filter-false-positives.xml 
b/res/findbugs/filter-false-positives.xml
index b45c160..23c272a 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/findbugs/filter-false-positives.xml
@@ -1574,6 +1574,7 @@
 
   
   
+  
 
 
   
@@ -1859,6 +1860,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
diff --git 
a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java 
b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
index 4f406fc..27bce41 100644
--- a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
+++ b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
@@ -227,7 +227,7 @@ public class TestUpgradeInternalHandler extends 
TomcatBaseTest {
 }, buffer);
 System.out.println("CompletionState: " + state);
 // Test zero length write used by websockets
-state = wrapper.write(BlockingMode.BLOCK, 10, TimeUnit.SECONDS, 
null, SocketWrapperBase.COMPLETE_WRITE_WITH_COMPLETION, new 
CompletionHandler() {
+wrapper.write(BlockingMode.BLOCK, 10, TimeUnit.SECONDS, null, 
SocketWrapperBase.COMPLETE_WRITE_WITH_COMPLETION, new CompletionHandler() {
 @Override
 public void completed(Long result, Void attachment) {
 System.out.println("Write: " + result.longValue());
diff --git a/test/org/apache/coyote/http2/TestAsyncTimeout.java 
b/test/org/apache/coyote/http2/TestAsyncTimeout.java
index 1e97490..8560229 100644
--- a/test/org/apache/coyote/http2/TestAsyncTimeout.java
+++ b/test/org/apache/coyote/http2/TestAsyncTimeout.java
@@ -52,8 +52,8 @@ public class TestAsyncTimeout extends Http2TestBase {
 
 // This is the servlet that does that actual test
 // This latch is used to signal that that async thread used by the test
-// has ended. It isn;t essential to the test but it allows the test to
-// complete without Tmcat logging an error about a still running 
thread.
+// has ended. It isn't essential to the test but it allows the test to
+// complete without Tomcat logging an error about a still running 
thread.
 CountDownLatch latch = new CountDownLatch(1);
 Wrapper w = Tomcat.addServlet(ctxt, "async", new 
AsyncTimeoutServlet(latch));
 w.setAsyncSupported(true);
@@ -95,7 +95,7 @@ public class TestAsyncTimeout extends Http2TestBase {
 
 private static final long serialVersionUID = 1L;
 
-private final CountDownLatch latch;
+private final transient CountDownLatch latch;
 
 public AsyncTimeoutServlet(CountDownLatch latch) {
 this.latch = latch;


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

[tomcat] branch 9.0.x updated: Fix SpotBugs issues in unit tests

2020-03-06 Thread markt

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 87daf35  Fix SpotBugs issues in unit tests
87daf35 is described below

commit 87daf35cd4617108a2d9b974367732bcb1c31bf3
Author: Mark Thomas 
AuthorDate: Fri Mar 6 12:33:29 2020 +

Fix SpotBugs issues in unit tests
---
 res/findbugs/filter-false-positives.xml | 13 +
 .../coyote/http11/upgrade/TestUpgradeInternalHandler.java   |  2 +-
 test/org/apache/coyote/http2/TestAsyncTimeout.java  |  6 +++---
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/res/findbugs/filter-false-positives.xml 
b/res/findbugs/filter-false-positives.xml
index cefc6fe..2042544 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/findbugs/filter-false-positives.xml
@@ -1602,6 +1602,7 @@
 
   
   
+  
 
 
   
@@ -1612,6 +1613,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -1899,6 +1906,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
diff --git 
a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java 
b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
index 41a6511..6207fa5 100644
--- a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
+++ b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
@@ -223,7 +223,7 @@ public class TestUpgradeInternalHandler extends 
TomcatBaseTest {
 }, buffer);
 System.out.println("CompletionState: " + state);
 // Test zero length write used by websockets
-state = wrapper.write(BlockingMode.BLOCK, 10, TimeUnit.SECONDS, 
null, SocketWrapperBase.COMPLETE_WRITE_WITH_COMPLETION, new 
CompletionHandler() {
+wrapper.write(BlockingMode.BLOCK, 10, TimeUnit.SECONDS, null, 
SocketWrapperBase.COMPLETE_WRITE_WITH_COMPLETION, new CompletionHandler() {
 @Override
 public void completed(Long result, Void attachment) {
 System.out.println("Write: " + result.longValue());
diff --git a/test/org/apache/coyote/http2/TestAsyncTimeout.java 
b/test/org/apache/coyote/http2/TestAsyncTimeout.java
index 1e97490..8560229 100644
--- a/test/org/apache/coyote/http2/TestAsyncTimeout.java
+++ b/test/org/apache/coyote/http2/TestAsyncTimeout.java
@@ -52,8 +52,8 @@ public class TestAsyncTimeout extends Http2TestBase {
 
 // This is the servlet that does that actual test
 // This latch is used to signal that that async thread used by the test
-// has ended. It isn;t essential to the test but it allows the test to
-// complete without Tmcat logging an error about a still running 
thread.
+// has ended. It isn't essential to the test but it allows the test to
+// complete without Tomcat logging an error about a still running 
thread.
 CountDownLatch latch = new CountDownLatch(1);
 Wrapper w = Tomcat.addServlet(ctxt, "async", new 
AsyncTimeoutServlet(latch));
 w.setAsyncSupported(true);
@@ -95,7 +95,7 @@ public class TestAsyncTimeout extends Http2TestBase {
 
 private static final long serialVersionUID = 1L;
 
-private final CountDownLatch latch;
+private final transient CountDownLatch latch;
 
 public AsyncTimeoutServlet(CountDownLatch latch) {
 this.latch = latch;


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

[tomcat] 02/03: Fix a couple of false positives in NioEndpoint

2020-03-06 Thread 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 3af1cdda41ff892042e63055a309bc4cacfc1e8b
Author: Mark Thomas 
AuthorDate: Fri Mar 6 12:24:24 2020 +

Fix a couple of false positives in NioEndpoint
---
 res/findbugs/filter-false-positives.xml | 12 
 1 file changed, 12 insertions(+)

diff --git a/res/findbugs/filter-false-positives.xml 
b/res/findbugs/filter-false-positives.xml
index 1acdd72..93b4473 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/findbugs/filter-false-positives.xml
@@ -1425,6 +1425,18 @@
   
   
 
+
+
+
+  
+  
+
+
+
+
+  
+  
+
 
 
   


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

[tomcat] branch master updated (2599fbb -> c8892a1)

2020-03-06 Thread 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 2599fbb  Increment version number for next development cycle
 new 8debf09  Remove unnecessary code and avoid potential NPEs. Thanks to 
SpotBugs.
 new 3af1cdd  Fix a couple of false positives in NioEndpoint
 new c8892a1  Fix SpotBugs issues in unit tests

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


Summary of changes:
 java/org/apache/catalina/realm/JNDIRealm.java  |  6 --
 res/findbugs/filter-false-positives.xml| 25 ++
 .../http11/upgrade/TestUpgradeInternalHandler.java |  2 +-
 test/org/apache/coyote/http2/TestAsyncTimeout.java |  6 +++---
 4 files changed, 29 insertions(+), 10 deletions(-)


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

[tomcat] 03/03: Fix SpotBugs issues in unit tests

2020-03-06 Thread 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 c8892a12398acd43b5ec21cdfd03b67e411afb2a
Author: Mark Thomas 
AuthorDate: Fri Mar 6 12:33:29 2020 +

Fix SpotBugs issues in unit tests
---
 res/findbugs/filter-false-positives.xml | 13 +
 .../coyote/http11/upgrade/TestUpgradeInternalHandler.java   |  2 +-
 test/org/apache/coyote/http2/TestAsyncTimeout.java  |  6 +++---
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/res/findbugs/filter-false-positives.xml 
b/res/findbugs/filter-false-positives.xml
index 93b4473..6d25bbd 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/findbugs/filter-false-positives.xml
@@ -1608,6 +1608,7 @@
 
   
   
+  
 
 
   
@@ -1618,6 +1619,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
@@ -1905,6 +1912,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 
diff --git 
a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java 
b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
index eb826f8..a2c3a94 100644
--- a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
+++ b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
@@ -224,7 +224,7 @@ public class TestUpgradeInternalHandler extends 
TomcatBaseTest {
 }, buffer);
 System.out.println("CompletionState: " + state);
 // Test zero length write used by websockets
-state = wrapper.write(BlockingMode.BLOCK, 10, TimeUnit.SECONDS, 
null, SocketWrapperBase.COMPLETE_WRITE_WITH_COMPLETION, new 
CompletionHandler() {
+wrapper.write(BlockingMode.BLOCK, 10, TimeUnit.SECONDS, null, 
SocketWrapperBase.COMPLETE_WRITE_WITH_COMPLETION, new CompletionHandler() {
 @Override
 public void completed(Long result, Void attachment) {
 System.out.println("Write: " + result.longValue());
diff --git a/test/org/apache/coyote/http2/TestAsyncTimeout.java 
b/test/org/apache/coyote/http2/TestAsyncTimeout.java
index b579aba..f214e0a 100644
--- a/test/org/apache/coyote/http2/TestAsyncTimeout.java
+++ b/test/org/apache/coyote/http2/TestAsyncTimeout.java
@@ -52,8 +52,8 @@ public class TestAsyncTimeout extends Http2TestBase {
 
 // This is the servlet that does that actual test
 // This latch is used to signal that that async thread used by the test
-// has ended. It isn;t essential to the test but it allows the test to
-// complete without Tmcat logging an error about a still running 
thread.
+// has ended. It isn't essential to the test but it allows the test to
+// complete without Tomcat logging an error about a still running 
thread.
 CountDownLatch latch = new CountDownLatch(1);
 Wrapper w = Tomcat.addServlet(ctxt, "async", new 
AsyncTimeoutServlet(latch));
 w.setAsyncSupported(true);
@@ -95,7 +95,7 @@ public class TestAsyncTimeout extends Http2TestBase {
 
 private static final long serialVersionUID = 1L;
 
-private final CountDownLatch latch;
+private final transient CountDownLatch latch;
 
 public AsyncTimeoutServlet(CountDownLatch latch) {
 this.latch = latch;


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

[tomcat] 01/03: Remove unnecessary code and avoid potential NPEs. Thanks to SpotBugs.

2020-03-06 Thread 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 8debf09c6ff03634070c89e66d5bd60971e843aa
Author: Mark Thomas 
AuthorDate: Fri Mar 6 12:17:03 2020 +

Remove unnecessary code and avoid potential NPEs. Thanks to SpotBugs.
---
 java/org/apache/catalina/realm/JNDIRealm.java | 6 --
 1 file changed, 6 deletions(-)

diff --git a/java/org/apache/catalina/realm/JNDIRealm.java 
b/java/org/apache/catalina/realm/JNDIRealm.java
index a4e66bb..f3b4fd0 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -1321,9 +1321,6 @@ public class JNDIRealm extends RealmBase {
 // Log the problem for posterity
 containerLog.error(sm.getString("jndiRealm.exception"), e);
 
-// Close the connection so that it gets reopened next time
-close(connection);
-
 // Return "not authenticated" for this request
 if (containerLog.isDebugEnabled())
 containerLog.debug("Returning null principal.");
@@ -2296,9 +2293,6 @@ System.out.println("getUserBySearch " + username);
 // Log the problem for posterity
 containerLog.error(sm.getString("jndiRealm.exception"), e);
 
-// Close the connection so that it gets reopened next time
-close(connection);
-
 // Return "not authenticated" for this request
 return null;
 


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

Re: [VOTE] Release Apache Tomcat 8.5.52

2020-03-06 Thread Mark Thomas

On 06/03/2020 11:51, Mark Thomas wrote:



> The proposed 8.5.51 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.52

Unit tests pass on Windows, Linux and MacOS for NIO, NIO2 and APR/Native
with the Tomcat Native 1.2.23.

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

[VOTE] Release Apache Tomcat 8.5.52

2020-03-06 Thread Mark Thomas

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

The major changes compared to the 8.5.51 release are:

- Add new attribute persistAuthentication to both StandardManager and
  PersistentManager to support authentication persistence.
  Patch provided by Carsten Klein

- A zero length AJP secret will now behave as if it has not been
  specified.

- Add the TLS request attributes used by IIS to the attributes that
  an AJP Connector will always accept.


Along with lots of other bug fixes and improvements.

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

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

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

The tag is:
https://github.com/apache/tomcat/tree/8.5.52
c83fd06b3cd0c96ffd7dc660107a1283b714483b

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

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

Nexus: Staging Completed

2020-03-06 Thread Nexus Repository Manager

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.7.0_80; Windows 8.1 6.3)""userId" = "markt""ip" = "109.149.198.114"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-i18n-de/8.5.52/tomcat-i18n-de-8.5.52.pom.asc(SHA1: 1a9c17c663231410f48b95581849695ab7aadf6e)/org/apache/tomcat/tomcat-i18n-de/8.5.52/tomcat-i18n-de-8.5.52.pom(SHA1: 4c136967ee8114b48f3c1c0c4755685b5b4d2802)/org/apache/tomcat/tomcat-i18n-de/8.5.52/tomcat-i18n-de-8.5.52.jar(SHA1: 7573b7d80263d6f10c0a5975f2a04f592a79e89d)/org/apache/tomcat/tomcat-i18n-de/8.5.52/tomcat-i18n-de-8.5.52.jar.asc(SHA1: 3cc0745640632ade0eacab1e5ee879f6342e04da)/org/apache/tomcat/tomcat-jni/8.5.52/tomcat-jni-8.5.52.pom.asc(SHA1: 3b8c27c9e37e7c917b801bb050160fc115a21f2b)/org/apache/tomcat/tomcat-jni/8.5.52/tomcat-jni-8.5.52-sources.jar(SHA1: 486c7376adce332a7829a8717d2e1cb54189319e)/org/apache/tomcat/tomcat-jni/8.5.52/tomcat-jni-8.5.52-sources.jar.asc(SHA1: c42371e831401979fc5ad618fcedf1be6fee4b30)/org/apache/tomcat/tomcat-jni/8.5.52/tomcat-jni-8.5.52.jar.asc(SHA1: 1d94e4f4545673958323db4796ffdd69764e1ff8)/org/apache/tomcat/tomcat-jni/8.5.52/tomcat-jni-8.5.52.jar(SHA1: 4b0d156808f3d95fc7f21051e68a7027a6cf06ca)/org/apache/tomcat/tomcat-jni/8.5.52/tomcat-jni-8.5.52.pom(SHA1: edee6f4fe5bd1529e0bc343868a5e02e824d646b)/org/apache/tomcat/tomcat-juli/8.5.52/tomcat-juli-8.5.52-sources.jar(SHA1: 8da2b9d7503e1e656d80c577323403483abb9e66)/org/apache/tomcat/tomcat-juli/8.5.52/tomcat-juli-8.5.52.jar(SHA1: 330b78a8904684375ebfd9cbbe11a8c683fb387e)/org/apache/tomcat/tomcat-juli/8.5.52/tomcat-juli-8.5.52.pom(SHA1: 978aeef56bf731342a741694b4566515f692b1a5)/org/apache/tomcat/tomcat-juli/8.5.52/tomcat-juli-8.5.52.pom.asc(SHA1: 002971949754c15fe7eef63351b8e30d232c3eb3)/org/apache/tomcat/tomcat-juli/8.5.52/tomcat-juli-8.5.52-sources.jar.asc(SHA1: c638d275079c7587a5a41b423ec127395b05e4be)/org/apache/tomcat/tomcat-juli/8.5.52/tomcat-juli-8.5.52.jar.asc(SHA1: 6b728b1b29b47ce111c6904405a3f0446fc4f88d)/org/apache/tomcat/tomcat-util/8.5.52/tomcat-util-8.5.52-sources.jar.asc(SHA1: 95f3641f4fa535fe978590009ec50ca1b1510d07)/org/apache/tomcat/tomcat-util/8.5.52/tomcat-util-8.5.52.pom.asc(SHA1: e56d2901e62203ded4fe23eae75b221a79483ec3)/org/apache/tomcat/tomcat-util/8.5.52/tomcat-util-8.5.52-sources.jar(SHA1: 5c550a005cf16de31b5bb9d6ad285c19f9de8174)/org/apache/tomcat/tomcat-util/8.5.52/tomcat-util-8.5.52.jar.asc(SHA1: 8466eef15528b424fe1fca1ba317919f6b6c42c2)/org/apache/tomcat/tomcat-util/8.5.52/tomcat-util-8.5.52.jar(SHA1: 96b436363c916d2509f29946184ad62682ad3406)/org/apache/tomcat/tomcat-util/8.5.52/tomcat-util-8.5.52.pom(SHA1: 59455a49eb59085e323d81efdfb12ee766b028f2)/org/apache/tomcat/tomcat-catalina/8.5.52/tomcat-catalina-8.5.52.jar.asc(SHA1: 4103e4b3406380bf2e65d1c0e94a190c8d572e5f)/org/apache/tomcat/tomcat-catalina/8.5.52/tomcat-catalina-8.5.52-sources.jar.asc(SHA1: 757b2a5e3ee942135e4a563dabdacba9df30ac74)/org/apache/tomcat/tomcat-catalina/8.5.52/tomcat-catalina-8.5.52.pom.asc(SHA1: 5106b1ffd30af8fdb1036474e83def39d7ca58d0)/org/apache/tomcat/tomcat-catalina/8.5.52/tomcat-catalina-8.5.52.pom(SHA1: 6ccf90d02ff9cc39563b142570357fb04dda6569)/org/apache/tomcat/tomcat-catalina/8.5.52/tomcat-catalina-8.5.52-sources.jar(SHA1: 34a3cada603c42fb2532ec644093830608f07275)/org/apache/tomcat/tomcat-catalina/8.5.52/tomcat-catalina-8.5.52.jar(SHA1: 8fe03386a7e21ec2ac87faecb0b8786b62dbec58)/org/apache/tomcat/tomcat-catalina-ws/8.5.52/tomcat-catalina-ws-8.5.52.jar.asc(SHA1: 51f36e5dcc7f06ec348b2278f154b8f58c7d729a)/org/apache/tomcat/tomcat-catalina-ws/8.5.52/tomcat-catalina-ws-8.5.52-sources.jar(SHA1: c0ba17a2578420014c1d9d53515669e1b0610531)/org/apache/tomcat/tomcat-catalina-ws/8.5.52/tomcat-catalina-ws-8.5.52.pom.asc(SHA1: b99e44eec3856a2e293c43ef484860eebf2c35d4)/org/apache/tomcat/tomcat-catalina-ws/8.5.52/tomcat-catalina-ws-8.5.52-sources.jar.asc(SHA1: b54c782007b9c04c128c860717292b254b4e1247)/org/apache/tomcat/tomcat-catalina-ws/8.5.52/tomcat-catalina-ws-8.5.52.pom(SHA1: 1ec92a74261107bea1d55de92ac437233b3a5922)/org/apache/tomcat/tomcat-catalina-ws/8.5.52/tomcat-catalina-ws-8.5.52.jar(SHA1: 41ad007d7ccdaa14a4176f5518377a50a0bd6a67)/org/apache/tomcat/tomcat-i18n-fr/8.5.52/tomcat-i18n-fr-8.5.52.jar.asc(SHA1: b2fd3f7d90b9f984e4c1aebe91b75712a59d1e3e)/org/apache/tomcat/tomcat-i18n-fr/8.5.52/tomcat-i18n-fr-8.5.52.pom.asc(SHA1: 91ae86a731dca35ee067433073e8b884b61923d0)/org/apache/tomcat/tomcat-i18n-fr/8.5.52/tomcat-i18n-fr-8.5.52.pom(SHA1: 3296fc081bf0d42eb45b0e108d4dc5d548b906ac)/org/apache/tomcat/tomcat-i18n-fr/8.5.52/tomcat-i18n-fr-8.5.52.jar(SHA1: 564868f6ccc76e8423a3c053f2aca87079e80d32)/org/apache/tomcat/tomcat-jdbc/8.5.52/tomcat-jdbc-8.5.52.jar(SHA1: dc3f53f3d6a020a6997bf456c379a2983273e0b5)/org/apache/tomcat/tomcat-jdbc/8.5.52/tomcat-jdbc-8.5.52.pom.asc(SHA1: a9312e4315b45aa576ac66209ce414baf95f6b66)/org/apache/tomcat/tomcat-jdbc/8.5.52/tomcat-jdbc-8.5.52-sources.jar(SHA1:

[tomcat] branch 8.5.x updated: Increment version for next development cycle

2020-03-06 Thread markt

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

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


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

commit fef28be52fa51930a2f5b6cb944ae8b9cc1f3f30
Author: Mark Thomas 
AuthorDate: Fri Mar 6 11:50:56 2020 +

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

diff --git a/build.properties.default b/build.properties.default
index 8f029d1..4f35c71 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=52
+version.build=53
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 220e27f..da282c9 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=8.5.52
+maven.asf.release.deploy.version=8.5.53
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e9a5041..5321406 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


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

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

2020-03-06 Thread markt

Author: markt
Date: Fri Mar  6 11:47:18 2020
New Revision: 38419

Log:
Upload 8.5.52 for voting

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

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

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

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

2020-03-06 Thread markt

Added: dev/tomcat/tomcat-8/v8.5.52/src/apache-tomcat-8.5.52-src.zip.asc
==
--- dev/tomcat/tomcat-8/v8.5.52/src/apache-tomcat-8.5.52-src.zip.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.52/src/apache-tomcat-8.5.52-src.zip.asc Fri Mar  6 
11:47:18 2020
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl5iNxAACgkQEMAcWi9g
+Wedg3A/+OUvpxtOPRQHrqS6iq8qcu4yYzGoUlkeejc7h9OZM6pLMcGuHMO/CcefP
+bVqy38w5V6CNnU6BWtGfJfLe3L/8W6lVHcziD0xK50EwykLwFtUqyo9xtlAcObYP
+Qu9CIuNY4A3zN1Gsjm0cnUKj6l7nSBDVrNLRTdAf/rvK5SoQ5n/gZo2NZNmGDPRN
+zGOXuksg+s9HAM49JpCDNoX9RgqwB/Bx49ajGgsrXxqdeCyfCeksb/Ml6E4Jt5ln
+zCPbORXx7YqCqJavyZwUxacuOfTnrrJeR86SH9p/NrnEBe2GsCHi22RHpKjDAmzy
+z6Exwf4sXFhAkK4VsF52YgozOUF6KZh0TxjqTODx1Wlfcp6xXf/7X35UX7KSHkh7
+rGKWtDFTS18f279OMvIPkWOWQg+oEcEnybb+Pbe6Eqa5iuAWtpyT7P4xAlu19YC8
+94i12mqXM68xBUiwdMjjKEQeqEIjdNSUDdKyByUZMLU7a5oHLTR/Lm+/EW7s2mD5
+X05nkP2JhrxeyF7xQfm74RZ6lOFTtcMuviN20z7Ypm/8GZ2Pkf8vWDYhxrngda1W
+k1yNX4ocEgpxiI34M5NeCqfH3hQokmjL4QWgAeARuBqFv+p1gYEd3geq6vLG806t
+DaxkBS69lf11JgUOYT8xkt8k1xeuBOlgeeIgNJHdq7o+52e0UMg=
+=zLo9
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.52/src/apache-tomcat-8.5.52-src.zip.sha512
==
--- dev/tomcat/tomcat-8/v8.5.52/src/apache-tomcat-8.5.52-src.zip.sha512 (added)
+++ dev/tomcat/tomcat-8/v8.5.52/src/apache-tomcat-8.5.52-src.zip.sha512 Fri Mar 
 6 11:47:18 2020
@@ -0,0 +1 @@
+86e3cc3a7e2b8036bb1a49e40de73c6e5a31f2eb2e74a164337a41d43d7e422e98fbe178a9b99a7eec56ba7acf6096248c0849b2a70d296888a1f2917400d3ba
 *apache-tomcat-8.5.52-src.zip
\ No newline at end of file



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

[tomcat] 01/01: Tag 8.5.52

2020-03-06 Thread markt

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

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

commit c83fd06b3cd0c96ffd7dc660107a1283b714483b
Author: Mark Thomas 
AuthorDate: Fri Mar 6 11:26:02 2020 +

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

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


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

[tomcat] tag 8.5.52 created (now c83fd06)

2020-03-06 Thread markt

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

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


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

 new c83fd06  Tag 8.5.52

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



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

Re: [VOTE] Release Apache Tomcat 9.0.32

2020-03-06 Thread Mark Thomas

On 06/03/2020 10:12, Mark Thomas wrote:



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

Unit tests pass on Windows, Linux and MacOS for NIO, NIO2 and APR/Native
with the Tomcat Native 1.2.23.

Mark

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

Re: [VOTE] Release Apache Tomcat 10.0.0-M2

2020-03-06 Thread Mark Thomas

On 05/03/2020 19:40, Mark Thomas wrote:



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

Unit tests pass on Windows, Linux and MacOS for NIO, NIO2 and APR/Native
with the Tomcat Native 1.2.23.

Mark

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

[VOTE] Release Apache Tomcat 9.0.32

2020-03-06 Thread Mark Thomas

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

The major changes compared to the 9.0.31 release are:

- Add new attribute persistAuthentication to both StandardManager and
  PersistentManager to support authentication persistence.
  Patch provided by Carsten Klein

- A zero length AJP secret will now behave as if it has not been
  specified.

- Add the TLS request attributes used by IIS to the attributes that
  an AJP Connector will always accept.

Along with lots of other bug fixes and improvements.

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

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.32/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1251/
The tag is:
https://github.com/apache/tomcat/tree/9.0.32
3a9578990e4e90bcc04bf7d5ef3bc47445e827e6

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

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

svn commit: r38417 - /dev/tomcat/tomcat-connectors/jk/ /dev/tomcat/tomcat-connectors/jk/binaries/windows/ /dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/ /release/tomcat/tomcat-connectors/j

2020-03-06 Thread markt

Author: markt
Date: Fri Mar  6 10:03:48 2020
New Revision: 38417

Log:
Tomcat Connectors (mod_jk) 1.2.48 release vote passed

Added:

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.48-windows-i386-symbols.zip
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.48-windows-i386-symbols.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.48-windows-i386-symbols.zip.asc
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.48-windows-i386-symbols.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.48-windows-i386-symbols.zip.sha512
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.48-windows-i386-symbols.zip.sha512

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.48-windows-x86_64-symbols.zip
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.48-windows-x86_64-symbols.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.48-windows-x86_64-symbols.zip.asc
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.48-windows-x86_64-symbols.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.48-windows-x86_64-symbols.zip.sha512
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.48-windows-x86_64-symbols.zip.sha512

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.48-windows-i386-iis.zip
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.48-windows-i386-iis.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.48-windows-i386-iis.zip.asc
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.48-windows-i386-iis.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.48-windows-i386-iis.zip.sha512
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.48-windows-i386-iis.zip.sha512

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.48-windows-x86_64-iis.zip
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.48-windows-x86_64-iis.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.48-windows-x86_64-iis.zip.asc
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.48-windows-x86_64-iis.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.48-windows-x86_64-iis.zip.sha512
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.48-windows-x86_64-iis.zip.sha512
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.48-src.tar.gz
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.48-src.tar.gz
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.48-src.tar.gz.asc
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.48-src.tar.gz.asc

release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.48-src.tar.gz.sha512
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.48-src.tar.gz.sha512
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.48-src.zip
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.48-src.zip
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.48-src.zip.asc
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.48-src.zip.asc
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.48-src.zip.sha512
  - copied unchanged from r38185, 
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.48-src.zip.sha512
Removed:

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.48-windows-i386-symbols.zip

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.48-windows-i386-symbols.zip.asc

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.48-windows-i386-symbols.zip.sha512

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.48-windows-x86_64-symbols.zip

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.48-windows-x86_64-symbols.zip.asc

Nexus: Staging Completed

2020-03-06 Thread Nexus Repository Manager

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "maven-artifact/2.2.1 (Java 1.8.0_232; Windows 10 10.0)""userId" = "markt""ip" = "109.149.198.114"Details:The following artifacts have been staged/org/apache/tomcat/tomcat-i18n-de/9.0.32/tomcat-i18n-de-9.0.32.pom(SHA1: 6b4fc96641b4b3139f9346983fb7bebbbf0a75e2)/org/apache/tomcat/tomcat-i18n-de/9.0.32/tomcat-i18n-de-9.0.32.pom.asc(SHA1: 85b965df13d300606e9a614015b76bb4dfb3c94e)/org/apache/tomcat/tomcat-i18n-de/9.0.32/tomcat-i18n-de-9.0.32.jar.asc(SHA1: 2149edeaa3c3e94f3effa8dfe1a2d6e1f3547482)/org/apache/tomcat/tomcat-i18n-de/9.0.32/tomcat-i18n-de-9.0.32.jar(SHA1: 5f0181a1798e922cce6007557de5c5015e7ab28d)/org/apache/tomcat/tomcat-jni/9.0.32/tomcat-jni-9.0.32.pom(SHA1: d31747b8043758d998953a907b9e8090f6c215d4)/org/apache/tomcat/tomcat-jni/9.0.32/tomcat-jni-9.0.32.jar.asc(SHA1: 328a97f805dfc871c9767ab9247f5561edc6044c)/org/apache/tomcat/tomcat-jni/9.0.32/tomcat-jni-9.0.32-sources.jar.asc(SHA1: 740fec0658161ec61c1eeaf9e332a26bdb6a583f)/org/apache/tomcat/tomcat-jni/9.0.32/tomcat-jni-9.0.32.jar(SHA1: e8f31cb3648551aa58eec46d9b059656ef70e8a6)/org/apache/tomcat/tomcat-jni/9.0.32/tomcat-jni-9.0.32-sources.jar(SHA1: 4734bf1c94318e301800a25910b0e925b3c56da6)/org/apache/tomcat/tomcat-jni/9.0.32/tomcat-jni-9.0.32.pom.asc(SHA1: c6e5144eb78e6853fd1d1beb657d59603f83bfe0)/org/apache/tomcat/tomcat-juli/9.0.32/tomcat-juli-9.0.32.pom.asc(SHA1: 1e1fb81eea914e9bf2b7703bb147c8f61e79fc0e)/org/apache/tomcat/tomcat-juli/9.0.32/tomcat-juli-9.0.32-sources.jar(SHA1: b8f9b3bc5a581bf483269f3148ee1ed5c22696e6)/org/apache/tomcat/tomcat-juli/9.0.32/tomcat-juli-9.0.32.jar(SHA1: 0a8bf547bfde26a53eec004dd6932a1cadc08504)/org/apache/tomcat/tomcat-juli/9.0.32/tomcat-juli-9.0.32.pom(SHA1: 65133d6e034c87874df0fab2bd2dfdde492750db)/org/apache/tomcat/tomcat-juli/9.0.32/tomcat-juli-9.0.32-sources.jar.asc(SHA1: efebeffc02dbc1588008c2610a78420e847dead1)/org/apache/tomcat/tomcat-juli/9.0.32/tomcat-juli-9.0.32.jar.asc(SHA1: a22b22106c2403440cfc4eb6833c86ec981dffe2)/org/apache/tomcat/tomcat-util/9.0.32/tomcat-util-9.0.32.jar(SHA1: b234c34bb7f914f004f3d8aaf18e198eaa164f8f)/org/apache/tomcat/tomcat-util/9.0.32/tomcat-util-9.0.32-sources.jar(SHA1: 7d4632f681e00675d27ee4e3501635e6828989d8)/org/apache/tomcat/tomcat-util/9.0.32/tomcat-util-9.0.32-sources.jar.asc(SHA1: 20740b00da75634c66e380a6f1cb229ea2a87b5b)/org/apache/tomcat/tomcat-util/9.0.32/tomcat-util-9.0.32.pom(SHA1: 5868f7a4ededf00c8a56f39e241f1dd55d355bfe)/org/apache/tomcat/tomcat-util/9.0.32/tomcat-util-9.0.32.jar.asc(SHA1: f42e469e91f3f597b2f87cceefaa3fcfc9694356)/org/apache/tomcat/tomcat-util/9.0.32/tomcat-util-9.0.32.pom.asc(SHA1: 4364996b29d4654f05dd5e788c444836f61a2129)/org/apache/tomcat/tomcat-catalina/9.0.32/tomcat-catalina-9.0.32.jar.asc(SHA1: 3809c5a48820a8ae47778b30d8a4489dedad5947)/org/apache/tomcat/tomcat-catalina/9.0.32/tomcat-catalina-9.0.32-sources.jar(SHA1: 0ddf45386d2c954ce1f229f24c90719b7c826281)/org/apache/tomcat/tomcat-catalina/9.0.32/tomcat-catalina-9.0.32.pom.asc(SHA1: eaacd2c7ea1367b22c10c4283a4ba1bf75dc6218)/org/apache/tomcat/tomcat-catalina/9.0.32/tomcat-catalina-9.0.32.pom(SHA1: a9bbf34c848e584b6fe514ae40b1f833f3c9edde)/org/apache/tomcat/tomcat-catalina/9.0.32/tomcat-catalina-9.0.32.jar(SHA1: a24bbd4ea85b03eaf1977e80884d793778f48fc2)/org/apache/tomcat/tomcat-catalina/9.0.32/tomcat-catalina-9.0.32-sources.jar.asc(SHA1: 9be88bd2afe2e6a7e4ee96d15b23242cd8ee8e67)/org/apache/tomcat/tomcat-i18n-fr/9.0.32/tomcat-i18n-fr-9.0.32.jar.asc(SHA1: eabc9af83d31cbb9e1e1a330dc7b5e470b9c1ff4)/org/apache/tomcat/tomcat-i18n-fr/9.0.32/tomcat-i18n-fr-9.0.32.pom.asc(SHA1: 7852f45c39dea9b30a307b22682baa82c025c83a)/org/apache/tomcat/tomcat-i18n-fr/9.0.32/tomcat-i18n-fr-9.0.32.pom(SHA1: 94f83875525cdfb06f9b6b9f315df4850833c7e4)/org/apache/tomcat/tomcat-i18n-fr/9.0.32/tomcat-i18n-fr-9.0.32.jar(SHA1: b1809264edfa63b19176501114396e9bf47494ab)/org/apache/tomcat/tomcat-i18n-cs/9.0.32/tomcat-i18n-cs-9.0.32.jar(SHA1: fdf515428da9e052e39c0ef73b3b0db704de803b)/org/apache/tomcat/tomcat-i18n-cs/9.0.32/tomcat-i18n-cs-9.0.32.pom.asc(SHA1: 90f92151d54302616a637bdef010a5f1bd0f191d)/org/apache/tomcat/tomcat-i18n-cs/9.0.32/tomcat-i18n-cs-9.0.32.pom(SHA1: eb6f94382a7462f5fcc376808f4593063a35a132)/org/apache/tomcat/tomcat-i18n-cs/9.0.32/tomcat-i18n-cs-9.0.32.jar.asc(SHA1: 2b397d4a06d3f1cc0a59de321e7b2f33714b34fc)/org/apache/tomcat/tomcat-jdbc/9.0.32/tomcat-jdbc-9.0.32.pom.asc(SHA1: 05958424b10288f24cdc2a00247800c4d74445d7)/org/apache/tomcat/tomcat-jdbc/9.0.32/tomcat-jdbc-9.0.32-sources.jar(SHA1: bf660889afce9b665b61ff65ebd537f62284bc94)/org/apache/tomcat/tomcat-jdbc/9.0.32/tomcat-jdbc-9.0.32.pom(SHA1: c0c8576363316ec3772e1e7a2fbb2f9648b5111c)/org/apache/tomcat/tomcat-jdbc/9.0.32/tomcat-jdbc-9.0.32.jar.asc(SHA1: 361ba1e507c88ca84afed5b9503f8da181c8ec75)/org/apache/tomcat/tomcat-jdbc/9.0.32/tomcat-jdbc-9.0.32.jar(SHA1: d8c31326bbfbe03680860ac1e700b63d1a917dcc)/org/apache/tomcat/tomcat-jdbc/9.0.32/tomcat-jdbc-9.0.32-sources.jar.asc(SHA1:

svn commit: r38416 - in /dev/tomcat/tomcat-9/v9.0.32: ./ bin/ bin/embed/ src/

2020-03-06 Thread markt

Author: markt
Date: Fri Mar  6 09:58:57 2020
New Revision: 38416

Log:
Upload 9.0.32 for voting

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

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

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

[tomcat] branch 9.0.x updated: Increment version number for next development cycle

2020-03-06 Thread markt

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

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


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

commit 398b218a56fcda2b8a43322d99888c9b73de4958
Author: Mark Thomas 
AuthorDate: Fri Mar 6 09:57:42 2020 +

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

diff --git a/build.properties.default b/build.properties.default
index 010b6e5..796061c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=32
+version.build=33
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 8fce25e..b0cff87 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=9.0.32
+maven.asf.release.deploy.version=9.0.33
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1a88774..34b5a5e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


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

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

2020-03-06 Thread 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 2599fbb  Increment version number for next development cycle
2599fbb is described below

commit 2599fbb2696d139347526a9f9d6eb46014ea0df0
Author: Mark Thomas 
AuthorDate: Fri Mar 6 09:49:45 2020 +

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

diff --git a/build.properties.default b/build.properties.default
index 58688ec..4bcae8c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=10
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=-M2-dev
+version.suffix=-M3-dev
 
 # - Source control flags -
 git.branch=master
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index e294888..dd76357 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=10.0.0-M2
+maven.asf.release.deploy.version=10.0.0-M3
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8bcfe05..08b4493 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


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

[RESULT][VOTE] Release Apache Tomcat Connectors (JK) 1.2.48

2020-03-06 Thread Mark Thomas

The following votes were cast:

Binding:
+1: mgrigorov, markt, rjung


Thanks to everyone who contributed to this release.

Mark

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

Re: [VOTE] Release Apache Tomcat Connectors (JK) 1.2.48

2020-03-06 Thread Mark Thomas

On 03/03/2020 23:13, Rainer Jung wrote:
> Am 20.02.2020 um 17:55 schrieb Mark Thomas:
>> Tag:
>> https://gitbox.apache.org/repos/asf?p=tomcat-connectors.git;a=commit;h=90b294ce8260ab2585dcb4071ede5d53e51fa354
>>
>>
>> Source:
>> https://gitbox.apache.org/repos/asf?p=tomcat-connectors.git;a=summary
>>
>> Dist:
>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/jk/
>>
>>
>> This is a maintenance release with a handful of bug fixes (compared to
>> 1.2.46) and some clean-up. It also includes Windows binaries for IIS.
>>
>>
>> The proposed JK 1.2.48 release is:
>> [ ] Broken - do not release
>> [X] Stable - go ahead and release as 1.2.48
> 
> I have minor remarks mostly related to release artefacts:

Thanks for the review.

> - the src archive files in previous versions contained files CHANGES and
> NEWS in the native directory. They are generated by our release skript,
> which searches for any of w3m, elinks, links or lynx. Maybe none of
> those existed on the original build system for those artefacts. The
> files do get generated when I run the release skript for 1.2.48 locally.

Odd. links is available. Ah. I needed to run the release script with -h.
I've added a note for that.

> - the symbol archive files in earlier versions contained a file README.
> I think it originates from native/iis/README.

Having read it, I'm leaning towards not including that file. I think it
may be a little mis-leading alongside the symbols.

> - at least in some "printer" html docs links have changed by one level.
> E.g. docs/common_howto/printer/loadbalancers.html in 1.2.46 contains a
> link to ../../reference/workers.html in 1.2.46 and
> ../reference/workers.html in 1.2.48. There are two workers reference
> pages, docs/reference/printer/workers.html and
> docs/reference/workers.html. So the 1.2.46 link should work but jump
> from the "printer" docs to the normal page. The 1.2.48 should no longer
> work at all.

Ah. The switch to the newer stylesheet should have removed the "printer"
docs entirely. I'll get that cleaned up.

Mark

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

[tomcat] 01/01: Tag 9.0.32

2020-03-06 Thread markt

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

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

commit 3a9578990e4e90bcc04bf7d5ef3bc47445e827e6
Author: Mark Thomas 
AuthorDate: Fri Mar 6 09:35:22 2020 +

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

diff --git a/build.properties.default b/build.properties.default
index 010b6e5..17b5b01 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=32
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Source control flags -
 git.branch=master
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1a88774..4c5a5c2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   


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

[tomcat] tag 9.0.32 created (now 3a95789)

2020-03-06 Thread markt

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

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


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

 new 3a95789  Tag 9.0.32

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



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

Re: [VOTE] Release Apache Tomcat 10.0.0-M2

2020-03-06 Thread Rémy Maucherat

On Thu, Mar 5, 2020 at 8:40 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 10.0.0-M2 release is now available for
> voting.
>
> Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary
> package for all the specification APIs has changed from javax.* to
> jakarta.*
> Applications that run on Tomcat 9 will not run on Tomcat 10 without
> changes.
>
> The major changes compared to 10.0.0-M2  are:
>
> - Disable session persistence by default (on restart)
>
> - Add new attribute persistAuthentication to both StandardManager and
>   PersistentManager to support authentication persistence.
>   Patch provided by Carsten Klein
>
> - A zero length AJP secret will now behave as if it has not been
>   specified.
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat10/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.0-M2/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1250/
> The tag is:
> https://github.com/apache/tomcat/tree/10.0.0-M2
> d971ce1bdf8b8e8de93fb41454f4ce2e815ee936
>
> The proposed 10.0.0-M2 release is:
> [ ] Broken - do not release
> [X] Alpha  - go ahead and release as 10.0.0-M2
>

There's possibly an issue with blocking and NIO, maybe I optimized the code
too much (using a latch could be safer) but I cannot reproduce at the
moment and I don't really see a problem so far. So it should be fine for
alpha (and people can always use NIO2 a bit if things are bad).

Rémy


>
> I opted to only include alpha here as there are still some potentially
> significant changes on the TOMCAT-NEXT list.
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[GitHub] [tomcat] rmaucher closed pull request #256: Added extension point for custom delta requests

2020-03-06 Thread GitBox

rmaucher closed pull request #256: Added extension point for custom delta 
requests
URL: https://github.com/apache/tomcat/pull/256
 
 
   


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] rmaucher commented on issue #256: Added extension point for custom delta requests

2020-03-06 Thread GitBox

rmaucher commented on issue #256: Added extension point for custom delta 
requests
URL: https://github.com/apache/tomcat/pull/256#issuecomment-595669130
 
 
   I think merging #240 was a bad idea: we are not going to add extension 
points for just about anything, which are then supposed to be set in stone 
while looking rather useless to just about everyone and in great danger of 
being refactored away.
   -1 for adding this.


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] ThStock opened a new pull request #257: Added extension point for custom delta requests

2020-03-06 Thread GitBox

ThStock opened a new pull request #257: Added extension point for custom delta 
requests
URL: https://github.com/apache/tomcat/pull/257
 
 
   https://github.com/apache/tomcat/pull/240


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] ThStock opened a new pull request #256: Added extension point for custom delta requests

2020-03-06 Thread GitBox

ThStock opened a new pull request #256: Added extension point for custom delta 
requests
URL: https://github.com/apache/tomcat/pull/256
 
 
   See https://github.com/apache/tomcat/pull/240


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

52 matches

Mail list logo