[tomcat] branch master updated: Check earlier for valid first character

[mgrigorov]

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

mgrigorov 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 3937417  Check earlier for valid first character
3937417 is described below

commit 3937417d6beec03f3087af27e0220e1fcc3b29a5
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:28:11 2020 +0300

Check earlier for valid first character

Move the check for the possible characters in the first position
---
 java/org/apache/catalina/connector/CoyoteAdapter.java | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 6249e35..09dcb05 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -1144,6 +1144,12 @@ public class CoyoteAdapter implements Adapter {
 int pos = 0;
 int index = 0;
 
+
+// The URL must start with '/' (or '\' that will be replaced soon)
+if (b[start] != (byte) '/' && b[start] != (byte) '\\') {
+return false;
+}
+
 // Replace '\' with '/'
 // Check for null byte
 for (pos = start; pos < end; pos++) {
@@ -1159,11 +1165,6 @@ public class CoyoteAdapter implements Adapter {
 }
 }
 
-// The URL must start with '/'
-if (b[start] != (byte) '/') {
-return false;
-}
-
 // Replace "//" with "/"
 for (pos = start; pos < (end - 1); pos++) {
 if (b[pos] == (byte) '/') {


-
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: Check earlier for valid first character

[mgrigorov]

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

mgrigorov 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 ceaa2ac  Check earlier for valid first character
ceaa2ac is described below

commit ceaa2ac9cf3df2fb8bf171db57e5a1d0f35d5551
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:28:11 2020 +0300

Check earlier for valid first character

Move the check for the possible characters in the first position
---
 java/org/apache/catalina/connector/CoyoteAdapter.java | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index ddbf14f..915a2c6 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -1151,6 +1151,12 @@ public class CoyoteAdapter implements Adapter {
 int pos = 0;
 int index = 0;
 
+
+// The URL must start with '/' (or '\' that will be replaced soon)
+if (b[start] != (byte) '/' && b[start] != (byte) '\\') {
+return false;
+}
+
 // Replace '\' with '/'
 // Check for null byte
 for (pos = start; pos < end; pos++) {
@@ -1166,11 +1172,6 @@ public class CoyoteAdapter implements Adapter {
 }
 }
 
-// The URL must start with '/'
-if (b[start] != (byte) '/') {
-return false;
-}
-
 // Replace "//" with "/"
 for (pos = start; pos < (end - 1); pos++) {
 if (b[pos] == (byte) '/') {


-
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: Check earlier for valid first character

[mgrigorov]

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

mgrigorov 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 a10f740  Check earlier for valid first character
a10f740 is described below

commit a10f7409acafeca9a385b30b420e9f5dbf116fea
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:28:11 2020 +0300

Check earlier for valid first character

Move the check for the possible characters in the first position
---
 java/org/apache/catalina/connector/CoyoteAdapter.java | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index cdc2151..7d9c8f2 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -1148,6 +1148,12 @@ public class CoyoteAdapter implements Adapter {
 int pos = 0;
 int index = 0;
 
+
+// The URL must start with '/' (or '\' that will be replaced soon)
+if (b[start] != (byte) '/' && b[start] != (byte) '\\') {
+return false;
+}
+
 // Replace '\' with '/'
 // Check for null byte
 for (pos = start; pos < end; pos++) {
@@ -1163,11 +1169,6 @@ public class CoyoteAdapter implements Adapter {
 }
 }
 
-// The URL must start with '/'
-if (b[start] != (byte) '/') {
-return false;
-}
-
 // Replace "//" with "/"
 for (pos = start; pos < (end - 1); pos++) {
 if (b[pos] == (byte) '/') {


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

[tomcat] branch 7.0.x updated: Check earlier for valid first character

[mgrigorov]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 91fac27  Check earlier for valid first character
91fac27 is described below

commit 91fac278b92ad33136ec6825fa557a19f426e808
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:28:11 2020 +0300

Check earlier for valid first character

Move the check for the possible characters in the first position
---
 java/org/apache/catalina/connector/CoyoteAdapter.java | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index ea339c0..ab4551e 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -1272,6 +1272,12 @@ public class CoyoteAdapter implements Adapter {
 int pos = 0;
 int index = 0;
 
+
+// The URL must start with '/' (or '\' that will be replaced soon)
+if (b[start] != (byte) '/' && b[start] != (byte) '\\') {
+return false;
+}
+
 // Replace '\' with '/'
 // Check for null byte
 for (pos = start; pos < end; pos++) {
@@ -1287,11 +1293,6 @@ public class CoyoteAdapter implements Adapter {
 }
 }
 
-// The URL must start with '/'
-if (b[start] != (byte) '/') {
-return false;
-}
-
 // Replace "//" with "/"
 for (pos = start; pos < (end - 1); pos++) {
 if (b[pos] == (byte) '/') {


-
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: Change 'if' to 'else if'

[mgrigorov]

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

mgrigorov 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 c6c56f1  Change 'if' to 'else if'
c6c56f1 is described below

commit c6c56f1c5a0c00e8ff8aeac62ebfcee190f2ab86
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:29:13 2020 +0300

Change 'if' to 'else if'

b[pos] cannot be both '\\' and 0, so there is no need to make the second 
check if it was '\\'
---
 java/org/apache/catalina/connector/CoyoteAdapter.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 7d9c8f2..46a7c9f 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -1163,8 +1163,7 @@ public class CoyoteAdapter implements Adapter {
 } else {
 return false;
 }
-}
-if (b[pos] == (byte) 0) {
+} else if (b[pos] == (byte) 0) {
 return false;
 }
 }


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

[tomcat] branch master updated: Change 'if' to 'else if'

[mgrigorov]

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

mgrigorov 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 3042fb3  Change 'if' to 'else if'
3042fb3 is described below

commit 3042fb3088577b098dbe456cdfa7a79569a92d8a
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:29:13 2020 +0300

Change 'if' to 'else if'

b[pos] cannot be both '\\' and 0, so there is no need to make the second 
check if it was '\\'
---
 java/org/apache/catalina/connector/CoyoteAdapter.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 09dcb05..d93b450 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -1159,8 +1159,7 @@ public class CoyoteAdapter implements Adapter {
 } else {
 return false;
 }
-}
-if (b[pos] == (byte) 0) {
+} else if (b[pos] == (byte) 0) {
 return false;
 }
 }


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

[tomcat] branch 7.0.x updated: Change 'if' to 'else if'

[mgrigorov]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new fce3e29  Change 'if' to 'else if'
fce3e29 is described below

commit fce3e29b1325073e8495b11e738138545aecb036
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:29:13 2020 +0300

Change 'if' to 'else if'

b[pos] cannot be both '\\' and 0, so there is no need to make the second 
check if it was '\\'
---
 java/org/apache/catalina/connector/CoyoteAdapter.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index ab4551e..bbccac9 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -1287,8 +1287,7 @@ public class CoyoteAdapter implements Adapter {
 } else {
 return false;
 }
-}
-if (b[pos] == (byte) 0) {
+} else if (b[pos] == (byte) 0) {
 return false;
 }
 }


-
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: Change 'if' to 'else if'

[mgrigorov]

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

mgrigorov 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 58ad906  Change 'if' to 'else if'
58ad906 is described below

commit 58ad906ef5b42e85b672ea327ca357592be9b0aa
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:29:13 2020 +0300

Change 'if' to 'else if'

b[pos] cannot be both '\\' and 0, so there is no need to make the second 
check if it was '\\'
---
 java/org/apache/catalina/connector/CoyoteAdapter.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 915a2c6..4303620 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -1166,8 +1166,7 @@ public class CoyoteAdapter implements Adapter {
 } else {
 return false;
 }
-}
-if (b[pos] == (byte) 0) {
+} else if (b[pos] == (byte) 0) {
 return false;
 }
 }


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

[tomcat] branch master updated: Do not check for TLS request attribute more than once

[mgrigorov]

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

mgrigorov 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 5528a24  Do not check for TLS request attribute more than once
5528a24 is described below

commit 5528a24309c52f98a13b32de72e82005295c9f3e
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:31:11 2020 +0300

Do not check for TLS request attribute more than once

No need to check for special TLS attribute second time if they were parsed 
already.
If 'name' is a TLS attribute then it will be in the 'attributes' map.
---
 java/org/apache/catalina/connector/Request.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index e4e31be..48e0167 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -856,7 +856,7 @@ public class Request implements HttpServletRequest {
 if (attr != null) {
 return attr;
 }
-if (TLSUtil.isTLSRequestAttribute(name)) {
+if (!sslAttributesParsed && TLSUtil.isTLSRequestAttribute(name)) {
 coyoteRequest.action(ActionCode.REQ_SSL_ATTRIBUTE, coyoteRequest);
 attr = coyoteRequest.getAttribute(Globals.CERTIFICATES_ATTR);
 if (attr != null) {


-
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: Do not check for TLS request attribute more than once

[mgrigorov]

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

mgrigorov 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 b281768  Do not check for TLS request attribute more than once
b281768 is described below

commit b2817688c6d0e457b18b8b4b02ae3368c9c19e56
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:31:11 2020 +0300

Do not check for TLS request attribute more than once

No need to check for special TLS attribute second time if they were parsed 
already.
If 'name' is a TLS attribute then it will be in the 'attributes' map.
---
 java/org/apache/catalina/connector/Request.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 430ed65..dc6faaa 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -888,7 +888,7 @@ public class Request implements HttpServletRequest {
 if (attr != null) {
 return attr;
 }
-if (TLSUtil.isTLSRequestAttribute(name)) {
+if (!sslAttributesParsed && TLSUtil.isTLSRequestAttribute(name)) {
 coyoteRequest.action(ActionCode.REQ_SSL_ATTRIBUTE, coyoteRequest);
 attr = coyoteRequest.getAttribute(Globals.CERTIFICATES_ATTR);
 if (attr != null) {


-
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: Do not check for TLS request attribute more than once

[mgrigorov]

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

mgrigorov 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 593b981  Do not check for TLS request attribute more than once
593b981 is described below

commit 593b9815fbe64a5bbef59e8ac977d152ef22de8f
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:31:11 2020 +0300

Do not check for TLS request attribute more than once

No need to check for special TLS attribute second time if they were parsed 
already.
If 'name' is a TLS attribute then it will be in the 'attributes' map.
---
 java/org/apache/catalina/connector/Request.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index ad34a09..1d2c341 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -915,7 +915,7 @@ public class Request implements HttpServletRequest {
 if (attr != null) {
 return attr;
 }
-if (TLSUtil.isTLSRequestAttribute(name)) {
+if (!sslAttributesParsed && TLSUtil.isTLSRequestAttribute(name)) {
 coyoteRequest.action(ActionCode.REQ_SSL_ATTRIBUTE, coyoteRequest);
 attr = coyoteRequest.getAttribute(Globals.CERTIFICATES_ATTR);
 if (attr != null) {


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

[tomcat] branch 7.0.x updated: Do not check for TLS request attribute more than once

[mgrigorov]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 2b44d30  Do not check for TLS request attribute more than once
2b44d30 is described below

commit 2b44d30a761fa03dc1e682bfda13e60b4eafa234
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:31:11 2020 +0300

Do not check for TLS request attribute more than once

No need to check for special TLS attribute second time if they were parsed 
already.
If 'name' is a TLS attribute then it will be in the 'attributes' map.
---
 java/org/apache/catalina/connector/Request.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index d218c8d..c4fcc2a 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -979,7 +979,8 @@ public class Request implements HttpServletRequest {
 if (attr != null) {
 return attr;
 }
-if (isSSLAttribute(name) || 
name.equals(SSLSupport.PROTOCOL_VERSION_KEY)) {
+
+if (!sslAttributesParsed && (isSSLAttribute(name) || 
name.equals(SSLSupport.PROTOCOL_VERSION_KEY))) {
 coyoteRequest.action(ActionCode.REQ_SSL_ATTRIBUTE, coyoteRequest);
 attr = coyoteRequest.getAttribute(Globals.CERTIFICATES_ATTR);
 if (attr != null) {


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

[tomcat] branch master updated: Do not load stacktrace for StopPooledThreadException

[mgrigorov]

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

mgrigorov 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 7c5fbbe  Do not load stacktrace for StopPooledThreadException
7c5fbbe is described below

commit 7c5fbbebc05e837dc2acbd4be2178e5044751244
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:34:37 2020 +0300

Do not load stacktrace for StopPooledThreadException

StopPooledThreadException is a special exception used to stop a thread.
There is no need to load its stacktrace.
---
 java/org/apache/tomcat/util/threads/StopPooledThreadException.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/threads/StopPooledThreadException.java 
b/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
index fcee34a..e1447e2 100644
--- a/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
+++ b/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
@@ -26,6 +26,6 @@ public class StopPooledThreadException extends 
RuntimeException {
 private static final long serialVersionUID = 1L;
 
 public StopPooledThreadException(String msg) {
-super(msg);
+super(msg, null, false, false);
 }
 }


-
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: Do not load stacktrace for StopPooledThreadException

[mgrigorov]

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

mgrigorov 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 c3818d6  Do not load stacktrace for StopPooledThreadException
c3818d6 is described below

commit c3818d67784f2f37bcdc522e8ba71e04f177dba3
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:34:37 2020 +0300

Do not load stacktrace for StopPooledThreadException

StopPooledThreadException is a special exception used to stop a thread.
There is no need to load its stacktrace.
---
 java/org/apache/tomcat/util/threads/StopPooledThreadException.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/threads/StopPooledThreadException.java 
b/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
index fcee34a..e1447e2 100644
--- a/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
+++ b/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
@@ -26,6 +26,6 @@ public class StopPooledThreadException extends 
RuntimeException {
 private static final long serialVersionUID = 1L;
 
 public StopPooledThreadException(String msg) {
-super(msg);
+super(msg, null, false, false);
 }
 }


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

[tomcat] branch 7.0.x updated: Do not load stacktrace for StopPooledThreadException

[mgrigorov]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new d15e6d0  Do not load stacktrace for StopPooledThreadException
d15e6d0 is described below

commit d15e6d06229800456413d80738f0503ccc1accc8
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:34:37 2020 +0300

Do not load stacktrace for StopPooledThreadException

StopPooledThreadException is a special exception used to stop a thread.
There is no need to load its stacktrace.
---
 java/org/apache/tomcat/util/threads/StopPooledThreadException.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/threads/StopPooledThreadException.java 
b/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
index fcee34a..e1447e2 100644
--- a/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
+++ b/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
@@ -26,6 +26,6 @@ public class StopPooledThreadException extends 
RuntimeException {
 private static final long serialVersionUID = 1L;
 
 public StopPooledThreadException(String msg) {
-super(msg);
+super(msg, null, false, false);
 }
 }


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

[tomcat] branch master updated: Change forcedRemainingCapacity from Integer to int

[mgrigorov]

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

mgrigorov 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 2cef8f1  Change forcedRemainingCapacity from Integer to int
2cef8f1 is described below

commit 2cef8f18dee7b7bca3d03b3301fbe8e733e728fa
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:36:23 2020 +0300

Change forcedRemainingCapacity from Integer to int

No need to create object (or use Integer cache) and cast it to primitive 
int.
'forcedRemainingCapacity' can do its job with a primitive int, since 
Queue's capacity cannot be negative value
---
 java/org/apache/tomcat/util/threads/TaskQueue.java| 15 ++-
 .../apache/tomcat/util/threads/ThreadPoolExecutor.java|  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/tomcat/util/threads/TaskQueue.java 
b/java/org/apache/tomcat/util/threads/TaskQueue.java
index 87c93a9..35f1d89 100644
--- a/java/org/apache/tomcat/util/threads/TaskQueue.java
+++ b/java/org/apache/tomcat/util/threads/TaskQueue.java
@@ -35,12 +35,13 @@ public class TaskQueue extends 
LinkedBlockingQueue {
 private static final long serialVersionUID = 1L;
 protected static final StringManager sm = StringManager
 .getManager("org.apache.tomcat.util.threads.res");
+private static final int DEFAULT_FORCED_REMAINING_CAPACITY = -1;
 
 private transient volatile ThreadPoolExecutor parent = null;
 
 // No need to be volatile. This is written and read in a single thread
-// (when stopping a context and firing the  listeners)
-private Integer forcedRemainingCapacity = null;
+// (when stopping a context and firing the listeners)
+private int forcedRemainingCapacity = -1;
 
 public TaskQueue() {
 super();
@@ -109,18 +110,22 @@ public class TaskQueue extends 
LinkedBlockingQueue {
 
 @Override
 public int remainingCapacity() {
-if (forcedRemainingCapacity != null) {
+if (forcedRemainingCapacity > DEFAULT_FORCED_REMAINING_CAPACITY) {
 // ThreadPoolExecutor.setCorePoolSize checks that
 // remainingCapacity==0 to allow to interrupt idle threads
 // I don't see why, but this hack allows to conform to this
 // "requirement"
-return forcedRemainingCapacity.intValue();
+return forcedRemainingCapacity;
 }
 return super.remainingCapacity();
 }
 
-public void setForcedRemainingCapacity(Integer forcedRemainingCapacity) {
+public void setForcedRemainingCapacity(int forcedRemainingCapacity) {
 this.forcedRemainingCapacity = forcedRemainingCapacity;
 }
 
+void resetForcedRemainingCapacity() {
+this.forcedRemainingCapacity = DEFAULT_FORCED_REMAINING_CAPACITY;
+}
+
 }
diff --git a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java 
b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
index dbabc05..7298efa 100644
--- a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
+++ b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
@@ -197,7 +197,7 @@ public class ThreadPoolExecutor extends 
java.util.concurrent.ThreadPoolExecutor
 // checks that queue.remainingCapacity()==0. I did not understand
 // why, but to get the intended effect of waking up idle threads, I
 // temporarily fake this condition.
-taskQueue.setForcedRemainingCapacity(Integer.valueOf(0));
+taskQueue.setForcedRemainingCapacity(0);
 }
 
 // setCorePoolSize(0) wakes idle threads
@@ -209,7 +209,7 @@ public class ThreadPoolExecutor extends 
java.util.concurrent.ThreadPoolExecutor
 
 if (taskQueue != null) {
 // ok, restore the state of the queue and pool
-taskQueue.setForcedRemainingCapacity(null);
+taskQueue.resetForcedRemainingCapacity();
 }
 this.setCorePoolSize(savedCorePoolSize);
 }


-
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: Do not load stacktrace for StopPooledThreadException

[mgrigorov]

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

mgrigorov 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 01945af  Do not load stacktrace for StopPooledThreadException
01945af is described below

commit 01945afb05bd0df98701f83a783e89da82fcd1c8
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:34:37 2020 +0300

Do not load stacktrace for StopPooledThreadException

StopPooledThreadException is a special exception used to stop a thread.
There is no need to load its stacktrace.
---
 java/org/apache/tomcat/util/threads/StopPooledThreadException.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/threads/StopPooledThreadException.java 
b/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
index fcee34a..e1447e2 100644
--- a/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
+++ b/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
@@ -26,6 +26,6 @@ public class StopPooledThreadException extends 
RuntimeException {
 private static final long serialVersionUID = 1L;
 
 public StopPooledThreadException(String msg) {
-super(msg);
+super(msg, null, false, false);
 }
 }


-
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: Change forcedRemainingCapacity from Integer to int

[mgrigorov]

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

mgrigorov 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 ad66248  Change forcedRemainingCapacity from Integer to int
ad66248 is described below

commit ad66248d551a707cc0df37773fb06ef0a35aa578
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:36:23 2020 +0300

Change forcedRemainingCapacity from Integer to int

No need to create object (or use Integer cache) and cast it to primitive 
int.
'forcedRemainingCapacity' can do its job with a primitive int, since 
Queue's capacity cannot be negative value
---
 java/org/apache/tomcat/util/threads/TaskQueue.java| 15 ++-
 .../apache/tomcat/util/threads/ThreadPoolExecutor.java|  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/tomcat/util/threads/TaskQueue.java 
b/java/org/apache/tomcat/util/threads/TaskQueue.java
index 87c93a9..35f1d89 100644
--- a/java/org/apache/tomcat/util/threads/TaskQueue.java
+++ b/java/org/apache/tomcat/util/threads/TaskQueue.java
@@ -35,12 +35,13 @@ public class TaskQueue extends 
LinkedBlockingQueue {
 private static final long serialVersionUID = 1L;
 protected static final StringManager sm = StringManager
 .getManager("org.apache.tomcat.util.threads.res");
+private static final int DEFAULT_FORCED_REMAINING_CAPACITY = -1;
 
 private transient volatile ThreadPoolExecutor parent = null;
 
 // No need to be volatile. This is written and read in a single thread
-// (when stopping a context and firing the  listeners)
-private Integer forcedRemainingCapacity = null;
+// (when stopping a context and firing the listeners)
+private int forcedRemainingCapacity = -1;
 
 public TaskQueue() {
 super();
@@ -109,18 +110,22 @@ public class TaskQueue extends 
LinkedBlockingQueue {
 
 @Override
 public int remainingCapacity() {
-if (forcedRemainingCapacity != null) {
+if (forcedRemainingCapacity > DEFAULT_FORCED_REMAINING_CAPACITY) {
 // ThreadPoolExecutor.setCorePoolSize checks that
 // remainingCapacity==0 to allow to interrupt idle threads
 // I don't see why, but this hack allows to conform to this
 // "requirement"
-return forcedRemainingCapacity.intValue();
+return forcedRemainingCapacity;
 }
 return super.remainingCapacity();
 }
 
-public void setForcedRemainingCapacity(Integer forcedRemainingCapacity) {
+public void setForcedRemainingCapacity(int forcedRemainingCapacity) {
 this.forcedRemainingCapacity = forcedRemainingCapacity;
 }
 
+void resetForcedRemainingCapacity() {
+this.forcedRemainingCapacity = DEFAULT_FORCED_REMAINING_CAPACITY;
+}
+
 }
diff --git a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java 
b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
index dbabc05..7298efa 100644
--- a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
+++ b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
@@ -197,7 +197,7 @@ public class ThreadPoolExecutor extends 
java.util.concurrent.ThreadPoolExecutor
 // checks that queue.remainingCapacity()==0. I did not understand
 // why, but to get the intended effect of waking up idle threads, I
 // temporarily fake this condition.
-taskQueue.setForcedRemainingCapacity(Integer.valueOf(0));
+taskQueue.setForcedRemainingCapacity(0);
 }
 
 // setCorePoolSize(0) wakes idle threads
@@ -209,7 +209,7 @@ public class ThreadPoolExecutor extends 
java.util.concurrent.ThreadPoolExecutor
 
 if (taskQueue != null) {
 // ok, restore the state of the queue and pool
-taskQueue.setForcedRemainingCapacity(null);
+taskQueue.resetForcedRemainingCapacity();
 }
 this.setCorePoolSize(savedCorePoolSize);
 }


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

[tomcat] branch 7.0.x updated: Change forcedRemainingCapacity from Integer to int

[mgrigorov]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new cf5226f  Change forcedRemainingCapacity from Integer to int
cf5226f is described below

commit cf5226f9eb9d94068f771a015cdbb1bd701b7fb3
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:36:23 2020 +0300

Change forcedRemainingCapacity from Integer to int

No need to create object (or use Integer cache) and cast it to primitive 
int.
'forcedRemainingCapacity' can do its job with a primitive int, since 
Queue's capacity cannot be negative value
---
 java/org/apache/tomcat/util/threads/TaskQueue.java | 14 +-
 .../org/apache/tomcat/util/threads/ThreadPoolExecutor.java |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/tomcat/util/threads/TaskQueue.java 
b/java/org/apache/tomcat/util/threads/TaskQueue.java
index 600fe5b..cdd0bc2 100644
--- a/java/org/apache/tomcat/util/threads/TaskQueue.java
+++ b/java/org/apache/tomcat/util/threads/TaskQueue.java
@@ -35,8 +35,8 @@ public class TaskQueue extends LinkedBlockingQueue {
 private transient volatile ThreadPoolExecutor parent = null;
 
 // No need to be volatile. This is written and read in a single thread
-// (when stopping a context and firing the  listeners)
-private Integer forcedRemainingCapacity = null;
+// (when stopping a context and firing the listeners)
+private int forcedRemainingCapacity = -1;
 
 public TaskQueue() {
 super();
@@ -105,18 +105,22 @@ public class TaskQueue extends 
LinkedBlockingQueue {
 
 @Override
 public int remainingCapacity() {
-if (forcedRemainingCapacity != null) {
+if (forcedRemainingCapacity > DEFAULT_FORCED_REMAINING_CAPACITY) {
 // ThreadPoolExecutor.setCorePoolSize checks that
 // remainingCapacity==0 to allow to interrupt idle threads
 // I don't see why, but this hack allows to conform to this
 // "requirement"
-return forcedRemainingCapacity.intValue();
+return forcedRemainingCapacity;
 }
 return super.remainingCapacity();
 }
 
-public void setForcedRemainingCapacity(Integer forcedRemainingCapacity) {
+public void setForcedRemainingCapacity(int forcedRemainingCapacity) {
 this.forcedRemainingCapacity = forcedRemainingCapacity;
 }
 
+void resetForcedRemainingCapacity() {
+this.forcedRemainingCapacity = DEFAULT_FORCED_REMAINING_CAPACITY;
+}
+
 }
diff --git a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java 
b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
index 6d433d5..24bc84c 100644
--- a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
+++ b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
@@ -197,7 +197,7 @@ public class ThreadPoolExecutor extends 
java.util.concurrent.ThreadPoolExecutor
 // checks that queue.remainingCapacity()==0. I did not understand
 // why, but to get the intended effect of waking up idle threads, I
 // temporarily fake this condition.
-taskQueue.setForcedRemainingCapacity(Integer.valueOf(0));
+taskQueue.setForcedRemainingCapacity(0);
 }
 
 // setCorePoolSize(0) wakes idle threads
@@ -209,7 +209,7 @@ public class ThreadPoolExecutor extends 
java.util.concurrent.ThreadPoolExecutor
 
 if (taskQueue != null) {
 // ok, restore the state of the queue and pool
-taskQueue.setForcedRemainingCapacity(null);
+taskQueue.resetForcedRemainingCapacity();
 }
 this.setCorePoolSize(savedCorePoolSize);
 }


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

[GitHub] [tomcat] martin-g closed pull request #344: Minor performance improvements

[GitBox]

martin-g closed pull request #344:
URL: https://github.com/apache/tomcat/pull/344


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] martin-g commented on pull request #344: Minor performance improvements

[GitBox]

martin-g commented on pull request #344:
URL: https://github.com/apache/tomcat/pull/344#issuecomment-681903205


   Thank you for the review!
   
   The commits have been applied to `master`, `9.0.x`, `8.5.x` and `7.0.x` 
branches.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[tomcat] branch master updated: Clarify where wildcards are allowed in Host and Alias directives

[mgrigorov]

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

mgrigorov 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 ae88ac2  Clarify where wildcards are allowed in Host and Alias 
directives
 new 30283fc  Merge pull request #345 from tomchiverton/patch-1
ae88ac2 is described below

commit ae88ac2ee9a69b075696769c6b7ec61b7ba1d8a6
Author: Tom Chiverton 
AuthorDate: Wed Aug 26 16:41:52 2020 +0100

Clarify where wildcards are allowed in Host and Alias directives
---
 webapps/docs/config/host.xml | 13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml
index 63946c8..2eb5eb2 100644
--- a/webapps/docs/config/host.xml
+++ b/webapps/docs/config/host.xml
@@ -192,10 +192,8 @@
 have a name that matches the defaultHost setting for that
 Engine.  See Host Name Aliases for
 information on how to assign more than one network name to the same
-virtual host. If the name takes the form of *.domainname
-(e.g. *.apache.org) then it will be treated as a match for
-any host in that domain unless a host that has an exactly matching name
-is found.
+virtual host. The name can not contain a wildcard, this is only
+valid in an Alias.
   
 
   
@@ -492,10 +490,9 @@
 involved must be registered in your DNS server to resolve to the
 same computer that is running this instance of Catalina.
 
-Aliases may also use the wildcard form (*.domainname)
-   permitted for the name attribute of a
-   Host.
-
+Aliases may also use the wildcard form (*.domainname), 
+unlike for the name attribute of a Host.
+
   
 
 


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

[GitHub] [tomcat] martin-g commented on pull request #345: Clarify where wildcards are allowed in Host and Alias directives

[GitBox]

martin-g commented on pull request #345:
URL: https://github.com/apache/tomcat/pull/345#issuecomment-681906855


   The commit has been backported to `9.0.x` and `8.5.x` branches. `7.0.x` docs 
do not mention wildcards at the moment, so I guess those are not supported 
there.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] martin-g merged pull request #345: Clarify where wildcards are allowed in Host and Alias directives

[GitBox]

martin-g merged pull request #345:
URL: https://github.com/apache/tomcat/pull/345


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[tomcat] 02/02: Clarify where wildcards are allowed in Host and Alias directives

[mgrigorov]

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

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

commit a1f53c366ded63bb1d57adc8000b082a4b70d767
Author: Tom Chiverton 
AuthorDate: Wed Aug 26 16:41:52 2020 +0100

Clarify where wildcards are allowed in Host and Alias directives

(cherry picked from commit ae88ac2ee9a69b075696769c6b7ec61b7ba1d8a6)
---
 webapps/docs/config/host.xml | 13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml
index d2e8f14..3d97fd9 100644
--- a/webapps/docs/config/host.xml
+++ b/webapps/docs/config/host.xml
@@ -192,10 +192,8 @@
 have a name that matches the defaultHost setting for that
 Engine.  See Host Name Aliases for
 information on how to assign more than one network name to the same
-virtual host. If the name takes the form of *.domainname
-(e.g. *.apache.org) then it will be treated as a match for
-any host in that domain unless a host that has an exactly matching name
-is found.
+virtual host. The name can not contain a wildcard, this is only
+valid in an Alias.
   
 
   
@@ -491,10 +489,9 @@
 involved must be registered in your DNS server to resolve to the
 same computer that is running this instance of Catalina.
 
-Aliases may also use the wildcard form (*.domainname)
-   permitted for the name attribute of a
-   Host.
-
+Aliases may also use the wildcard form (*.domainname), 
+unlike for the name attribute of a Host.
+
   
 
 


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

[tomcat] 01/02: Change forcedRemainingCapacity from Integer to int

[mgrigorov]

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

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

commit fab97c761b07e02fd79b5a932e4d7f4a38f1a084
Author: Martin Tzvetanov Grigorov 
AuthorDate: Tue Aug 25 14:36:23 2020 +0300

Change forcedRemainingCapacity from Integer to int

No need to create object (or use Integer cache) and cast it to primitive 
int.
'forcedRemainingCapacity' can do its job with a primitive int, since 
Queue's capacity cannot be negative value
---
 java/org/apache/tomcat/util/threads/TaskQueue.java | 14 +-
 .../org/apache/tomcat/util/threads/ThreadPoolExecutor.java |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/tomcat/util/threads/TaskQueue.java 
b/java/org/apache/tomcat/util/threads/TaskQueue.java
index 600fe5b..cdd0bc2 100644
--- a/java/org/apache/tomcat/util/threads/TaskQueue.java
+++ b/java/org/apache/tomcat/util/threads/TaskQueue.java
@@ -35,8 +35,8 @@ public class TaskQueue extends LinkedBlockingQueue {
 private transient volatile ThreadPoolExecutor parent = null;
 
 // No need to be volatile. This is written and read in a single thread
-// (when stopping a context and firing the  listeners)
-private Integer forcedRemainingCapacity = null;
+// (when stopping a context and firing the listeners)
+private int forcedRemainingCapacity = -1;
 
 public TaskQueue() {
 super();
@@ -105,18 +105,22 @@ public class TaskQueue extends 
LinkedBlockingQueue {
 
 @Override
 public int remainingCapacity() {
-if (forcedRemainingCapacity != null) {
+if (forcedRemainingCapacity > DEFAULT_FORCED_REMAINING_CAPACITY) {
 // ThreadPoolExecutor.setCorePoolSize checks that
 // remainingCapacity==0 to allow to interrupt idle threads
 // I don't see why, but this hack allows to conform to this
 // "requirement"
-return forcedRemainingCapacity.intValue();
+return forcedRemainingCapacity;
 }
 return super.remainingCapacity();
 }
 
-public void setForcedRemainingCapacity(Integer forcedRemainingCapacity) {
+public void setForcedRemainingCapacity(int forcedRemainingCapacity) {
 this.forcedRemainingCapacity = forcedRemainingCapacity;
 }
 
+void resetForcedRemainingCapacity() {
+this.forcedRemainingCapacity = DEFAULT_FORCED_REMAINING_CAPACITY;
+}
+
 }
diff --git a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java 
b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
index 74ec4a0..42db3df 100644
--- a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
+++ b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
@@ -197,7 +197,7 @@ public class ThreadPoolExecutor extends 
java.util.concurrent.ThreadPoolExecutor
 // checks that queue.remainingCapacity()==0. I did not understand
 // why, but to get the intended effect of waking up idle threads, I
 // temporarily fake this condition.
-taskQueue.setForcedRemainingCapacity(Integer.valueOf(0));
+taskQueue.setForcedRemainingCapacity(0);
 }
 
 // setCorePoolSize(0) wakes idle threads
@@ -209,7 +209,7 @@ public class ThreadPoolExecutor extends 
java.util.concurrent.ThreadPoolExecutor
 
 if (taskQueue != null) {
 // ok, restore the state of the queue and pool
-taskQueue.setForcedRemainingCapacity(null);
+taskQueue.resetForcedRemainingCapacity();
 }
 this.setCorePoolSize(savedCorePoolSize);
 }


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

[GitHub] [tomcat] martin-g commented on pull request #345: Clarify where wildcards are allowed in Host and Alias directives

[GitBox]

martin-g commented on pull request #345:
URL: https://github.com/apache/tomcat/pull/345#issuecomment-681904616


   Thank you, @tomchiverton !



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[tomcat] branch 9.0.x updated: Clarify where wildcards are allowed in Host and Alias directives

[mgrigorov]

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

mgrigorov 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 b1a1c7a  Clarify where wildcards are allowed in Host and Alias 
directives
b1a1c7a is described below

commit b1a1c7acd753403268832c93c90b87ad13d9560f
Author: Tom Chiverton 
AuthorDate: Wed Aug 26 16:41:52 2020 +0100

Clarify where wildcards are allowed in Host and Alias directives

(cherry picked from commit ae88ac2ee9a69b075696769c6b7ec61b7ba1d8a6)
---
 webapps/docs/config/host.xml | 13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml
index 31e0bb1..0c0e0f7 100644
--- a/webapps/docs/config/host.xml
+++ b/webapps/docs/config/host.xml
@@ -192,10 +192,8 @@
 have a name that matches the defaultHost setting for that
 Engine.  See Host Name Aliases for
 information on how to assign more than one network name to the same
-virtual host. If the name takes the form of *.domainname
-(e.g. *.apache.org) then it will be treated as a match for
-any host in that domain unless a host that has an exactly matching name
-is found.
+virtual host. The name can not contain a wildcard, this is only
+valid in an Alias.
   
 
   
@@ -492,10 +490,9 @@
 involved must be registered in your DNS server to resolve to the
 same computer that is running this instance of Catalina.
 
-Aliases may also use the wildcard form (*.domainname)
-   permitted for the name attribute of a
-   Host.
-
+Aliases may also use the wildcard form (*.domainname), 
+unlike for the name attribute of a Host.
+
   
 
 


-
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: Show Travis test fialures

[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 5757585  Show Travis test fialures
5757585 is described below

commit 5757585af8cef20e8c3e3f8f46dfbce17cabbce9
Author: Mark Thomas 
AuthorDate: Thu Aug 27 13:31:28 2020 +0100

Show Travis test fialures
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 1441aa8..6651957 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,6 +76,7 @@ script:
 
 after_failure:
 - tail -n 5000 ant-test.log
+- tail -n 5000 test-failures.log
 - ls -laR $HOME/tomcat-build-libs
 
 notifications:


-
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: Show Travis test fialures

[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 ecde22c  Show Travis test fialures
ecde22c is described below

commit ecde22c64c8c04cf24e8c784f54fc62ac8f22255
Author: Mark Thomas 
AuthorDate: Thu Aug 27 13:31:11 2020 +0100

Show Travis test fialures
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 1441aa8..6651957 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,6 +76,7 @@ script:
 
 after_failure:
 - tail -n 5000 ant-test.log
+- tail -n 5000 test-failures.log
 - ls -laR $HOME/tomcat-build-libs
 
 notifications:


-
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 (01945af -> a1f53c3)

[mgrigorov]

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

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


from 01945af  Do not load stacktrace for StopPooledThreadException
 new fab97c7  Change forcedRemainingCapacity from Integer to int
 new a1f53c3  Clarify where wildcards are allowed in Host and Alias 
directives

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


Summary of changes:
 java/org/apache/tomcat/util/threads/TaskQueue.java | 14 +-
 .../org/apache/tomcat/util/threads/ThreadPoolExecutor.java |  4 ++--
 webapps/docs/config/host.xml   | 13 +
 3 files changed, 16 insertions(+), 15 deletions(-)


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

[tomcat] branch master updated (30283fc -> 1e47a40)

[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 30283fc  Merge pull request #345 from tomchiverton/patch-1
 new 7837e6f  Avoid NPE observed in CI
 new 5a3e276  Remove trailing space
 new 1e47a40  Remove trailing space

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/coyote/http2/Stream.java | 19 ---
 webapps/docs/config/host.xml |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)


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

[tomcat] 03/03: Remove trailing space

[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 1e47a4047bebf3ead60bc0c6763a96ef812d5c27
Author: Mark Thomas 
AuthorDate: Thu Aug 27 13:54:10 2020 +0100

Remove trailing space


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

[tomcat] 01/03: Avoid NPE observed in CI

[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 7837e6f798190316d40c7ebf1efeb3a241efa090
Author: Mark Thomas 
AuthorDate: Thu Aug 27 13:52:44 2020 +0100

Avoid NPE observed in CI
---
 java/org/apache/coyote/http2/Stream.java | 19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/coyote/http2/Stream.java 
b/java/org/apache/coyote/http2/Stream.java
index 8b2b0d2..ea87346 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -300,14 +300,19 @@ class Stream extends AbstractStream implements 
HeaderEmitter {
 
 
 void doStreamCancel(String msg, Http2Error error) throws CloseNowException 
{
+// Avoid NPEs on duplicate cancellations
+StreamOutputBuffer streamOutputBuffer = this.streamOutputBuffer;
+Response coyoteResponse = this.coyoteResponse;
 StreamException se = new StreamException(msg, error, getIdAsInt());
-// Prevent the application making further writes
-streamOutputBuffer.closed = true;
-// Prevent Tomcat's error handling trying to write
-coyoteResponse.setError();
-coyoteResponse.setErrorReported();
-// Trigger a reset once control returns to Tomcat
-streamOutputBuffer.reset = se;
+if (streamOutputBuffer != null && coyoteResponse != null) {
+// Prevent the application making further writes
+streamOutputBuffer.closed = true;
+// Prevent Tomcat's error handling trying to write
+coyoteResponse.setError();
+coyoteResponse.setErrorReported();
+// Trigger a reset once control returns to Tomcat
+streamOutputBuffer.reset = se;
+}
 throw new CloseNowException(msg, se);
 }
 


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

[tomcat] 02/03: Remove trailing space

[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 5a3e276b28b25d05a5a2b454cd33a782bbc106db
Author: Mark Thomas 
AuthorDate: Thu Aug 27 13:54:10 2020 +0100

Remove trailing space
---
 webapps/docs/config/host.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml
index 2eb5eb2..56b18eb 100644
--- a/webapps/docs/config/host.xml
+++ b/webapps/docs/config/host.xml
@@ -490,7 +490,7 @@
 involved must be registered in your DNS server to resolve to the
 same computer that is running this instance of Catalina.
 
-Aliases may also use the wildcard form (*.domainname), 
+Aliases may also use the wildcard form (*.domainname),
 unlike for the name attribute of a Host.
 
   


-
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 (ecde22c -> 1d827f9)

[markt]

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

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


from ecde22c  Show Travis test fialures
 new 82a1257  Avoid NPE observed in CI
 new 1d827f9  Remove trailing space

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


Summary of changes:
 java/org/apache/coyote/http2/Stream.java | 19 ---
 webapps/docs/config/host.xml |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)


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

[tomcat] 01/02: Avoid NPE observed in CI

[markt]

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

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

commit 82a1257a1addfe570813d687d153b309340b0549
Author: Mark Thomas 
AuthorDate: Thu Aug 27 13:52:44 2020 +0100

Avoid NPE observed in CI
---
 java/org/apache/coyote/http2/Stream.java | 19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/coyote/http2/Stream.java 
b/java/org/apache/coyote/http2/Stream.java
index 30fa819..b01ca01 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -300,14 +300,19 @@ class Stream extends AbstractStream implements 
HeaderEmitter {
 
 
 void doStreamCancel(String msg, Http2Error error) throws CloseNowException 
{
+// Avoid NPEs on duplicate cancellations
+StreamOutputBuffer streamOutputBuffer = this.streamOutputBuffer;
+Response coyoteResponse = this.coyoteResponse;
 StreamException se = new StreamException(msg, error, getIdAsInt());
-// Prevent the application making further writes
-streamOutputBuffer.closed = true;
-// Prevent Tomcat's error handling trying to write
-coyoteResponse.setError();
-coyoteResponse.setErrorReported();
-// Trigger a reset once control returns to Tomcat
-streamOutputBuffer.reset = se;
+if (streamOutputBuffer != null && coyoteResponse != null) {
+// Prevent the application making further writes
+streamOutputBuffer.closed = true;
+// Prevent Tomcat's error handling trying to write
+coyoteResponse.setError();
+coyoteResponse.setErrorReported();
+// Trigger a reset once control returns to Tomcat
+streamOutputBuffer.reset = se;
+}
 throw new CloseNowException(msg, se);
 }
 


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

[tomcat] 02/02: Remove trailing space

[markt]

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

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

commit 1d827f92c473fe84970127ad6eb95dc4de47ea8a
Author: Mark Thomas 
AuthorDate: Thu Aug 27 13:54:10 2020 +0100

Remove trailing space
---
 webapps/docs/config/host.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml
index 0c0e0f7..2d5e0de 100644
--- a/webapps/docs/config/host.xml
+++ b/webapps/docs/config/host.xml
@@ -490,7 +490,7 @@
 involved must be registered in your DNS server to resolve to the
 same computer that is running this instance of Catalina.
 
-Aliases may also use the wildcard form (*.domainname), 
+Aliases may also use the wildcard form (*.domainname),
 unlike for the name attribute of a Host.
 
   


-
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 (5757585 -> 208b749)

[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 5757585  Show Travis test fialures
 new 7f6f2ed  Avoid NPE observed in CI
 new 208b749  Remove trailing space

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


Summary of changes:
 java/org/apache/coyote/http2/Stream.java | 19 ---
 webapps/docs/config/host.xml |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)


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

[tomcat] 02/02: Remove trailing space

[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 208b749e4738ac669d57a6f6245b955b0d17e6b3
Author: Mark Thomas 
AuthorDate: Thu Aug 27 13:54:10 2020 +0100

Remove trailing space
---
 webapps/docs/config/host.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml
index 3d97fd9..aacb37d 100644
--- a/webapps/docs/config/host.xml
+++ b/webapps/docs/config/host.xml
@@ -489,7 +489,7 @@
 involved must be registered in your DNS server to resolve to the
 same computer that is running this instance of Catalina.
 
-Aliases may also use the wildcard form (*.domainname), 
+Aliases may also use the wildcard form (*.domainname),
 unlike for the name attribute of a Host.
 
   


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

[tomcat] 01/02: Avoid NPE observed in CI

[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 7f6f2ed88f31d18f6c3308026d006fcb23f4227b
Author: Mark Thomas 
AuthorDate: Thu Aug 27 13:52:44 2020 +0100

Avoid NPE observed in CI
---
 java/org/apache/coyote/http2/Stream.java | 19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/coyote/http2/Stream.java 
b/java/org/apache/coyote/http2/Stream.java
index 1b750ef..148eae8 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -297,14 +297,19 @@ public class Stream extends AbstractStream implements 
HeaderEmitter {
 
 
 void doStreamCancel(String msg, Http2Error error) throws CloseNowException 
{
+// Avoid NPEs on duplicate cancellations
+StreamOutputBuffer streamOutputBuffer = this.streamOutputBuffer;
+Response coyoteResponse = this.coyoteResponse;
 StreamException se = new StreamException(msg, error, getIdAsInt());
-// Prevent the application making further writes
-streamOutputBuffer.closed = true;
-// Prevent Tomcat's error handling trying to write
-coyoteResponse.setError();
-coyoteResponse.setErrorReported();
-// Trigger a reset once control returns to Tomcat
-streamOutputBuffer.reset = se;
+if (streamOutputBuffer != null && coyoteResponse != null) {
+// Prevent the application making further writes
+streamOutputBuffer.closed = true;
+// Prevent Tomcat's error handling trying to write
+coyoteResponse.setError();
+coyoteResponse.setErrorReported();
+// Trigger a reset once control returns to Tomcat
+streamOutputBuffer.reset = se;
+}
 throw new CloseNowException(msg, se);
 }
 


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

[tomcat] branch master updated: Improve debug logging for intermittently failing test

[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 ea14796  Improve debug logging for intermittently failing test
ea14796 is described below

commit ea14796ca70895d04330b381aeb55f546f574250
Author: Mark Thomas 
AuthorDate: Thu Aug 27 14:09:16 2020 +0100

Improve debug logging for intermittently failing test
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index 4aa40fc..5101ff4 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -416,7 +416,8 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
-// 1 * error (could be in any order)
+// 1 * error
+// Could be in any order
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }
@@ -424,7 +425,6 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 
 Assert.assertTrue(output.getTrace(),
 output.getTrace().contains("5-RST-[" + 
Http2Error.REFUSED_STREAM.getCode() + "]"));
-output.clearTrace();
 
 // Connection window is 8k.
 // Stream window is zero.


-
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: Improve debug logging for intermittently failing test

[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 7ace061  Improve debug logging for intermittently failing test
7ace061 is described below

commit 7ace06156197ad3aa69d103f668e0e4857c6beb8
Author: Mark Thomas 
AuthorDate: Thu Aug 27 14:09:16 2020 +0100

Improve debug logging for intermittently failing test
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index 6ec315a..740532f 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -427,7 +427,8 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
-// 1 * error (could be in any order)
+// 1 * error
+// Could be in any order
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }
@@ -435,7 +436,6 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 
 Assert.assertTrue(output.getTrace(),
 output.getTrace().contains("5-RST-[" + 
Http2Error.REFUSED_STREAM.getCode() + "]"));
-output.clearTrace();
 
 // Connection window is 8k.
 // Stream window is zero.


-
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: Improve debug logging for intermittently failing test

[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 72af262  Improve debug logging for intermittently failing test
72af262 is described below

commit 72af2625aa8f892577860f501c7e9477e6a034b6
Author: Mark Thomas 
AuthorDate: Thu Aug 27 14:09:16 2020 +0100

Improve debug logging for intermittently failing test
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index a9c3635..dde841a 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -432,7 +432,8 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
-// 1 * error (could be in any order)
+// 1 * error
+// Could be in any order
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }
@@ -440,7 +441,6 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 
 Assert.assertTrue(output.getTrace(),
 output.getTrace().contains("5-RST-[" + 
Http2Error.REFUSED_STREAM.getCode() + "]"));
-output.clearTrace();
 
 // Connection window is 8k.
 // Stream window is zero.


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

Re: Next release

[Rémy Maucherat]

On Thu, Aug 27, 2020 at 4:26 AM Filip Hanik  wrote:

>
>
> On Wed, Aug 26, 2020 at 12:12 Rémy Maucherat  wrote:
>
>> On Wed, Aug 26, 2020 at 6:25 PM Filip Hanik  wrote:
>>
>>>
>>>
>>> On Wed, Aug 26, 2020 at 09:15 Mark Thomas  wrote:
>>>
 On 26/08/2020 17:12, Filip Hanik wrote:

 > Our cadence seems fairly predictable.

 >

 > Any thoughts on the timeline of the  on the next batch of releases?



 I skipped the August releases as I was away. I'm planning on the

 September releases as usual. I'd like to get Tomcat Native and Commons

 Daemon updates into those releases if possible.
>>>
>>>
>>> Thanks, that sounds like a good plan. I’m reviewing the PRs too.
>>>
>>
>> Can res/graal/java be moved to the main sources ?
>>
>
> It can, I didn’t want to pollute it while I marked it as experimental to
> get it field tested. but main/sources makes my life easier.
>

Unless there's a real possibility it is removed, it would be good to move
it to a real location.

Rémy


>
> Filip
>
>>
>> Rémy
>>
>>
>>>



 Mark



 -

 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: Align with 9.0.x/10.0.x and fix compilation error

[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 3e25e5b  Align with 9.0.x/10.0.x and fix compilation error
3e25e5b is described below

commit 3e25e5bf1d4a0879f9a378256e5cf98c12c58a21
Author: Mark Thomas 
AuthorDate: Thu Aug 27 14:18:06 2020 +0100

Align with 9.0.x/10.0.x and fix compilation error
---
 java/org/apache/tomcat/util/threads/TaskQueue.java   | 9 +++--
 java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java  | 2 +-
 java/org/apache/tomcat/util/threads/res/LocalStrings.properties  | 3 +++
 .../apache/tomcat/util/threads/res/LocalStrings_fr.properties| 3 +++
 .../apache/tomcat/util/threads/res/LocalStrings_ja.properties| 3 +++
 .../apache/tomcat/util/threads/res/LocalStrings_ko.properties| 3 +++
 .../apache/tomcat/util/threads/res/LocalStrings_zh_CN.properties | 3 +++
 7 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/threads/TaskQueue.java 
b/java/org/apache/tomcat/util/threads/TaskQueue.java
index cdd0bc2..35f1d89 100644
--- a/java/org/apache/tomcat/util/threads/TaskQueue.java
+++ b/java/org/apache/tomcat/util/threads/TaskQueue.java
@@ -21,6 +21,8 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.tomcat.util.res.StringManager;
+
 /**
  * As task queue specifically designed to run with a thread pool executor. The
  * task queue is optimised to properly utilize threads within a thread pool
@@ -31,6 +33,9 @@ import java.util.concurrent.TimeUnit;
 public class TaskQueue extends LinkedBlockingQueue {
 
 private static final long serialVersionUID = 1L;
+protected static final StringManager sm = StringManager
+.getManager("org.apache.tomcat.util.threads.res");
+private static final int DEFAULT_FORCED_REMAINING_CAPACITY = -1;
 
 private transient volatile ThreadPoolExecutor parent = null;
 
@@ -55,12 +60,12 @@ public class TaskQueue extends 
LinkedBlockingQueue {
 }
 
 public boolean force(Runnable o) {
-if (parent == null || parent.isShutdown()) throw new 
RejectedExecutionException("Executor not running, can't force a command into 
the queue");
+if (parent == null || parent.isShutdown()) throw new 
RejectedExecutionException(sm.getString("taskQueue.notRunning"));
 return super.offer(o); //forces the item onto the queue, to be used if 
the task is rejected
 }
 
 public boolean force(Runnable o, long timeout, TimeUnit unit) throws 
InterruptedException {
-if (parent == null || parent.isShutdown()) throw new 
RejectedExecutionException("Executor not running, can't force a command into 
the queue");
+if (parent == null || parent.isShutdown()) throw new 
RejectedExecutionException(sm.getString("taskQueue.notRunning"));
 return super.offer(o,timeout,unit); //forces the item onto the queue, 
to be used if the task is rejected
 }
 
diff --git a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java 
b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
index 42db3df..7298efa 100644
--- a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
+++ b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
@@ -171,7 +171,7 @@ public class ThreadPoolExecutor extends 
java.util.concurrent.ThreadPoolExecutor
 try {
 if (!queue.force(command, timeout, unit)) {
 submittedCount.decrementAndGet();
-throw new RejectedExecutionException("Queue capacity 
is full.");
+throw new 
RejectedExecutionException(sm.getString("threadPoolExecutor.queueFull"));
 }
 } catch (InterruptedException x) {
 submittedCount.decrementAndGet();
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings.properties 
b/java/org/apache/tomcat/util/threads/res/LocalStrings.properties
index 938626f..3124491 100644
--- a/java/org/apache/tomcat/util/threads/res/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/threads/res/LocalStrings.properties
@@ -13,4 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+taskQueue.notRunning=Executor not running, can't force a command into the queue
+
+threadPoolExecutor.queueFull=Queue capacity is full
 threadPoolExecutor.threadStoppedToAvoidPotentialLeak=Stopping thread [{0}] to 
avoid potential memory leaks after a context was stopped.
diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties
index f80be7b..8d0d122 100644
--- a/java/org/apache/tomcat/util/threads/res/LocalStr

[GitHub] [tomcat] markt-asf merged pull request #342: Display the CATALINA_OPTS when starting Tomcat

[GitBox]

markt-asf merged pull request #342:
URL: https://github.com/apache/tomcat/pull/342


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[tomcat] branch master updated: Display the CATALINA_OPTS when starting Tomcat

[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 615ac86  Display the CATALINA_OPTS when starting Tomcat
615ac86 is described below

commit 615ac86f061749fe6b9e10e40bfceda1ed554fba
Author: Ruediger Pluem 
AuthorDate: Fri Aug 21 11:27:01 2020 +0200

Display the CATALINA_OPTS when starting Tomcat
---
 bin/catalina.bat | 1 +
 bin/catalina.sh  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/bin/catalina.bat b/bin/catalina.bat
index ada989b..c5d09e3 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -254,6 +254,7 @@ goto java_dir_displayed
 echo Using JAVA_HOME:   "%JAVA_HOME%"
 :java_dir_displayed
 echo Using CLASSPATH:   "%CLASSPATH%"
+echo Using CATALINA_OPTS:   "%CATALINA_OPTS%"
 
 set _EXECJAVA=%_RUNJAVA%
 set MAINCLASS=org.apache.catalina.startup.Bootstrap
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 7823d5e..39ce2e1 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -329,6 +329,7 @@ if [ $have_tty -eq 1 ]; then
 echo "Using JRE_HOME:$JRE_HOME"
   fi
   echo "Using CLASSPATH:   $CLASSPATH"
+  echo "Using CATALINA_OPTS:   $CATALINA_OPTS"
   if [ ! -z "$CATALINA_PID" ]; then
 echo "Using CATALINA_PID:$CATALINA_PID"
   fi


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

[tomcat] branch 7.0.x updated: Display the CATALINA_OPTS when starting Tomcat

[markt]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 7977ec3  Display the CATALINA_OPTS when starting Tomcat
7977ec3 is described below

commit 7977ec37eb2ba8aaf24fd1233e4d7540319b4475
Author: Ruediger Pluem 
AuthorDate: Fri Aug 21 11:27:01 2020 +0200

Display the CATALINA_OPTS when starting Tomcat
---
 bin/catalina.bat | 1 +
 bin/catalina.sh  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/bin/catalina.bat b/bin/catalina.bat
index 6443620..a215268 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -262,6 +262,7 @@ goto java_dir_displayed
 echo Using JAVA_HOME:   "%JAVA_HOME%"
 :java_dir_displayed
 echo Using CLASSPATH:   "%CLASSPATH%"
+echo Using CATALINA_OPTS:   "%CATALINA_OPTS%"
 
 set _EXECJAVA=%_RUNJAVA%
 set MAINCLASS=org.apache.catalina.startup.Bootstrap
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 642d22d..869940d 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -338,6 +338,7 @@ if [ $have_tty -eq 1 ]; then
 echo "Using JRE_HOME:$JRE_HOME"
   fi
   echo "Using CLASSPATH:   $CLASSPATH"
+  echo "Using CATALINA_OPTS:   $CATALINA_OPTS"
   if [ ! -z "$CATALINA_PID" ]; then
 echo "Using CATALINA_PID:$CATALINA_PID"
   fi


-
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: Display the CATALINA_OPTS when starting Tomcat

[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 f77d263  Display the CATALINA_OPTS when starting Tomcat
f77d263 is described below

commit f77d26332afda1c35c05fd85c0ffc32419f51298
Author: Ruediger Pluem 
AuthorDate: Fri Aug 21 11:27:01 2020 +0200

Display the CATALINA_OPTS when starting Tomcat
---
 bin/catalina.bat | 1 +
 bin/catalina.sh  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/bin/catalina.bat b/bin/catalina.bat
index bf0f7e0..20cf71d 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -266,6 +266,7 @@ goto java_dir_displayed
 echo Using JAVA_HOME:   "%JAVA_HOME%"
 :java_dir_displayed
 echo Using CLASSPATH:   "%CLASSPATH%"
+echo Using CATALINA_OPTS:   "%CATALINA_OPTS%"
 
 set _EXECJAVA=%_RUNJAVA%
 set MAINCLASS=org.apache.catalina.startup.Bootstrap
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 8d98775..7e1470d 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -342,6 +342,7 @@ if [ $have_tty -eq 1 ]; then
 echo "Using JRE_HOME:$JRE_HOME"
   fi
   echo "Using CLASSPATH:   $CLASSPATH"
+  echo "Using CATALINA_OPTS:   $CATALINA_OPTS"
   if [ ! -z "$CATALINA_PID" ]; then
 echo "Using CATALINA_PID:$CATALINA_PID"
   fi


-
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: Display the CATALINA_OPTS when starting Tomcat

[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 378e21e  Display the CATALINA_OPTS when starting Tomcat
378e21e is described below

commit 378e21e9b02313516476ebd851c8de56a1dba8ed
Author: Ruediger Pluem 
AuthorDate: Fri Aug 21 11:27:01 2020 +0200

Display the CATALINA_OPTS when starting Tomcat
---
 bin/catalina.bat | 1 +
 bin/catalina.sh  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/bin/catalina.bat b/bin/catalina.bat
index bf0f7e0..20cf71d 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -266,6 +266,7 @@ goto java_dir_displayed
 echo Using JAVA_HOME:   "%JAVA_HOME%"
 :java_dir_displayed
 echo Using CLASSPATH:   "%CLASSPATH%"
+echo Using CATALINA_OPTS:   "%CATALINA_OPTS%"
 
 set _EXECJAVA=%_RUNJAVA%
 set MAINCLASS=org.apache.catalina.startup.Bootstrap
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 8d98775..7e1470d 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -342,6 +342,7 @@ if [ $have_tty -eq 1 ]; then
 echo "Using JRE_HOME:$JRE_HOME"
   fi
   echo "Using CLASSPATH:   $CLASSPATH"
+  echo "Using CATALINA_OPTS:   $CATALINA_OPTS"
   if [ ! -z "$CATALINA_PID" ]; then
 echo "Using CATALINA_PID:$CATALINA_PID"
   fi


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

[tomcat] branch master updated: Fix intermittent CI failure

[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 c6bab9b  Fix intermittent CI failure
c6bab9b is described below

commit c6bab9b72ffb9f52af796f39bc7f742db0f418ab
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:10:46 2020 +0100

Fix intermittent CI failure
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index 5101ff4..e8ca217 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -402,22 +402,28 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 , output.getTrace());
 output.clearTrace();
 
-sendLargeGetRequest(3);
-
-sendSimpleGetRequest(5);
-
 // Default connection window size is 64k-1.
 // Initial request will have used 8k leaving 56k-1.
 // Stream window will be 64k-1.
 
 // Increase Connection window by 16k
+// Do this before sending the requests to ensure the connection window
+// is increased before request processing starts else stream 5 may
+// consume the connection window before the update is processed which
+// will result in at least one addition body frame and break the tests
+// below.
 sendWindowUpdate(0, 16 * 1024);
 
+sendLargeGetRequest(3);
+
+sendSimpleGetRequest(5);
+
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
 // 1 * error
 // Could be in any order
+//
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }


-
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: Fix intermittent CI failure

[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 ed637d7  Fix intermittent CI failure
ed637d7 is described below

commit ed637d7029c9ecbc911c83ae653ff07348342ac8
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:10:46 2020 +0100

Fix intermittent CI failure
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index dde841a..f9b73b4 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -418,22 +418,28 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 , output.getTrace());
 output.clearTrace();
 
-sendLargeGetRequest(3);
-
-sendSimpleGetRequest(5);
-
 // Default connection window size is 64k-1.
 // Initial request will have used 8k leaving 56k-1.
 // Stream window will be 64k-1.
 
 // Increase Connection window by 16k
+// Do this before sending the requests to ensure the connection window
+// is increased before request processing starts else stream 5 may
+// consume the connection window before the update is processed which
+// will result in at least one addition body frame and break the tests
+// below.
 sendWindowUpdate(0, 16 * 1024);
 
+sendLargeGetRequest(3);
+
+sendSimpleGetRequest(5);
+
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
 // 1 * error
 // Could be in any order
+//
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }


-
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 intermittent CI failure

[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 424a836  Fix intermittent CI failure
424a836 is described below

commit 424a836a2b5a12017e259e551083a2408a885dbc
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:10:46 2020 +0100

Fix intermittent CI failure
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index 740532f..833984c 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -413,22 +413,28 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 , output.getTrace());
 output.clearTrace();
 
-sendLargeGetRequest(3);
-
-sendSimpleGetRequest(5);
-
 // Default connection window size is 64k-1.
 // Initial request will have used 8k leaving 56k-1.
 // Stream window will be 64k-1.
 
 // Increase Connection window by 16k
+// Do this before sending the requests to ensure the connection window
+// is increased before request processing starts else stream 5 may
+// consume the connection window before the update is processed which
+// will result in at least one addition body frame and break the tests
+// below.
 sendWindowUpdate(0, 16 * 1024);
 
+sendLargeGetRequest(3);
+
+sendSimpleGetRequest(5);
+
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
 // 1 * error
 // Could be in any order
+//
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }


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

[tomcat] branch master updated: Fix intermittent CI failure

[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 c6bab9b  Fix intermittent CI failure
c6bab9b is described below

commit c6bab9b72ffb9f52af796f39bc7f742db0f418ab
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:10:46 2020 +0100

Fix intermittent CI failure
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index 5101ff4..e8ca217 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -402,22 +402,28 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 , output.getTrace());
 output.clearTrace();
 
-sendLargeGetRequest(3);
-
-sendSimpleGetRequest(5);
-
 // Default connection window size is 64k-1.
 // Initial request will have used 8k leaving 56k-1.
 // Stream window will be 64k-1.
 
 // Increase Connection window by 16k
+// Do this before sending the requests to ensure the connection window
+// is increased before request processing starts else stream 5 may
+// consume the connection window before the update is processed which
+// will result in at least one addition body frame and break the tests
+// below.
 sendWindowUpdate(0, 16 * 1024);
 
+sendLargeGetRequest(3);
+
+sendSimpleGetRequest(5);
+
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
 // 1 * error
 // Could be in any order
+//
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }


-
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: Fix intermittent CI failure

[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 ed637d7  Fix intermittent CI failure
ed637d7 is described below

commit ed637d7029c9ecbc911c83ae653ff07348342ac8
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:10:46 2020 +0100

Fix intermittent CI failure
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index dde841a..f9b73b4 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -418,22 +418,28 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 , output.getTrace());
 output.clearTrace();
 
-sendLargeGetRequest(3);
-
-sendSimpleGetRequest(5);
-
 // Default connection window size is 64k-1.
 // Initial request will have used 8k leaving 56k-1.
 // Stream window will be 64k-1.
 
 // Increase Connection window by 16k
+// Do this before sending the requests to ensure the connection window
+// is increased before request processing starts else stream 5 may
+// consume the connection window before the update is processed which
+// will result in at least one addition body frame and break the tests
+// below.
 sendWindowUpdate(0, 16 * 1024);
 
+sendLargeGetRequest(3);
+
+sendSimpleGetRequest(5);
+
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
 // 1 * error
 // Could be in any order
+//
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }


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

[tomcat] branch master updated: Fix intermittent CI failure

[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 c6bab9b  Fix intermittent CI failure
c6bab9b is described below

commit c6bab9b72ffb9f52af796f39bc7f742db0f418ab
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:10:46 2020 +0100

Fix intermittent CI failure
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index 5101ff4..e8ca217 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -402,22 +402,28 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 , output.getTrace());
 output.clearTrace();
 
-sendLargeGetRequest(3);
-
-sendSimpleGetRequest(5);
-
 // Default connection window size is 64k-1.
 // Initial request will have used 8k leaving 56k-1.
 // Stream window will be 64k-1.
 
 // Increase Connection window by 16k
+// Do this before sending the requests to ensure the connection window
+// is increased before request processing starts else stream 5 may
+// consume the connection window before the update is processed which
+// will result in at least one addition body frame and break the tests
+// below.
 sendWindowUpdate(0, 16 * 1024);
 
+sendLargeGetRequest(3);
+
+sendSimpleGetRequest(5);
+
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
 // 1 * error
 // Could be in any order
+//
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }


-
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 intermittent CI failure

[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 424a836  Fix intermittent CI failure
424a836 is described below

commit 424a836a2b5a12017e259e551083a2408a885dbc
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:10:46 2020 +0100

Fix intermittent CI failure
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index 740532f..833984c 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -413,22 +413,28 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 , output.getTrace());
 output.clearTrace();
 
-sendLargeGetRequest(3);
-
-sendSimpleGetRequest(5);
-
 // Default connection window size is 64k-1.
 // Initial request will have used 8k leaving 56k-1.
 // Stream window will be 64k-1.
 
 // Increase Connection window by 16k
+// Do this before sending the requests to ensure the connection window
+// is increased before request processing starts else stream 5 may
+// consume the connection window before the update is processed which
+// will result in at least one addition body frame and break the tests
+// below.
 sendWindowUpdate(0, 16 * 1024);
 
+sendLargeGetRequest(3);
+
+sendSimpleGetRequest(5);
+
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
 // 1 * error
 // Could be in any order
+//
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }


-
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 intermittent CI failure

[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 424a836  Fix intermittent CI failure
424a836 is described below

commit 424a836a2b5a12017e259e551083a2408a885dbc
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:10:46 2020 +0100

Fix intermittent CI failure
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index 740532f..833984c 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -413,22 +413,28 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 , output.getTrace());
 output.clearTrace();
 
-sendLargeGetRequest(3);
-
-sendSimpleGetRequest(5);
-
 // Default connection window size is 64k-1.
 // Initial request will have used 8k leaving 56k-1.
 // Stream window will be 64k-1.
 
 // Increase Connection window by 16k
+// Do this before sending the requests to ensure the connection window
+// is increased before request processing starts else stream 5 may
+// consume the connection window before the update is processed which
+// will result in at least one addition body frame and break the tests
+// below.
 sendWindowUpdate(0, 16 * 1024);
 
+sendLargeGetRequest(3);
+
+sendSimpleGetRequest(5);
+
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
 // 1 * error
 // Could be in any order
+//
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }


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

[tomcat] branch master updated: Fix intermittent CI failure

[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 c6bab9b  Fix intermittent CI failure
c6bab9b is described below

commit c6bab9b72ffb9f52af796f39bc7f742db0f418ab
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:10:46 2020 +0100

Fix intermittent CI failure
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index 5101ff4..e8ca217 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -402,22 +402,28 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 , output.getTrace());
 output.clearTrace();
 
-sendLargeGetRequest(3);
-
-sendSimpleGetRequest(5);
-
 // Default connection window size is 64k-1.
 // Initial request will have used 8k leaving 56k-1.
 // Stream window will be 64k-1.
 
 // Increase Connection window by 16k
+// Do this before sending the requests to ensure the connection window
+// is increased before request processing starts else stream 5 may
+// consume the connection window before the update is processed which
+// will result in at least one addition body frame and break the tests
+// below.
 sendWindowUpdate(0, 16 * 1024);
 
+sendLargeGetRequest(3);
+
+sendSimpleGetRequest(5);
+
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
 // 1 * error
 // Could be in any order
+//
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }


-
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: Fix intermittent CI failure

[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 ed637d7  Fix intermittent CI failure
ed637d7 is described below

commit ed637d7029c9ecbc911c83ae653ff07348342ac8
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:10:46 2020 +0100

Fix intermittent CI failure
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index dde841a..f9b73b4 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -418,22 +418,28 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 , output.getTrace());
 output.clearTrace();
 
-sendLargeGetRequest(3);
-
-sendSimpleGetRequest(5);
-
 // Default connection window size is 64k-1.
 // Initial request will have used 8k leaving 56k-1.
 // Stream window will be 64k-1.
 
 // Increase Connection window by 16k
+// Do this before sending the requests to ensure the connection window
+// is increased before request processing starts else stream 5 may
+// consume the connection window before the update is processed which
+// will result in at least one addition body frame and break the tests
+// below.
 sendWindowUpdate(0, 16 * 1024);
 
+sendLargeGetRequest(3);
+
+sendSimpleGetRequest(5);
+
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
 // 1 * error
 // Could be in any order
+//
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }


-
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 intermittent CI failure

[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 424a836  Fix intermittent CI failure
424a836 is described below

commit 424a836a2b5a12017e259e551083a2408a885dbc
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:10:46 2020 +0100

Fix intermittent CI failure
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index 740532f..833984c 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -413,22 +413,28 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 , output.getTrace());
 output.clearTrace();
 
-sendLargeGetRequest(3);
-
-sendSimpleGetRequest(5);
-
 // Default connection window size is 64k-1.
 // Initial request will have used 8k leaving 56k-1.
 // Stream window will be 64k-1.
 
 // Increase Connection window by 16k
+// Do this before sending the requests to ensure the connection window
+// is increased before request processing starts else stream 5 may
+// consume the connection window before the update is processed which
+// will result in at least one addition body frame and break the tests
+// below.
 sendWindowUpdate(0, 16 * 1024);
 
+sendLargeGetRequest(3);
+
+sendSimpleGetRequest(5);
+
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
 // 1 * error
 // Could be in any order
+//
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }


-
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: Fix intermittent CI failure

[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 ed637d7  Fix intermittent CI failure
ed637d7 is described below

commit ed637d7029c9ecbc911c83ae653ff07348342ac8
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:10:46 2020 +0100

Fix intermittent CI failure
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index dde841a..f9b73b4 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -418,22 +418,28 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 , output.getTrace());
 output.clearTrace();
 
-sendLargeGetRequest(3);
-
-sendSimpleGetRequest(5);
-
 // Default connection window size is 64k-1.
 // Initial request will have used 8k leaving 56k-1.
 // Stream window will be 64k-1.
 
 // Increase Connection window by 16k
+// Do this before sending the requests to ensure the connection window
+// is increased before request processing starts else stream 5 may
+// consume the connection window before the update is processed which
+// will result in at least one addition body frame and break the tests
+// below.
 sendWindowUpdate(0, 16 * 1024);
 
+sendLargeGetRequest(3);
+
+sendSimpleGetRequest(5);
+
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
 // 1 * error
 // Could be in any order
+//
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }


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

[tomcat] branch master updated: Fix intermittent CI failure

[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 c6bab9b  Fix intermittent CI failure
c6bab9b is described below

commit c6bab9b72ffb9f52af796f39bc7f742db0f418ab
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:10:46 2020 +0100

Fix intermittent CI failure
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index 5101ff4..e8ca217 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -402,22 +402,28 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 , output.getTrace());
 output.clearTrace();
 
-sendLargeGetRequest(3);
-
-sendSimpleGetRequest(5);
-
 // Default connection window size is 64k-1.
 // Initial request will have used 8k leaving 56k-1.
 // Stream window will be 64k-1.
 
 // Increase Connection window by 16k
+// Do this before sending the requests to ensure the connection window
+// is increased before request processing starts else stream 5 may
+// consume the connection window before the update is processed which
+// will result in at least one addition body frame and break the tests
+// below.
 sendWindowUpdate(0, 16 * 1024);
 
+sendLargeGetRequest(3);
+
+sendSimpleGetRequest(5);
+
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
 // 1 * error
 // Could be in any order
+//
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }


-
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 intermittent CI failure

[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 424a836  Fix intermittent CI failure
424a836 is described below

commit 424a836a2b5a12017e259e551083a2408a885dbc
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:10:46 2020 +0100

Fix intermittent CI failure
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index 740532f..833984c 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -413,22 +413,28 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 , output.getTrace());
 output.clearTrace();
 
-sendLargeGetRequest(3);
-
-sendSimpleGetRequest(5);
-
 // Default connection window size is 64k-1.
 // Initial request will have used 8k leaving 56k-1.
 // Stream window will be 64k-1.
 
 // Increase Connection window by 16k
+// Do this before sending the requests to ensure the connection window
+// is increased before request processing starts else stream 5 may
+// consume the connection window before the update is processed which
+// will result in at least one addition body frame and break the tests
+// below.
 sendWindowUpdate(0, 16 * 1024);
 
+sendLargeGetRequest(3);
+
+sendSimpleGetRequest(5);
+
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
 // 1 * error
 // Could be in any order
+//
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }


-
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: Fix intermittent CI failure

[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 ed637d7  Fix intermittent CI failure
ed637d7 is described below

commit ed637d7029c9ecbc911c83ae653ff07348342ac8
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:10:46 2020 +0100

Fix intermittent CI failure
---
 test/org/apache/coyote/http2/TestHttp2Section_5_1.java | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
index dde841a..f9b73b4 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -418,22 +418,28 @@ public class TestHttp2Section_5_1 extends Http2TestBase {
 , output.getTrace());
 output.clearTrace();
 
-sendLargeGetRequest(3);
-
-sendSimpleGetRequest(5);
-
 // Default connection window size is 64k-1.
 // Initial request will have used 8k leaving 56k-1.
 // Stream window will be 64k-1.
 
 // Increase Connection window by 16k
+// Do this before sending the requests to ensure the connection window
+// is increased before request processing starts else stream 5 may
+// consume the connection window before the update is processed which
+// will result in at least one addition body frame and break the tests
+// below.
 sendWindowUpdate(0, 16 * 1024);
 
+sendLargeGetRequest(3);
+
+sendSimpleGetRequest(5);
+
 // Expecting
 // 1 * headers
 // 64k-1 of body (8 * ~8k)
 // 1 * error
 // Could be in any order
+//
 for (int i = 0; i < 9; i++) {
 parser.readFrame(true);
 }


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

[tomcat] branch master updated: Escape body text

[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 d2843a8  Escape body text
d2843a8 is described below

commit d2843a8fdb28e48b981434fbd24a78bd9cddf84a
Author: remm 
AuthorDate: Thu Aug 27 16:36:12 2020 +0200

Escape body text

Often seen in descriptions in the web.xml and tlds.
---
 java/org/apache/tomcat/util/digester/CallMethodRule.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/digester/CallMethodRule.java 
b/java/org/apache/tomcat/util/digester/CallMethodRule.java
index 0a521a9..e744a9d 100644
--- a/java/org/apache/tomcat/util/digester/CallMethodRule.java
+++ b/java/org/apache/tomcat/util/digester/CallMethodRule.java
@@ -393,7 +393,11 @@ public class CallMethodRule extends Rule {
 code.append(", ");
 }
 if (bodyText != null) {
-code.append("\"").append(bodyText).append("\"");
+StringBuilder bodyTextParam = new StringBuilder();
+for (String bodyPart : bodyText.split("\n")) {
+bodyTextParam.append(bodyPart.trim()).append(' ');
+}
+
code.append("\"").append(bodyTextParam.toString().trim().replace("\"", 
"\\\"")).append("\"");
 } else if (paramValues[i] instanceof String) {
 
code.append("\"").append(paramValues[i].toString()).append("\"");
 } else {


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

[tomcat] branch master updated: Further increase timeouts due to intermittent Travis CI failures

[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 b14d90f  Further increase timeouts due to intermittent Travis CI 
failures
b14d90f is described below

commit b14d90f0f51eb06239a93ac6d7a827b8d5f7d535
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:49:56 2020 +0100

Further increase timeouts due to intermittent Travis CI failures
---
 test/org/apache/coyote/http2/Http2TestBase.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/org/apache/coyote/http2/Http2TestBase.java 
b/test/org/apache/coyote/http2/Http2TestBase.java
index 3f65876..90785f3 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -564,11 +564,11 @@ public abstract class Http2TestBase extends 
TomcatBaseTest {
 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);
-http2Protocol.setKeepAliveTimeout(15000);
-http2Protocol.setStreamReadTimeout(3000);
-http2Protocol.setStreamWriteTimeout(3000);
+http2Protocol.setReadTimeout(1);
+http2Protocol.setWriteTimeout(1);
+http2Protocol.setKeepAliveTimeout(25000);
+http2Protocol.setStreamReadTimeout(5000);
+http2Protocol.setStreamWriteTimeout(5000);
 http2Protocol.setMaxConcurrentStreams(maxConcurrentStreams);
 http2Protocol.setHttp11Protocol(new Http11NioProtocol());
 connector.addUpgradeProtocol(http2Protocol);


-
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: Further increase timeouts due to intermittent Travis CI failures

[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 db1b2ed  Further increase timeouts due to intermittent Travis CI 
failures
db1b2ed is described below

commit db1b2edc5137fb108c641f802dac8b54ab246ee5
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:49:56 2020 +0100

Further increase timeouts due to intermittent Travis CI failures
---
 test/org/apache/coyote/http2/Http2TestBase.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/org/apache/coyote/http2/Http2TestBase.java 
b/test/org/apache/coyote/http2/Http2TestBase.java
index 8b8c0af..e982c8e 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -562,11 +562,11 @@ public abstract class Http2TestBase extends 
TomcatBaseTest {
 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);
-http2Protocol.setKeepAliveTimeout(15000);
-http2Protocol.setStreamReadTimeout(3000);
-http2Protocol.setStreamWriteTimeout(3000);
+http2Protocol.setReadTimeout(1);
+http2Protocol.setWriteTimeout(1);
+http2Protocol.setKeepAliveTimeout(25000);
+http2Protocol.setStreamReadTimeout(5000);
+http2Protocol.setStreamWriteTimeout(5000);
 http2Protocol.setMaxConcurrentStreams(maxConcurrentStreams);
 connector.addUpgradeProtocol(http2Protocol);
 if (tls) {


-
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: Further increase timeouts due to intermittent Travis CI failures

[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 2dd0b36  Further increase timeouts due to intermittent Travis CI 
failures
2dd0b36 is described below

commit 2dd0b360a6f7162552a4550bbdc0f2fd58abb7d7
Author: Mark Thomas 
AuthorDate: Thu Aug 27 15:49:56 2020 +0100

Further increase timeouts due to intermittent Travis CI failures
---
 test/org/apache/coyote/http2/Http2TestBase.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/org/apache/coyote/http2/Http2TestBase.java 
b/test/org/apache/coyote/http2/Http2TestBase.java
index 1a1ae9d..ff70953 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -555,11 +555,11 @@ public abstract class Http2TestBase extends 
TomcatBaseTest {
 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);
-http2Protocol.setKeepAliveTimeout(15000);
-http2Protocol.setStreamReadTimeout(3000);
-http2Protocol.setStreamWriteTimeout(3000);
+http2Protocol.setReadTimeout(1);
+http2Protocol.setWriteTimeout(1);
+http2Protocol.setKeepAliveTimeout(25000);
+http2Protocol.setStreamReadTimeout(5000);
+http2Protocol.setStreamWriteTimeout(5000);
 http2Protocol.setMaxConcurrentStreams(maxConcurrentStreams);
 connector.addUpgradeProtocol(http2Protocol);
 if (tls) {


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

[Bug 63505] enhancement - support of stored procedures for DataSourceRealm authentication

[bugzilla]

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

--- Comment #8 from Eugène Adell  ---
Created attachment 37407
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=37407&action=edit
refactoring as suggested in comment 6

This zip contains 4 Java files corresponding to the suggestion made by
Christopher in Comment 6

Source code from 9.0.37

Some hard-coded logging was changed with this.getClass().getSimpleName() as
it's in fact the child classes which are logging and not the intermediary class
which is introduced here.

I tested both realms with good results.

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

buildbot failure in on tomcat-7-trunk

[buildbot]

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

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch 7.0.x] 7977ec37eb2ba8aaf24fd1233e4d7540319b4475
Blamelist: Martin Tzvetanov Grigorov ,Ruediger Pluem 


BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




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

Re: [tomcat] branch master updated: Change forcedRemainingCapacity from Integer to int

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Martin,

On 8/27/20 07:55, mgrigo...@apache.org wrote:
> This is an automated email from the ASF dual-hosted git
> repository.
>
> mgrigorov 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 2cef8f1  Change forcedRemainingCapacity from Integer to
> int 2cef8f1 is described below
>
> commit 2cef8f18dee7b7bca3d03b3301fbe8e733e728fa Author: Martin
> Tzvetanov Grigorov  AuthorDate: Tue Aug 25
> 14:36:23 2020 +0300
>
> Change forcedRemainingCapacity from Integer to int
>
> No need to create object (or use Integer cache) and cast it to
> primitive int. 'forcedRemainingCapacity' can do its job with a
> primitive int, since Queue's capacity cannot be negative value ---
> java/org/apache/tomcat/util/threads/TaskQueue.java| 15
> ++-
> .../apache/tomcat/util/threads/ThreadPoolExecutor.java|  4
> ++-- 2 files changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/java/org/apache/tomcat/util/threads/TaskQueue.java
> b/java/org/apache/tomcat/util/threads/TaskQueue.java index
> 87c93a9..35f1d89 100644 ---
> a/java/org/apache/tomcat/util/threads/TaskQueue.java +++
> b/java/org/apache/tomcat/util/threads/TaskQueue.java @@ -35,12
> +35,13 @@ public class TaskQueue extends
> LinkedBlockingQueue { private static final long
> serialVersionUID = 1L; protected static final StringManager sm =
> StringManager .getManager("org.apache.tomcat.util.threads.res"); +
> private static final int DEFAULT_FORCED_REMAINING_CAPACITY = -1;
>
> private transient volatile ThreadPoolExecutor parent = null;
>
> // No need to be volatile. This is written and read in a single
> thread -// (when stopping a context and firing the  listeners)
> -private Integer forcedRemainingCapacity = null; +// (when
> stopping a context and firing the listeners) +private int
> forcedRemainingCapacity = -1;
>
> public TaskQueue() { super(); @@ -109,18 +110,22 @@ public class
> TaskQueue extends LinkedBlockingQueue {
>
> @Override public int remainingCapacity() { -if
> (forcedRemainingCapacity != null) { +if
> (forcedRemainingCapacity > DEFAULT_FORCED_REMAINING_CAPACITY) { //
> ThreadPoolExecutor.setCorePoolSize checks that //
> remainingCapacity==0 to allow to interrupt idle threads // I don't
> see why, but this hack allows to conform to this // "requirement" -
> return forcedRemainingCapacity.intValue(); +return
> forcedRemainingCapacity; } return super.remainingCapacity(); }
>
> -public void setForcedRemainingCapacity(Integer
> forcedRemainingCapacity) { +public void
> setForcedRemainingCapacity(int forcedRemainingCapacity) {
> this.forcedRemainingCapacity = forcedRemainingCapacity; }

Technically, this could cause a problem for anyone who has binaries
built against the current code. My guess is that it's very unlikely
for anyone to be using this code directly so it's not really a big deal.

But in general, it would be better to add a new set(Integer) method
which calls the old one and deprecate the old one to be as consistent
as possible for a point-release.

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

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl9H8m4ACgkQHPApP6U8
pFhVwQ/+MyrOmzl8+ragnuyamOlDkGSzhULnJpAnF43OScVBkCfjIbfO3S6ZxZSA
N/uzXg4c2/zXO/qN1BMCRRHi8/bbb02y54h4jT8h/2OyIdbmlFJhOWAGPpkA7A8D
GwgSpG5YbEtnpEg0nodtrbWzF1VqKw1x1Wa65tx2wFeSJCVVTlECGlQc1w3sewuV
o3rpLuupamg/3gOzHlPHaBNYOFY8IEeXtTGmdpTeKmpsh2tbkNvsctcH5IiPvaox
8M1mz3IJpK0xb/epBADf7N+hNe+4dT7r+jsDcMyuvRD5CIsLvuKDa2Az8MgamNLQ
Jd4J1LpxY8PmWsF3EV51DIJmyijxeHEvPu9YXZQ+eR7k4vxFn7CLdfDe3p0SdhKO
z2m3Sr3BW23tKJBBRQmHLgT7N3ZlnVdoMmQ9jy+vzbb+QWYEQGO3Oc8P1tZbKEjK
CBKOYmfkBlfB6vcsX/n8pC4gFU6R/V2qKhYG6KiHGjviEoRy0gWLi+5OpD9y+dYS
u7FjQcB1NrT/kVghOSAkUcvKaIXtB/dM1Se2t/77DnVb7YrjDk97/1Jjbk7rrS6T
myaXIzsZMgI2d26wtBQSTr+AyyFvNw2h/LnooAc4bIlDJiFju6nSoVqcBPHHZ1mt
FaIwTzmRSGsSu2EX+S0HEOhHI/kHl5gCP4OVsvZDfBMZN3tKTog=
=GjCI
-END PGP SIGNATURE-

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

[tomcat] branch master updated: Move the reflection generation code into the main directory

[fhanik]

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

fhanik 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 f6f65c0  Move the reflection generation code into the main directory
f6f65c0 is described below

commit f6f65c0a0d3b34f24276249a579d933b2f20cfe3
Author: Filip Hanik 
AuthorDate: Thu Aug 27 09:56:16 2020 -0700

Move the reflection generation code into the main directory
---
 build.xml | 15 ---
 .../xreflection/ObjectReflectionPropertyInspector.java|  0
 .../util/xreflection/ReflectionLessCodeGenerator.java |  0
 .../tomcat/util/xreflection/ReflectionProperty.java   |  0
 .../apache/tomcat/util/xreflection/SetPropertyClass.java  |  0
 5 files changed, 15 deletions(-)

diff --git a/build.xml b/build.xml
index 1dfa845..2001a13 100644
--- a/build.xml
+++ b/build.xml
@@ -1685,26 +1685,11 @@
 
 
   
-  
 
 
   
 
 
-
-
-  
-  
-
-
 
 
diff --git 
a/res/graal/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
 
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
similarity index 100%
rename from 
res/graal/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
rename to 
java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
diff --git 
a/res/graal/java/org/apache/tomcat/util/xreflection/ReflectionLessCodeGenerator.java
 b/java/org/apache/tomcat/util/xreflection/ReflectionLessCodeGenerator.java
similarity index 100%
rename from 
res/graal/java/org/apache/tomcat/util/xreflection/ReflectionLessCodeGenerator.java
rename to 
java/org/apache/tomcat/util/xreflection/ReflectionLessCodeGenerator.java
diff --git 
a/res/graal/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java 
b/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
similarity index 100%
rename from 
res/graal/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
rename to java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
diff --git 
a/res/graal/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java 
b/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java
similarity index 100%
rename from 
res/graal/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java
rename to java/org/apache/tomcat/util/xreflection/SetPropertyClass.java


-
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: Move the reflection generation code into the main directory

[fhanik]

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

fhanik 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 7094b11  Move the reflection generation code into the main directory
7094b11 is described below

commit 7094b11e7fe4513b1f83c1fba85374183edc7aa7
Author: Filip Hanik 
AuthorDate: Thu Aug 27 09:56:16 2020 -0700

Move the reflection generation code into the main directory
---
 build.xml | 15 ---
 .../xreflection/ObjectReflectionPropertyInspector.java|  0
 .../util/xreflection/ReflectionLessCodeGenerator.java |  0
 .../tomcat/util/xreflection/ReflectionProperty.java   |  0
 .../apache/tomcat/util/xreflection/SetPropertyClass.java  |  0
 5 files changed, 15 deletions(-)

diff --git a/build.xml b/build.xml
index 6da7bbf..f17fed1 100644
--- a/build.xml
+++ b/build.xml
@@ -1675,26 +1675,11 @@
 
 
   
-  
 
 
   
 
 
-
-
-  
-  
-
-
 
 
diff --git 
a/res/graal/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
 
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
similarity index 100%
rename from 
res/graal/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
rename to 
java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
diff --git 
a/res/graal/java/org/apache/tomcat/util/xreflection/ReflectionLessCodeGenerator.java
 b/java/org/apache/tomcat/util/xreflection/ReflectionLessCodeGenerator.java
similarity index 100%
rename from 
res/graal/java/org/apache/tomcat/util/xreflection/ReflectionLessCodeGenerator.java
rename to 
java/org/apache/tomcat/util/xreflection/ReflectionLessCodeGenerator.java
diff --git 
a/res/graal/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java 
b/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
similarity index 100%
rename from 
res/graal/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
rename to java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
diff --git 
a/res/graal/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java 
b/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java
similarity index 100%
rename from 
res/graal/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java
rename to java/org/apache/tomcat/util/xreflection/SetPropertyClass.java


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

[GitHub] [tomcat] rpluem commented on pull request #342: Display the CATALINA_OPTS when starting Tomcat

[GitBox]

rpluem commented on pull request #342:
URL: https://github.com/apache/tomcat/pull/342#issuecomment-682134785


   Thanks. Is there anything I need to do to get this backported for 9.0.x, 
e.g. a separate PR against the 9.0.x branch?



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] sakshamverma opened a new pull request #346: Bug 64644 add custom properties to close connections on readIdletimeout

[GitBox]

sakshamverma opened a new pull request #346:
URL: https://github.com/apache/tomcat/pull/346


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] sakshamverma commented on pull request #346: Bug 64644 add custom properties to close connections on readIdletimeout

[GitBox]

sakshamverma commented on pull request #346:
URL: https://github.com/apache/tomcat/pull/346#issuecomment-682147344


   @markt-asf 
   
   Could you please review this PR
   Its related to the PR https://github.com/apache/tomcat/pull/330 which was 
not appropriate. 
   
   The current PR is as per your suggestion on the bug 
https://bz.apache.org/bugzilla/show_bug.cgi?id=64644
   
   Added 2 custom properties for session 
   IdleReadTimeout
   IdleWriteTimeout
   
   Need to check if I can remove the 2 other properties I added : 
closeOnReadIdleTimeout and closeOnWriteIdleTimeout if they are not needed.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] sakshamverma edited a comment on pull request #346: Bug 64644 add custom properties to close connections on readIdletimeout

[GitBox]

sakshamverma edited a comment on pull request #346:
URL: https://github.com/apache/tomcat/pull/346#issuecomment-682147344


   @markt-asf 
   
   Could you please review this PR
   Its related to the PR https://github.com/apache/tomcat/pull/330 which was 
not appropriate. 
   
   The current PR is as per your suggestion on the bug 
https://bz.apache.org/bugzilla/show_bug.cgi?id=64644
   
   Added 2 custom properties for session 
   IdleReadTimeout
   IdleWriteTimeout
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] markt-asf commented on pull request #342: Display the CATALINA_OPTS when starting Tomcat

[GitBox]

markt-asf commented on pull request #342:
URL: https://github.com/apache/tomcat/pull/342#issuecomment-682152212


   Nope. I back-ported it all the way to 7.0.x shortly after I merged the PR.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[tomcat] branch 9.0.x updated: Add comment to aid future diagnostics

[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 807f913  Add comment to aid future diagnostics
807f913 is described below

commit 807f9132a848396e90547b027844dd329259f1ce
Author: Mark Thomas 
AuthorDate: Thu Aug 27 20:51:57 2020 +0100

Add comment to aid future diagnostics
---
 test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java 
b/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
index 993eca7..7dc5f4c 100644
--- a/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
+++ b/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
@@ -122,6 +122,7 @@ public class TestWebSocketFrameClient extends 
WebSocketBaseTest {
 try {
 echoTester("",null);
 echoTester("/",null);
+// This will trigger a redirect so there will be 5 requests logged
 echoTester("/foo",null);
 echoTester("/foo/",null);
 } finally {


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

[tomcat] branch master updated: Add comment to aid future diagnostics

[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 93641a0  Add comment to aid future diagnostics
93641a0 is described below

commit 93641a04b81502b5877f13eb7dbb63670b34dbcf
Author: Mark Thomas 
AuthorDate: Thu Aug 27 20:51:57 2020 +0100

Add comment to aid future diagnostics
---
 test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java 
b/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
index 958c59b..615905c 100644
--- a/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
+++ b/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
@@ -122,6 +122,7 @@ public class TestWebSocketFrameClient extends 
WebSocketBaseTest {
 try {
 echoTester("",null);
 echoTester("/",null);
+// This will trigger a redirect so there will be 5 requests logged
 echoTester("/foo",null);
 echoTester("/foo/",null);
 } finally {


-
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: Add comment to aid future diagnostics

[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 e950a87  Add comment to aid future diagnostics
e950a87 is described below

commit e950a87188cab13dcb73f85cc57f707f512dea75
Author: Mark Thomas 
AuthorDate: Thu Aug 27 20:51:57 2020 +0100

Add comment to aid future diagnostics
---
 test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java 
b/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
index 07145a9..e2c3e4d 100644
--- a/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
+++ b/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
@@ -125,6 +125,7 @@ public class TestWebSocketFrameClient extends 
WebSocketBaseTest {
 try {
 echoTester("",null);
 echoTester("/",null);
+// This will trigger a redirect so there will be 5 requests logged
 echoTester("/foo",null);
 echoTester("/foo/",null);
 } finally {


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

[tomcat] branch 7.0.x updated: Add comment to aid future diagnostics

[markt]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new e82b7b8  Add comment to aid future diagnostics
e82b7b8 is described below

commit e82b7b87ead4224b6bda344294410e71161a0407
Author: Mark Thomas 
AuthorDate: Thu Aug 27 20:51:57 2020 +0100

Add comment to aid future diagnostics
---
 test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java 
b/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
index ef8adba..b4ecd0c 100644
--- a/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
+++ b/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
@@ -124,6 +124,7 @@ public class TestWebSocketFrameClient extends 
WebSocketBaseTest {
 try {
 echoTester("",null);
 echoTester("/",null);
+// This will trigger a redirect so there will be 5 requests logged
 echoTester("/foo",null);
 echoTester("/foo/",null);
 } finally {


-
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: Add debug logging to regularly failing test

[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 4a869d8  Add debug logging to regularly failing test
4a869d8 is described below

commit 4a869d87e8496cf55f3c058937d51fabe5da6cd3
Author: Mark Thomas 
AuthorDate: Thu Aug 27 21:22:15 2020 +0100

Add debug logging to regularly failing test
---
 .../apache/coyote/http2/TestHttp2Section_6_1.java  | 59 +-
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_6_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_6_1.java
index 0027982..20405d4 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_6_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_6_1.java
@@ -16,6 +16,9 @@
  */
 package org.apache.coyote.http2;
 
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -49,31 +52,37 @@ public class TestHttp2Section_6_1 extends Http2TestBase {
 
 @Test
 public void testDataFrameWithPadding() throws Exception {
-http2Connect();
-
-byte[] padding = new byte[8];
-
-sendSimplePostRequest(3, padding);
-readSimplePostResponse(true);
-
-
-// The window update for the padding could occur anywhere since it
-// happens on a different thead to the response.
-String trace = output.getTrace();
-String paddingWindowUpdate = "0-WindowSize-[9]\n3-WindowSize-[9]\n";
-
-Assert.assertTrue(trace, trace.contains(paddingWindowUpdate));
-trace = trace.replace(paddingWindowUpdate, "");
-
-Assert.assertEquals("0-WindowSize-[119]\n" +
-"3-WindowSize-[119]\n" +
-"3-HeadersStart\n" +
-"3-Header-[:status]-[200]\n" +
-"3-Header-[content-length]-[119]\n" +
-"3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
-"3-HeadersEnd\n" +
-"3-Body-119\n" +
-"3-EndOfStream\n", trace);
+
LogManager.getLogManager().getLogger("org.apache.coyote").setLevel(Level.ALL);
+
LogManager.getLogManager().getLogger("org.apache.tomcat.util.net").setLevel(Level.ALL);
+try {
+http2Connect();
+
+byte[] padding = new byte[8];
+
+sendSimplePostRequest(3, padding);
+readSimplePostResponse(true);
+
+// The window update for the padding could occur anywhere since it
+// happens on a different thead to the response.
+String trace = output.getTrace();
+String paddingWindowUpdate = 
"0-WindowSize-[9]\n3-WindowSize-[9]\n";
+
+Assert.assertTrue(trace, trace.contains(paddingWindowUpdate));
+trace = trace.replace(paddingWindowUpdate, "");
+
+Assert.assertEquals("0-WindowSize-[119]\n" +
+"3-WindowSize-[119]\n" +
+"3-HeadersStart\n" +
+"3-Header-[:status]-[200]\n" +
+"3-Header-[content-length]-[119]\n" +
+"3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
+"3-HeadersEnd\n" +
+"3-Body-119\n" +
+"3-EndOfStream\n", trace);
+} finally {
+
LogManager.getLogManager().getLogger("org.apache.coyote").setLevel(Level.INFO);
+
LogManager.getLogManager().getLogger("org.apache.tomcat.util.net").setLevel(Level.INFO);
+}
 }
 
 


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

[tomcat] branch master updated (93641a0 -> 4300f13)

[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 93641a0  Add comment to aid future diagnostics
 add 4300f13  Add debug logging to regularly failing test

No new revisions were added by this update.

Summary of changes:
 .../apache/coyote/http2/TestHttp2Section_6_1.java  | 59 +-
 1 file changed, 34 insertions(+), 25 deletions(-)


-
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: Add debug logging to regularly failing test

[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 6f10ac4  Add debug logging to regularly failing test
6f10ac4 is described below

commit 6f10ac442a2af7bc5d23cbf36220365e21974acf
Author: Mark Thomas 
AuthorDate: Thu Aug 27 21:22:15 2020 +0100

Add debug logging to regularly failing test
---
 .../apache/coyote/http2/TestHttp2Section_6_1.java  | 59 +-
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Section_6_1.java 
b/test/org/apache/coyote/http2/TestHttp2Section_6_1.java
index 0027982..20405d4 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_6_1.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_6_1.java
@@ -16,6 +16,9 @@
  */
 package org.apache.coyote.http2;
 
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -49,31 +52,37 @@ public class TestHttp2Section_6_1 extends Http2TestBase {
 
 @Test
 public void testDataFrameWithPadding() throws Exception {
-http2Connect();
-
-byte[] padding = new byte[8];
-
-sendSimplePostRequest(3, padding);
-readSimplePostResponse(true);
-
-
-// The window update for the padding could occur anywhere since it
-// happens on a different thead to the response.
-String trace = output.getTrace();
-String paddingWindowUpdate = "0-WindowSize-[9]\n3-WindowSize-[9]\n";
-
-Assert.assertTrue(trace, trace.contains(paddingWindowUpdate));
-trace = trace.replace(paddingWindowUpdate, "");
-
-Assert.assertEquals("0-WindowSize-[119]\n" +
-"3-WindowSize-[119]\n" +
-"3-HeadersStart\n" +
-"3-Header-[:status]-[200]\n" +
-"3-Header-[content-length]-[119]\n" +
-"3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
-"3-HeadersEnd\n" +
-"3-Body-119\n" +
-"3-EndOfStream\n", trace);
+
LogManager.getLogManager().getLogger("org.apache.coyote").setLevel(Level.ALL);
+
LogManager.getLogManager().getLogger("org.apache.tomcat.util.net").setLevel(Level.ALL);
+try {
+http2Connect();
+
+byte[] padding = new byte[8];
+
+sendSimplePostRequest(3, padding);
+readSimplePostResponse(true);
+
+// The window update for the padding could occur anywhere since it
+// happens on a different thead to the response.
+String trace = output.getTrace();
+String paddingWindowUpdate = 
"0-WindowSize-[9]\n3-WindowSize-[9]\n";
+
+Assert.assertTrue(trace, trace.contains(paddingWindowUpdate));
+trace = trace.replace(paddingWindowUpdate, "");
+
+Assert.assertEquals("0-WindowSize-[119]\n" +
+"3-WindowSize-[119]\n" +
+"3-HeadersStart\n" +
+"3-Header-[:status]-[200]\n" +
+"3-Header-[content-length]-[119]\n" +
+"3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
+"3-HeadersEnd\n" +
+"3-Body-119\n" +
+"3-EndOfStream\n", trace);
+} finally {
+
LogManager.getLogManager().getLogger("org.apache.coyote").setLevel(Level.INFO);
+
LogManager.getLogManager().getLogger("org.apache.tomcat.util.net").setLevel(Level.INFO);
+}
 }
 
 


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

[GitHub] [tomcat] rpluem commented on pull request #342: Display the CATALINA_OPTS when starting Tomcat

[GitBox]

rpluem commented on pull request #342:
URL: https://github.com/apache/tomcat/pull/342#issuecomment-682343185


   Great :-). Thanks.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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