svn commit: r1710734 - in /tomcat/site/trunk: docs/whoweare.html xdocs/whoweare.xml
Author: mgrigorov Date: Tue Oct 27 07:50:01 2015 New Revision: 1710734 URL: http://svn.apache.org/viewvc?rev=1710734&view=rev Log: Add myself (mgrigorov) to the list of member/committers Modified: tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/whoweare.xml Modified: tomcat/site/trunk/docs/whoweare.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1710734&r1=1710733&r2=1710734&view=diff == --- tomcat/site/trunk/docs/whoweare.html (original) +++ tomcat/site/trunk/docs/whoweare.html Tue Oct 27 07:50:01 2015 @@ -399,6 +399,12 @@ A complete list of all the Apache Commit +Martin Grigorov (mgrigorov at apache.org) + + + + + Keith Wannamaker (keith at apache.org) Modified: tomcat/site/trunk/xdocs/whoweare.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whoweare.xml?rev=1710734&r1=1710733&r2=1710734&view=diff == --- tomcat/site/trunk/xdocs/whoweare.xml (original) +++ tomcat/site/trunk/xdocs/whoweare.xml Tue Oct 27 07:50:01 2015 @@ -124,6 +124,9 @@ A complete list of all the Apache Commit Mark Thomas (markt at apache.org) +Martin Grigorov (mgrigorov at apache.org) + + Keith Wannamaker (keith at apache.org) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710805 - in /tomcat/site/trunk: docs/whoweare.html xdocs/whoweare.xml
Author: mgrigorov Date: Tue Oct 27 13:03:11 2015 New Revision: 1710805 URL: http://svn.apache.org/viewvc?rev=1710805&view=rev Log: Use the correct comparator. The list of names is sorted by family name. Modified: tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/whoweare.xml Modified: tomcat/site/trunk/docs/whoweare.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1710805&r1=1710804&r2=1710805&view=diff == --- tomcat/site/trunk/docs/whoweare.html (original) +++ tomcat/site/trunk/docs/whoweare.html Tue Oct 27 13:03:11 2015 @@ -303,6 +303,12 @@ A complete list of all the Apache Commit +Martin Grigorov (mgrigorov at apache.org) + + + + + Filip Hanik (fhanik at apache.org) @@ -397,12 +403,6 @@ A complete list of all the Apache Commit - - -Martin Grigorov (mgrigorov at apache.org) - - - Keith Wannamaker (keith at apache.org) Modified: tomcat/site/trunk/xdocs/whoweare.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whoweare.xml?rev=1710805&r1=1710804&r2=1710805&view=diff == --- tomcat/site/trunk/xdocs/whoweare.xml (original) +++ tomcat/site/trunk/xdocs/whoweare.xml Tue Oct 27 13:03:11 2015 @@ -76,6 +76,9 @@ A complete list of all the Apache Commit Henri Gomez (hgomez at apache.org) +Martin Grigorov (mgrigorov at apache.org) + + Filip Hanik (fhanik at apache.org) @@ -124,9 +127,6 @@ A complete list of all the Apache Commit Mark Thomas (markt at apache.org) -Martin Grigorov (mgrigorov at apache.org) - - Keith Wannamaker (keith at apache.org) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713351 - /tomcat/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java
Author: mgrigorov
Date: Mon Nov 9 09:06:32 2015
New Revision: 1713351
URL: http://svn.apache.org/viewvc?rev=1713351&view=rev
Log:
Fix a typo in a test method name.
Introduced with r1713285
Modified:
tomcat/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java
Modified:
tomcat/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java?rev=1713351&r1=1713350&r2=1713351&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java
Mon Nov 9 09:06:32 2015
@@ -71,7 +71,7 @@ public class TestStandardSessionIdGenera
}
@Test
-public void testValidateWithJvmRouteWithPerid() {
+public void testValidateWithJvmRouteWithPeriod() {
Assert.assertTrue(generator.validateSessionId(VALID + ".g.h.i"));
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1737428 - /tomcat/site/trunk/docs/tomcat-8.5-doc/building.html
Author: mgrigorov Date: Fri Apr 1 20:01:53 2016 New Revision: 1737428 URL: http://svn.apache.org/viewvc?rev=1737428&view=rev Log: s/8.0/8.5/ in links text Modified: tomcat/site/trunk/docs/tomcat-8.5-doc/building.html Modified: tomcat/site/trunk/docs/tomcat-8.5-doc/building.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-8.5-doc/building.html?rev=1737428&r1=1737427&r2=1737428&view=diff == --- tomcat/site/trunk/docs/tomcat-8.5-doc/building.html (original) +++ tomcat/site/trunk/docs/tomcat-8.5-doc/building.html Fri Apr 1 20:01:53 2016 @@ -82,11 +82,11 @@ available, which will be used to actuall Tomcat SVN repository URL: - http://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk/";>http://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk/ + http://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk/";>http://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk/ Tomcat source packages: - http://tomcat.apache.org/download-85.cgi";>http://tomcat.apache.org/download-80.cgi. + http://tomcat.apache.org/download-85.cgi";>http://tomcat.apache.org/download-85.cgi. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1774891 - /tomcat/trunk/webapps/docs/security-howto.xml
Author: mgrigorov Date: Sun Dec 18 14:26:45 2016 New Revision: 1774891 URL: http://svn.apache.org/viewvc?rev=1774891&view=rev Log: Fix typos Modified: tomcat/trunk/webapps/docs/security-howto.xml Modified: tomcat/trunk/webapps/docs/security-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/security-howto.xml?rev=1774891&r1=1774890&r2=1774891&view=diff == --- tomcat/trunk/webapps/docs/security-howto.xml (original) +++ tomcat/trunk/webapps/docs/security-howto.xml Sun Dec 18 14:26:45 2016 @@ -77,12 +77,12 @@ The security of the JMX connection is dependent on the implementation - provided by the JRE and therefore falls outside the control of Tomact. + provided by the JRE and therefore falls outside the control of Tomcat. Typically, access control is very limited (either read-only to everything or read-write to everything). Tomcat exposes a large amount of internal information and control via JMX to aid debugging, monitoring - and management. Give the limited access control available, JMX access + and management. Given the limited access control available, JMX access should be treated as equivalent to local root/admin access and restricted accordingly. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Check earlier for valid first character
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
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
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
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'
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'
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'
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'
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
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
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
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
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
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
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
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
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
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
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
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
[tomcat] branch master updated: Clarify where wildcards are allowed in Host and Alias directives
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
[tomcat] 02/02: Clarify where wildcards are allowed in Host and Alias directives
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
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
[tomcat] branch 9.0.x updated: Clarify where wildcards are allowed in Host and Alias directives
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 (01945af -> a1f53c3)
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: Replace "".equals(a) with a.isEmpty()
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 f550254 Replace "".equals(a) with a.isEmpty()
new 6053839 Merge pull request #356 from
martin-g/improvement/use-string-isempty
f550254 is described below
commit f550254bb15e1b0cc50225aee1c3fb1ed034f552
Author: Martin Tzvetanov Grigorov
AuthorDate: Thu Sep 10 12:52:11 2020 +0300
Replace "".equals(a) with a.isEmpty()
https://medium.com/javarevisited/micro-optimizations-in-java-string-equals-22be19fd8416
Proposal for JDK: https://github.com/openjdk/jdk/pull/29
---
.../apache/catalina/ant/jmx/JMXAccessorCondition.java | 2 +-
.../apache/catalina/ant/jmx/JMXAccessorCreateTask.java | 2 +-
java/org/apache/catalina/ant/jmx/JMXAccessorTask.java | 2 +-
java/org/apache/catalina/core/ApplicationContext.java | 2 +-
java/org/apache/catalina/core/StandardContext.java | 2 +-
java/org/apache/catalina/core/StandardEngine.java | 2 +-
java/org/apache/catalina/filters/WebdavFixFilter.java | 2 +-
java/org/apache/catalina/ha/backend/TcpSender.java | 2 +-
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../apache/catalina/manager/HTMLManagerServlet.java| 9 +
java/org/apache/catalina/manager/ManagerServlet.java | 2 +-
.../catalina/manager/host/HostManagerServlet.java | 2 +-
java/org/apache/catalina/realm/RealmBase.java | 2 +-
java/org/apache/catalina/servlets/CGIServlet.java | 8
java/org/apache/catalina/session/JDBCStore.java| 2 +-
.../org/apache/catalina/storeconfig/StoreRegistry.java | 2 +-
java/org/apache/catalina/util/ContextName.java | 18 +-
java/org/apache/el/MethodExpressionImpl.java | 2 +-
java/org/apache/el/MethodExpressionLiteral.java| 2 +-
java/org/apache/el/ValueExpressionImpl.java| 2 +-
java/org/apache/el/ValueExpressionLiteral.java | 2 +-
java/org/apache/el/lang/ELSupport.java | 7 ---
java/org/apache/el/lang/FunctionMapperImpl.java| 2 +-
java/org/apache/el/util/ReflectionUtil.java| 2 +-
java/org/apache/jasper/JspC.java | 2 +-
java/org/apache/jasper/compiler/Generator.java | 2 +-
java/org/apache/jasper/compiler/Validator.java | 2 +-
.../apache/tomcat/util/digester/SetPropertiesRule.java | 2 +-
java/org/apache/tomcat/util/net/SSLUtilBase.java | 2 +-
.../apache/tomcat/websocket/WsWebSocketContainer.java | 3 ++-
30 files changed, 49 insertions(+), 46 deletions(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
index b009684..4ac07c3 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
@@ -149,7 +149,7 @@ public class JMXAccessorCondition extends
JMXAccessorConditionBase {
* @return true if there is no if condition, or the named property exists
*/
protected boolean testIfCondition() {
-if (ifCondition == null || "".equals(ifCondition)) {
+if (ifCondition == null || ifCondition.isEmpty()) {
return true;
}
return getProject().getProperty(ifCondition) != null;
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
index 28aab6c..558a258 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
@@ -154,7 +154,7 @@ public class JMXAccessorCreateTask extends JMXAccessorTask {
}
}
}
-if (classLoader != null && !"".equals(classLoader)) {
+if (classLoader != null && !classLoader.isEmpty()) {
if (isEcho()) {
handleOutput("create MBean " + name + " from class "
+ className + " with classLoader " + classLoader);
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
index 8d5d268..d79e471 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
@@ -254,7 +254,7 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
* @return Returns the useRef.
*/
public boolean isUseRef() {
-return ref != null && !"".equals(ref);
+return ref != null && !ref.isEmpty();
}
/**
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationConte
[tomcat] branch 9.0.x updated: Replace "".equals(a) with a.isEmpty()
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 a666c70 Replace "".equals(a) with a.isEmpty()
a666c70 is described below
commit a666c70dfffda09d50ff93106ebb29bfe7107fed
Author: Martin Tzvetanov Grigorov
AuthorDate: Thu Sep 10 12:52:11 2020 +0300
Replace "".equals(a) with a.isEmpty()
https://medium.com/javarevisited/micro-optimizations-in-java-string-equals-22be19fd8416
Proposal for JDK: https://github.com/openjdk/jdk/pull/29
(cherry picked from commit f550254bb15e1b0cc50225aee1c3fb1ed034f552)
---
.../apache/catalina/ant/jmx/JMXAccessorCondition.java | 2 +-
.../apache/catalina/ant/jmx/JMXAccessorCreateTask.java | 2 +-
java/org/apache/catalina/ant/jmx/JMXAccessorTask.java | 2 +-
java/org/apache/catalina/core/ApplicationContext.java | 2 +-
java/org/apache/catalina/core/StandardContext.java | 2 +-
java/org/apache/catalina/core/StandardEngine.java | 2 +-
java/org/apache/catalina/filters/WebdavFixFilter.java | 2 +-
java/org/apache/catalina/ha/backend/TcpSender.java | 2 +-
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../apache/catalina/manager/HTMLManagerServlet.java| 9 +
java/org/apache/catalina/manager/ManagerServlet.java | 2 +-
.../catalina/manager/host/HostManagerServlet.java | 2 +-
java/org/apache/catalina/realm/RealmBase.java | 2 +-
java/org/apache/catalina/servlets/CGIServlet.java | 8
java/org/apache/catalina/session/JDBCStore.java| 2 +-
.../org/apache/catalina/storeconfig/StoreRegistry.java | 2 +-
java/org/apache/catalina/util/ContextName.java | 18 +-
java/org/apache/el/MethodExpressionImpl.java | 2 +-
java/org/apache/el/MethodExpressionLiteral.java| 2 +-
java/org/apache/el/ValueExpressionImpl.java| 2 +-
java/org/apache/el/ValueExpressionLiteral.java | 2 +-
java/org/apache/el/lang/ELSupport.java | 7 ---
java/org/apache/el/lang/FunctionMapperImpl.java| 2 +-
java/org/apache/el/util/ReflectionUtil.java| 2 +-
java/org/apache/jasper/JspC.java | 2 +-
java/org/apache/jasper/compiler/Generator.java | 2 +-
java/org/apache/jasper/compiler/Validator.java | 2 +-
.../apache/tomcat/util/digester/SetPropertiesRule.java | 2 +-
java/org/apache/tomcat/util/net/SSLUtilBase.java | 2 +-
.../apache/tomcat/websocket/WsWebSocketContainer.java | 3 ++-
30 files changed, 49 insertions(+), 46 deletions(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
index b009684..4ac07c3 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
@@ -149,7 +149,7 @@ public class JMXAccessorCondition extends
JMXAccessorConditionBase {
* @return true if there is no if condition, or the named property exists
*/
protected boolean testIfCondition() {
-if (ifCondition == null || "".equals(ifCondition)) {
+if (ifCondition == null || ifCondition.isEmpty()) {
return true;
}
return getProject().getProperty(ifCondition) != null;
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
index 28aab6c..558a258 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
@@ -154,7 +154,7 @@ public class JMXAccessorCreateTask extends JMXAccessorTask {
}
}
}
-if (classLoader != null && !"".equals(classLoader)) {
+if (classLoader != null && !classLoader.isEmpty()) {
if (isEcho()) {
handleOutput("create MBean " + name + " from class "
+ className + " with classLoader " + classLoader);
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
index 8d5d268..d79e471 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
@@ -254,7 +254,7 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
* @return Returns the useRef.
*/
public boolean isUseRef() {
-return ref != null && !"".equals(ref);
+return ref != null && !ref.isEmpty();
}
/**
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationContext.java
[tomcat] branch 8.5.x updated: Replace "".equals(a) with a.isEmpty()
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 4d5d395 Replace "".equals(a) with a.isEmpty()
4d5d395 is described below
commit 4d5d3956f3416008d3778a4ccc696602ad489b6c
Author: Martin Tzvetanov Grigorov
AuthorDate: Thu Sep 10 12:52:11 2020 +0300
Replace "".equals(a) with a.isEmpty()
https://medium.com/javarevisited/micro-optimizations-in-java-string-equals-22be19fd8416
Proposal for JDK: https://github.com/openjdk/jdk/pull/29
(cherry picked from commit f550254bb15e1b0cc50225aee1c3fb1ed034f552)
---
.../apache/catalina/ant/jmx/JMXAccessorCondition.java | 2 +-
.../apache/catalina/ant/jmx/JMXAccessorCreateTask.java | 2 +-
java/org/apache/catalina/ant/jmx/JMXAccessorTask.java | 2 +-
java/org/apache/catalina/core/ApplicationContext.java | 2 +-
java/org/apache/catalina/core/StandardContext.java | 2 +-
java/org/apache/catalina/core/StandardEngine.java | 2 +-
java/org/apache/catalina/filters/WebdavFixFilter.java | 2 +-
java/org/apache/catalina/ha/backend/TcpSender.java | 2 +-
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../apache/catalina/manager/HTMLManagerServlet.java| 9 +
java/org/apache/catalina/manager/ManagerServlet.java | 2 +-
.../catalina/manager/host/HostManagerServlet.java | 2 +-
java/org/apache/catalina/realm/RealmBase.java | 2 +-
java/org/apache/catalina/servlets/CGIServlet.java | 8
java/org/apache/catalina/session/JDBCStore.java| 2 +-
.../org/apache/catalina/storeconfig/StoreRegistry.java | 2 +-
java/org/apache/catalina/util/ContextName.java | 18 +-
java/org/apache/el/MethodExpressionImpl.java | 2 +-
java/org/apache/el/MethodExpressionLiteral.java| 2 +-
java/org/apache/el/ValueExpressionImpl.java| 2 +-
java/org/apache/el/ValueExpressionLiteral.java | 2 +-
java/org/apache/el/lang/ELSupport.java | 7 ---
java/org/apache/el/lang/FunctionMapperImpl.java| 2 +-
java/org/apache/el/util/ReflectionUtil.java| 2 +-
java/org/apache/jasper/JspC.java | 2 +-
java/org/apache/jasper/compiler/Generator.java | 2 +-
java/org/apache/jasper/compiler/Validator.java | 2 +-
.../apache/tomcat/util/digester/SetPropertiesRule.java | 2 +-
java/org/apache/tomcat/util/net/SSLUtilBase.java | 2 +-
.../apache/tomcat/websocket/WsWebSocketContainer.java | 3 ++-
30 files changed, 49 insertions(+), 46 deletions(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
index b009684..4ac07c3 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
@@ -149,7 +149,7 @@ public class JMXAccessorCondition extends
JMXAccessorConditionBase {
* @return true if there is no if condition, or the named property exists
*/
protected boolean testIfCondition() {
-if (ifCondition == null || "".equals(ifCondition)) {
+if (ifCondition == null || ifCondition.isEmpty()) {
return true;
}
return getProject().getProperty(ifCondition) != null;
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
index 28aab6c..558a258 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
@@ -154,7 +154,7 @@ public class JMXAccessorCreateTask extends JMXAccessorTask {
}
}
}
-if (classLoader != null && !"".equals(classLoader)) {
+if (classLoader != null && !classLoader.isEmpty()) {
if (isEcho()) {
handleOutput("create MBean " + name + " from class "
+ className + " with classLoader " + classLoader);
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
index 8d5d268..d79e471 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
@@ -254,7 +254,7 @@ public class JMXAccessorTask extends
BaseRedirectorHelperTask {
* @return Returns the useRef.
*/
public boolean isUseRef() {
-return ref != null && !"".equals(ref);
+return ref != null && !ref.isEmpty();
}
/**
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationContext.java
[tomcat] branch master updated: Fix case of HTML and SHTML
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 51b4298 Fix case of HTML and SHTML
new c4a789e Merge pull request #364 from jbampton/fix-word-case
51b4298 is described below
commit 51b429836590b39d1c8a8ba5b55a4edd79f105b8
Author: John Bampton
AuthorDate: Wed Sep 16 00:18:29 2020 +1000
Fix case of HTML and SHTML
---
java/org/apache/catalina/filters/ExpiresFilter.java | 4 ++--
java/org/apache/catalina/ssi/SSIFilter.java | 2 +-
test/org/apache/catalina/authenticator/TestFormAuthenticator.java | 6 +++---
test/org/apache/catalina/startup/SimpleHttpClient.java| 2 +-
test/org/apache/catalina/startup/TesterServletEncodeUrl.java | 2 +-
webapps/examples/WEB-INF/classes/RequestInfoExample.java | 2 +-
webapps/examples/WEB-INF/classes/RequestParamExample.java | 2 +-
webapps/examples/WEB-INF/classes/SessionExample.java | 2 +-
webapps/examples/jsp/cal/cal1.jsp | 2 +-
webapps/examples/jsp/cal/login.html | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java
b/java/org/apache/catalina/filters/ExpiresFilter.java
index 63b8ce4..6d318c9 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -520,8 +520,8 @@ public class ExpiresFilter extends FilterBase {
/**
* Expiration configuration starting point. Either the time the
- * html-page/servlet-response was served ({@link
StartingPoint#ACCESS_TIME})
- * or the last time the html-page/servlet-response was modified (
+ * HTML-page/servlet-response was served ({@link
StartingPoint#ACCESS_TIME})
+ * or the last time the HTML-page/servlet-response was modified (
* {@link StartingPoint#LAST_MODIFICATION_TIME}).
*/
protected enum StartingPoint {
diff --git a/java/org/apache/catalina/ssi/SSIFilter.java
b/java/org/apache/catalina/ssi/SSIFilter.java
index 76630a4..b1c9b16 100644
--- a/java/org/apache/catalina/ssi/SSIFilter.java
+++ b/java/org/apache/catalina/ssi/SSIFilter.java
@@ -143,7 +143,7 @@ public class SSIFilter extends GenericFilter {
Matcher shtmlMatcher =
shtmlRegEx.matcher(responseIncludeWrapper.getContentType());
if (shtmlMatcher.matches()) {
-// Convert shtml mime type to ordinary html mime type but
preserve
+// Convert SHTML mime type to ordinary HTML mime type but
preserve
// encoding, if any.
String enc = shtmlMatcher.group(1);
res.setContentType("text/html" + ((enc != null) ? enc : ""));
diff --git a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
index 081b7b5..a743597 100644
--- a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
+++ b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
@@ -53,7 +53,7 @@ import org.apache.tomcat.websocket.server.WsContextListener;
*as a path parameter appended to ALL urls within its response. That is
*achievable with servlets, jsps, jstl (all of which which can ask for an
*encoded url to be inserted into the dynamic web page). It cannot work
- *with static html.
+ *with static HTML.
*note: this test class uses the Tomcat sample jsps, which conform.
*
* 3. Therefore, any webapp that MIGHT need to authenticate a client that
@@ -534,7 +534,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
}
/*
- * verify the server response html body is the page we expect,
+ * verify the server response HTML body is the page we expect,
* based on the dialogue position within doTest.
*/
@Override
@@ -543,7 +543,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
}
/*
- * verify the server response html body is the page we expect,
+ * verify the server response HTML body is the page we expect,
* based on the dialogue position given by the caller.
*/
public boolean isResponseBodyOK(int testPhase) {
diff --git a/test/org/apache/catalina/startup/SimpleHttpClient.java
b/test/org/apache/catalina/startup/SimpleHttpClient.java
index dd24d4e..995cf80 100644
--- a/test/org/apache/catalina/startup/SimpleHttpClient.java
+++ b/test/org/apache/catalina/startup/SimpleHttpClient.java
@@ -362,7 +362,7 @@ public abstract class SimpleHttpClient {
}
/*
- * Scan an html body for a given html uri element, starting from the
+ * Scan an HTML body
[tomcat] branch 9.0.x updated: Fix case of HTML and SHTML
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 03f9717 Fix case of HTML and SHTML
03f9717 is described below
commit 03f97173a21e1cfbad34743a36900a947eb1f05b
Author: John Bampton
AuthorDate: Wed Sep 16 00:18:29 2020 +1000
Fix case of HTML and SHTML
(cherry picked from commit 51b429836590b39d1c8a8ba5b55a4edd79f105b8)
---
java/org/apache/catalina/filters/ExpiresFilter.java | 4 ++--
java/org/apache/catalina/ssi/SSIFilter.java | 2 +-
test/org/apache/catalina/authenticator/TestFormAuthenticator.java | 6 +++---
test/org/apache/catalina/startup/SimpleHttpClient.java| 2 +-
test/org/apache/catalina/startup/TesterServletEncodeUrl.java | 2 +-
webapps/examples/WEB-INF/classes/RequestInfoExample.java | 2 +-
webapps/examples/WEB-INF/classes/RequestParamExample.java | 2 +-
webapps/examples/WEB-INF/classes/SessionExample.java | 2 +-
webapps/examples/jsp/cal/cal1.jsp | 2 +-
webapps/examples/jsp/cal/login.html | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java
b/java/org/apache/catalina/filters/ExpiresFilter.java
index 76e96da..9969c2f 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -520,8 +520,8 @@ public class ExpiresFilter extends FilterBase {
/**
* Expiration configuration starting point. Either the time the
- * html-page/servlet-response was served ({@link
StartingPoint#ACCESS_TIME})
- * or the last time the html-page/servlet-response was modified (
+ * HTML-page/servlet-response was served ({@link
StartingPoint#ACCESS_TIME})
+ * or the last time the HTML-page/servlet-response was modified (
* {@link StartingPoint#LAST_MODIFICATION_TIME}).
*/
protected enum StartingPoint {
diff --git a/java/org/apache/catalina/ssi/SSIFilter.java
b/java/org/apache/catalina/ssi/SSIFilter.java
index 6bad9f3..19a2983 100644
--- a/java/org/apache/catalina/ssi/SSIFilter.java
+++ b/java/org/apache/catalina/ssi/SSIFilter.java
@@ -143,7 +143,7 @@ public class SSIFilter extends GenericFilter {
Matcher shtmlMatcher =
shtmlRegEx.matcher(responseIncludeWrapper.getContentType());
if (shtmlMatcher.matches()) {
-// Convert shtml mime type to ordinary html mime type but
preserve
+// Convert SHTML mime type to ordinary HTML mime type but
preserve
// encoding, if any.
String enc = shtmlMatcher.group(1);
res.setContentType("text/html" + ((enc != null) ? enc : ""));
diff --git a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
index aaee1ee..fd539a7 100644
--- a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
+++ b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
@@ -53,7 +53,7 @@ import org.apache.tomcat.websocket.server.WsContextListener;
*as a path parameter appended to ALL urls within its response. That is
*achievable with servlets, jsps, jstl (all of which which can ask for an
*encoded url to be inserted into the dynamic web page). It cannot work
- *with static html.
+ *with static HTML.
*note: this test class uses the Tomcat sample jsps, which conform.
*
* 3. Therefore, any webapp that MIGHT need to authenticate a client that
@@ -534,7 +534,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
}
/*
- * verify the server response html body is the page we expect,
+ * verify the server response HTML body is the page we expect,
* based on the dialogue position within doTest.
*/
@Override
@@ -543,7 +543,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
}
/*
- * verify the server response html body is the page we expect,
+ * verify the server response HTML body is the page we expect,
* based on the dialogue position given by the caller.
*/
public boolean isResponseBodyOK(int testPhase) {
diff --git a/test/org/apache/catalina/startup/SimpleHttpClient.java
b/test/org/apache/catalina/startup/SimpleHttpClient.java
index dd24d4e..995cf80 100644
--- a/test/org/apache/catalina/startup/SimpleHttpClient.java
+++ b/test/org/apache/catalina/startup/SimpleHttpClient.java
@@ -362,7 +362,7 @@ public abstract class SimpleHttpClient {
}
/*
- * Scan an html body for a given html uri element, starting from the
+ * Scan an HTML body
[tomcat] branch 7.0.x updated: Fix case of HTML and SHTML
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 b1506d7 Fix case of HTML and SHTML
b1506d7 is described below
commit b1506d76be60b2a8432adb648d101b608a6e57c5
Author: John Bampton
AuthorDate: Wed Sep 16 00:18:29 2020 +1000
Fix case of HTML and SHTML
(cherry picked from commit 51b429836590b39d1c8a8ba5b55a4edd79f105b8)
---
java/org/apache/catalina/filters/ExpiresFilter.java | 4 ++--
java/org/apache/catalina/ssi/SSIFilter.java | 2 +-
test/org/apache/catalina/authenticator/TestFormAuthenticator.java | 8
test/org/apache/catalina/startup/SimpleHttpClient.java| 2 +-
test/org/apache/catalina/startup/TesterServletEncodeUrl.java | 2 +-
webapps/examples/WEB-INF/classes/RequestInfoExample.java | 2 +-
webapps/examples/WEB-INF/classes/RequestParamExample.java | 2 +-
webapps/examples/WEB-INF/classes/SessionExample.java | 2 +-
webapps/examples/jsp/cal/cal1.jsp | 2 +-
webapps/examples/jsp/cal/login.html | 2 +-
10 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java
b/java/org/apache/catalina/filters/ExpiresFilter.java
index 0b9fcd4..213c4f9 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -518,8 +518,8 @@ public class ExpiresFilter extends FilterBase {
/**
* Expiration configuration starting point. Either the time the
- * html-page/servlet-response was served ({@link
StartingPoint#ACCESS_TIME})
- * or the last time the html-page/servlet-response was modified (
+ * HTML-page/servlet-response was served ({@link
StartingPoint#ACCESS_TIME})
+ * or the last time the HTML-page/servlet-response was modified (
* {@link StartingPoint#LAST_MODIFICATION_TIME}).
*/
protected enum StartingPoint {
diff --git a/java/org/apache/catalina/ssi/SSIFilter.java
b/java/org/apache/catalina/ssi/SSIFilter.java
index c02a273..737b46b 100644
--- a/java/org/apache/catalina/ssi/SSIFilter.java
+++ b/java/org/apache/catalina/ssi/SSIFilter.java
@@ -154,7 +154,7 @@ public class SSIFilter implements Filter {
Matcher shtmlMatcher =
shtmlRegEx.matcher(responseIncludeWrapper.getContentType());
if (shtmlMatcher.matches()) {
-// Convert shtml mime type to ordinary html mime type but
preserve
+// Convert SHTML mime type to ordinary HTML mime type but
preserve
// encoding, if any.
String enc = shtmlMatcher.group(1);
res.setContentType("text/html" + ((enc != null) ? enc : ""));
diff --git a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
index 0578e21..26659b7 100644
--- a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
+++ b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
@@ -52,8 +52,8 @@ import org.apache.catalina.startup.TomcatBaseTest;
*as a path parameter appended to ALL urls within its response. That is
*achievable with servlets, jsps, jstl (all of which which can ask for an
*encoded url to be inserted into the dynamic web page). It cannot work
- *with static html.
- *note: this test class uses the tomcat somaple jsps, which conform.
+ *with static HTML.
+ *note: this test class uses the Tomcat sample jsps, which conform.
*
* 3. Therefore, any webapp that MIGHT need to authenticate a client that
*does not accept cookies MUST generate EVERY protected resource url
@@ -498,7 +498,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
}
/*
- * verify the server response html body is the page we expect,
+ * verify the server response HTML body is the page we expect,
* based on the dialogue position within doTest.
*/
@Override
@@ -507,7 +507,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
}
/*
- * verify the server response html body is the page we expect,
+ * verify the server response HTML body is the page we expect,
* based on the dialogue position given by the caller.
*/
public boolean isResponseBodyOK(int testPhase) {
diff --git a/test/org/apache/catalina/startup/SimpleHttpClient.java
b/test/org/apache/catalina/startup/SimpleHttpClient.java
index d89c46d..13d5246 100644
--- a/test/org/apache/catalina/startup/SimpleHttpClient.java
+++ b/test/org/apache/catalina/startup/SimpleHttpClient.java
@@ -356,7 +356,7 @@ public abstract cl
[tomcat] branch master updated: Fix a typo in changelog
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 c58633a Fix a typo in changelog c58633a is described below commit c58633a695c3329d9f385dc55f72784cb0896b73 Author: Martin Tzvetanov Grigorov AuthorDate: Thu Sep 24 11:46:17 2020 +0300 Fix a typo in changelog --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 701d9d0..685c7ad 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -131,7 +131,7 @@ Update the Manager How-To in the documentation web application to clarify when a user may wish to deploy additional instances of the -Maanger web application. (markt) +Manager web application. (markt) - 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: Fix a typo in changelog
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 7bd8c64 Fix a typo in changelog 7bd8c64 is described below commit 7bd8c649a6f39d263f40297de6fc9bf4519d64dc Author: Martin Tzvetanov Grigorov AuthorDate: Thu Sep 24 11:46:17 2020 +0300 Fix a typo in changelog (cherry picked from commit c58633a695c3329d9f385dc55f72784cb0896b73) --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index a9e3ca7..0f65809 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -73,7 +73,7 @@ Update the Manager How-To in the documentation web application to clarify when a user may wish to deploy additional instances of the -Maanger web application. (markt) +Manager web application. (markt) - 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 a typo in changelog
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 9c04df2 Fix a typo in changelog 9c04df2 is described below commit 9c04df2a48d2f0786a7d09a00ac9b5d3cc309fc7 Author: Martin Tzvetanov Grigorov AuthorDate: Thu Sep 24 11:46:17 2020 +0300 Fix a typo in changelog (cherry picked from commit c58633a695c3329d9f385dc55f72784cb0896b73) --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 959d6eb..96a0162 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -130,7 +130,7 @@ Update the Manager How-To in the documentation web application to clarify when a user may wish to deploy additional instances of the -Maanger web application. (markt) +Manager web application. (markt) - 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 a typo in changelog
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 ce17721 Fix a typo in changelog ce17721 is described below commit ce177213f6d5463bec9355b5642c14da2a29fa8b Author: Martin Tzvetanov Grigorov AuthorDate: Thu Sep 24 11:46:17 2020 +0300 Fix a typo in changelog (cherry picked from commit c58633a695c3329d9f385dc55f72784cb0896b73) --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 4750c1a..cdc6c96 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -106,7 +106,7 @@ Update the Manager How-To in the documentation web application to clarify when a user may wish to deploy additional instances of the -Maanger web application. (markt) +Manager web application. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (8713546 -> 6f17800)
This is an automated email from the ASF dual-hosted git repository. mgrigorov pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 8713546 OWB 2.0.18 new d2ed8ff Small optimizations in HpackEncoder new 6f17800 http2: Add 'EndOfStream' to the logs for writeHeaders and writeBody 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/HpackEncoder.java | 12 +--- .../coyote/http2/Http2AsyncUpgradeHandler.java | 6 +++--- .../apache/coyote/http2/Http2UpgradeHandler.java | 22 -- .../apache/coyote/http2/LocalStrings.properties| 4 ++-- 4 files changed, 26 insertions(+), 18 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Small optimizations in HpackEncoder
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
commit d2ed8ffc75c5e3b425888b456ffc51036d94ac39
Author: Martin Tzvetanov Grigorov
AuthorDate: Thu Sep 24 13:42:18 2020 +0300
Small optimizations in HpackEncoder
1) Use switch(String) instead of series of String.equals() calls. The
switch uses String.hashCode() and falls back to .equals() only if there are
cases with the same hash code.
2) Reduce memory allocations: no need to Map.Entry since the key is never
used
---
java/org/apache/coyote/http2/HpackEncoder.java | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/coyote/http2/HpackEncoder.java
b/java/org/apache/coyote/http2/HpackEncoder.java
index dda5714..ae81033 100644
--- a/java/org/apache/coyote/http2/HpackEncoder.java
+++ b/java/org/apache/coyote/http2/HpackEncoder.java
@@ -44,7 +44,13 @@ class HpackEncoder {
public boolean shouldUseIndexing(String headerName, String value) {
//content length and date change all the time
//no need to index them, or they will churn the table
-return !headerName.equals("content-length") &&
!headerName.equals("date");
+switch (headerName) {
+case "content-length":
+case "date":
+return false;
+default:
+return true;
+}
}
@Override
@@ -258,8 +264,8 @@ class HpackEncoder {
private void preventPositionRollover() {
//if the position counter is about to roll over we iterate all the
table entries
//and set their position to their actual position
-for (Map.Entry> entry :
dynamicTable.entrySet()) {
-for (TableEntry t : entry.getValue()) {
+for (List tableEntries : dynamicTable.values()) {
+for (TableEntry t : tableEntries) {
t.position = t.getPosition();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: http2: Add 'EndOfStream' to the logs for writeHeaders and writeBody
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
commit 6f178006f246ce9248a349705ba79d054d189b70
Author: Martin Tzvetanov Grigorov
AuthorDate: Thu Sep 24 13:46:31 2020 +0300
http2: Add 'EndOfStream' to the logs for writeHeaders and writeBody
Mark Http2AsyncUpgradeHandler#errorCompletion and
#applicationErrorCompletion as final.
Call streams.size() just once.
Extract local variables and reuse them instead of calling getters on every
usage
---
.../coyote/http2/Http2AsyncUpgradeHandler.java | 6 +++---
.../apache/coyote/http2/Http2UpgradeHandler.java | 22 --
.../apache/coyote/http2/LocalStrings.properties| 4 ++--
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
index 951c21c..9c274ac 100644
--- a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -51,7 +51,7 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
super(protocol, adapter, coyoteRequest);
}
-private CompletionHandler errorCompletion = new
CompletionHandler() {
+private final CompletionHandler errorCompletion = new
CompletionHandler() {
@Override
public void completed(Long result, Void attachment) {
}
@@ -60,7 +60,7 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
error = t;
}
};
-private CompletionHandler applicationErrorCompletion = new
CompletionHandler() {
+private final CompletionHandler applicationErrorCompletion =
new CompletionHandler() {
@Override
public void completed(Long result, Void attachment) {
}
@@ -199,7 +199,7 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
void writeBody(Stream stream, ByteBuffer data, int len, boolean finished)
throws IOException {
if (log.isDebugEnabled()) {
log.debug(sm.getString("upgradeHandler.writeBody", connectionId,
stream.getIdAsString(),
-Integer.toString(len)));
+Integer.toString(len), Boolean.valueOf(finished)));
}
// Need to check this now since sending end of stream will change this.
boolean writeable = stream.canWrite();
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index bc6fed0..152b2f3 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -665,7 +665,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
if (log.isDebugEnabled()) {
if (pushedStreamId == 0) {
log.debug(sm.getString("upgradeHandler.writeHeaders",
connectionId,
-stream.getIdAsString()));
+stream.getIdAsString(), Boolean.valueOf(endOfStream)));
} else {
log.debug(sm.getString("upgradeHandler.writePushHeaders",
connectionId,
stream.getIdAsString(),
Integer.valueOf(pushedStreamId),
@@ -1160,9 +1160,10 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
// maximum number of concurrent streams
long max = localSettings.getMaxConcurrentStreams();
+final int size = streams.size();
if (log.isDebugEnabled()) {
log.debug(sm.getString("upgradeHandler.pruneStart", connectionId,
-Long.toString(max), Integer.toString(streams.size(;
+Long.toString(max), Integer.toString(size)));
}
// Allow an additional 10% for closed streams that are used in the
@@ -1172,7 +1173,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
max = Integer.MAX_VALUE;
}
-int toClose = streams.size() - (int) max;
+int toClose = size - (int) max;
if (toClose < 1) {
return;
}
@@ -1199,16 +1200,17 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
continue;
}
+final Integer streamIdentifier = entry.getKey();
if (stream.isClosedFinal()) {
// This stream went from IDLE to CLOSED and is likely to have
// been created by the client as part of the priority tree.
-candidatesStepThree.add(entry.getKey());
+candidatesStepThree.add(streamIdentifier);
} else if (stream.getChildStreams().size() == 0) {
// Close
[tomcat] 01/02: Small optimizations in HpackEncoder
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
commit 92d2f1317a68f88f60ebfe56cf123bfbd510ab58
Author: Martin Tzvetanov Grigorov
AuthorDate: Thu Sep 24 13:42:18 2020 +0300
Small optimizations in HpackEncoder
1) Use switch(String) instead of series of String.equals() calls. The
switch uses String.hashCode() and falls back to .equals() only if there are
cases with the same hash code.
2) Reduce memory allocations: no need to Map.Entry since the key is never
used
(cherry picked from commit d2ed8ffc75c5e3b425888b456ffc51036d94ac39)
---
java/org/apache/coyote/http2/HpackEncoder.java | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/coyote/http2/HpackEncoder.java
b/java/org/apache/coyote/http2/HpackEncoder.java
index dda5714..ae81033 100644
--- a/java/org/apache/coyote/http2/HpackEncoder.java
+++ b/java/org/apache/coyote/http2/HpackEncoder.java
@@ -44,7 +44,13 @@ class HpackEncoder {
public boolean shouldUseIndexing(String headerName, String value) {
//content length and date change all the time
//no need to index them, or they will churn the table
-return !headerName.equals("content-length") &&
!headerName.equals("date");
+switch (headerName) {
+case "content-length":
+case "date":
+return false;
+default:
+return true;
+}
}
@Override
@@ -258,8 +264,8 @@ class HpackEncoder {
private void preventPositionRollover() {
//if the position counter is about to roll over we iterate all the
table entries
//and set their position to their actual position
-for (Map.Entry> entry :
dynamicTable.entrySet()) {
-for (TableEntry t : entry.getValue()) {
+for (List tableEntries : dynamicTable.values()) {
+for (TableEntry t : tableEntries) {
t.position = t.getPosition();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: http2: Add 'EndOfStream' to the logs for writeHeaders and writeBody
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
commit b8e5607a4fccfd47ad653c5788ac1ba052411094
Author: Martin Tzvetanov Grigorov
AuthorDate: Thu Sep 24 13:46:31 2020 +0300
http2: Add 'EndOfStream' to the logs for writeHeaders and writeBody
Mark Http2AsyncUpgradeHandler#errorCompletion and
#applicationErrorCompletion as final.
Call streams.size() just once.
Extract local variables and reuse them instead of calling getters on every
usage
(cherry picked from commit 6f178006f246ce9248a349705ba79d054d189b70)
---
.../coyote/http2/Http2AsyncUpgradeHandler.java | 6 +++---
.../apache/coyote/http2/Http2UpgradeHandler.java | 22 --
.../apache/coyote/http2/LocalStrings.properties| 4 ++--
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
index 21c8fa8..eb116a7 100644
--- a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -51,7 +51,7 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
super(protocol, adapter, coyoteRequest);
}
-private CompletionHandler errorCompletion = new
CompletionHandler() {
+private final CompletionHandler errorCompletion = new
CompletionHandler() {
@Override
public void completed(Long result, Void attachment) {
}
@@ -60,7 +60,7 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
error = t;
}
};
-private CompletionHandler applicationErrorCompletion = new
CompletionHandler() {
+private final CompletionHandler applicationErrorCompletion =
new CompletionHandler() {
@Override
public void completed(Long result, Void attachment) {
}
@@ -199,7 +199,7 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
void writeBody(Stream stream, ByteBuffer data, int len, boolean finished)
throws IOException {
if (log.isDebugEnabled()) {
log.debug(sm.getString("upgradeHandler.writeBody", connectionId,
stream.getIdAsString(),
-Integer.toString(len)));
+Integer.toString(len), Boolean.valueOf(finished)));
}
// Need to check this now since sending end of stream will change this.
boolean writeable = stream.canWrite();
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 98a5438..dbd7491 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -665,7 +665,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
if (log.isDebugEnabled()) {
if (pushedStreamId == 0) {
log.debug(sm.getString("upgradeHandler.writeHeaders",
connectionId,
-stream.getIdAsString()));
+stream.getIdAsString(), Boolean.valueOf(endOfStream)));
} else {
log.debug(sm.getString("upgradeHandler.writePushHeaders",
connectionId,
stream.getIdAsString(),
Integer.valueOf(pushedStreamId),
@@ -1160,9 +1160,10 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
// maximum number of concurrent streams
long max = localSettings.getMaxConcurrentStreams();
+final int size = streams.size();
if (log.isDebugEnabled()) {
log.debug(sm.getString("upgradeHandler.pruneStart", connectionId,
-Long.toString(max), Integer.toString(streams.size(;
+Long.toString(max), Integer.toString(size)));
}
// Allow an additional 10% for closed streams that are used in the
@@ -1172,7 +1173,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
max = Integer.MAX_VALUE;
}
-int toClose = streams.size() - (int) max;
+int toClose = size - (int) max;
if (toClose < 1) {
return;
}
@@ -1199,16 +1200,17 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
continue;
}
+final Integer streamIdentifier = entry.getKey();
if (stream.isClosedFinal()) {
// This stream went from IDLE to CLOSED and is likely to have
// been created by the client as part of the priority tree.
-candidatesStepThree.add(entry.getKey());
+candidatesStepThree.add(streamIdentifier);
[tomcat] branch 9.0.x updated (9c04df2 -> b8e5607)
This is an automated email from the ASF dual-hosted git repository. mgrigorov pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 9c04df2 Fix a typo in changelog new 92d2f13 Small optimizations in HpackEncoder new b8e5607 http2: Add 'EndOfStream' to the logs for writeHeaders and writeBody 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/HpackEncoder.java | 12 +--- .../coyote/http2/Http2AsyncUpgradeHandler.java | 6 +++--- .../apache/coyote/http2/Http2UpgradeHandler.java | 22 -- .../apache/coyote/http2/LocalStrings.properties| 4 ++-- 4 files changed, 26 insertions(+), 18 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix a typo in changelog
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 519f6f8 Fix a typo in changelog 519f6f8 is described below commit 519f6f89550208d020c18622ca7b870edf3a2602 Author: Martin Tzvetanov Grigorov AuthorDate: Fri Sep 25 10:02:15 2020 +0300 Fix a typo in changelog --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 85b7eee..319ae06 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -117,7 +117,7 @@ Improve the error handling for the HTTP/2 connection preface when the -Connector is configured with useAsycIO="true". +Connector is configured with useAsyncIO="true". (markt) - 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 a typo in changelog
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 d6089d8 Fix a typo in changelog d6089d8 is described below commit d6089d8d0855e49ac48b2e5836078edf85fbdcf0 Author: Martin Tzvetanov Grigorov AuthorDate: Fri Sep 25 10:02:15 2020 +0300 Fix a typo in changelog (cherry picked from commit 519f6f89550208d020c18622ca7b870edf3a2602) --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 06ec832..9fea913 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -116,7 +116,7 @@ Improve the error handling for the HTTP/2 connection preface when the -Connector is configured with useAsycIO="true". +Connector is configured with useAsyncIO="true". (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix a typo in changelog
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 519f6f8 Fix a typo in changelog 519f6f8 is described below commit 519f6f89550208d020c18622ca7b870edf3a2602 Author: Martin Tzvetanov Grigorov AuthorDate: Fri Sep 25 10:02:15 2020 +0300 Fix a typo in changelog --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 85b7eee..319ae06 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -117,7 +117,7 @@ Improve the error handling for the HTTP/2 connection preface when the -Connector is configured with useAsycIO="true". +Connector is configured with useAsyncIO="true". (markt) - 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: Small optimizations in HpackEncoder
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 685a58e Small optimizations in HpackEncoder
685a58e is described below
commit 685a58eb4155135ffe9d8f28acfb1561beb6d3f3
Author: Martin Tzvetanov Grigorov
AuthorDate: Thu Sep 24 13:42:18 2020 +0300
Small optimizations in HpackEncoder
1) Use switch(String) instead of series of String.equals() calls. The
switch uses String.hashCode() and falls back to .equals() only if there are
cases with the same hash code.
2) Reduce memory allocations: no need to Map.Entry since the key is never
used
(cherry picked from commit d2ed8ffc75c5e3b425888b456ffc51036d94ac39)
---
java/org/apache/coyote/http2/HpackEncoder.java | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/coyote/http2/HpackEncoder.java
b/java/org/apache/coyote/http2/HpackEncoder.java
index a024ca2..7331ca6 100644
--- a/java/org/apache/coyote/http2/HpackEncoder.java
+++ b/java/org/apache/coyote/http2/HpackEncoder.java
@@ -44,7 +44,13 @@ public class HpackEncoder {
public boolean shouldUseIndexing(String headerName, String value) {
//content length and date change all the time
//no need to index them, or they will churn the table
-return !headerName.equals("content-length") &&
!headerName.equals("date");
+switch (headerName) {
+case "content-length":
+case "date":
+return false;
+default:
+return true;
+}
}
@Override
@@ -258,8 +264,8 @@ public class HpackEncoder {
private void preventPositionRollover() {
//if the position counter is about to roll over we iterate all the
table entries
//and set their position to their actual position
-for (Map.Entry> entry :
dynamicTable.entrySet()) {
-for (TableEntry t : entry.getValue()) {
+for (List tableEntries : dynamicTable.values()) {
+for (TableEntry t : tableEntries) {
t.position = t.getPosition();
}
}
-
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 a typo in changelog
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 d6089d8 Fix a typo in changelog d6089d8 is described below commit d6089d8d0855e49ac48b2e5836078edf85fbdcf0 Author: Martin Tzvetanov Grigorov AuthorDate: Fri Sep 25 10:02:15 2020 +0300 Fix a typo in changelog (cherry picked from commit 519f6f89550208d020c18622ca7b870edf3a2602) --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 06ec832..9fea913 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -116,7 +116,7 @@ Improve the error handling for the HTTP/2 connection preface when the -Connector is configured with useAsycIO="true". +Connector is configured with useAsyncIO="true". (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Optimize the iteration when closing idle streams
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 31cab22 Optimize the iteration when closing idle streams
31cab22 is described below
commit 31cab22e6a8071f8e29c9d2a63650087f6d0a65c
Author: Martin Tzvetanov Grigorov
AuthorDate: Mon Sep 28 14:53:25 2020 +0300
Optimize the iteration when closing idle streams
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 49115d3..972a709 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -29,7 +29,7 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentNavigableMap;
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
@@ -124,7 +124,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
private HpackDecoder hpackDecoder;
private HpackEncoder hpackEncoder;
-private final ConcurrentMap streams = new
ConcurrentSkipListMap<>();
+private final ConcurrentNavigableMap
streams = new ConcurrentSkipListMap<>();
protected final AtomicInteger activeRemoteStreamCount = new
AtomicInteger(0);
// Start at -1 so the 'add 2' logic in closeIdleStreams() works
private volatile int maxActiveRemoteStreamId = -1;
@@ -1530,12 +1530,12 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
private void closeIdleStreams(int newMaxActiveRemoteStreamId) {
-for (Entry entry : streams.entrySet()) {
-int id = entry.getKey().intValue();
-if (id > maxActiveRemoteStreamId && id <
newMaxActiveRemoteStreamId) {
-if (entry.getValue() instanceof Stream) {
-((Stream) entry.getValue()).closeIfIdle();
-}
+final ConcurrentNavigableMap subMap =
streams.subMap(
+Integer.valueOf(maxActiveRemoteStreamId), false,
+Integer.valueOf(newMaxActiveRemoteStreamId), false);
+for (AbstractNonZeroStream stream : subMap.values()) {
+if (stream instanceof Stream) {
+((Stream)stream).closeIfIdle();
}
}
maxActiveRemoteStreamId = newMaxActiveRemoteStreamId;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Use a link to TestTomcat in Git instead of SVN
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 16181fc Use a link to TestTomcat in Git instead of SVN
16181fc is described below
commit 16181fc7b1930ff202ec2e475f2fbdc587f3e314
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed Sep 30 10:36:50 2020 +0300
Use a link to TestTomcat in Git instead of SVN
---
java/org/apache/catalina/startup/Tomcat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/startup/Tomcat.java
b/java/org/apache/catalina/startup/Tomcat.java
index db6fb8e..e5565d1 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -153,7 +153,7 @@ import org.apache.tomcat.util.res.StringManager;
* see setters for doc. It can be used for simple tests and
* demo.
*
- * @see https://svn.apache.org/repos/asf/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java";>TestTomcat
+ * @see https://gitbox.apache.org/repos/asf?p=tomcat.git;a=blob;f=test/org/apache/catalina/startup/TestTomcat.java";>TestTomcat
* @author Costin Manolache
*/
public class Tomcat {
-
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: Use a link to TestTomcat in Git instead of SVN
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 f95fcd2 Use a link to TestTomcat in Git instead of SVN
f95fcd2 is described below
commit f95fcd204fae01d0034d1cdb8178082361850eec
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed Sep 30 10:36:50 2020 +0300
Use a link to TestTomcat in Git instead of SVN
(cherry picked from commit 16181fc7b1930ff202ec2e475f2fbdc587f3e314)
---
java/org/apache/catalina/startup/Tomcat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/startup/Tomcat.java
b/java/org/apache/catalina/startup/Tomcat.java
index 0811492..88859e8 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -153,7 +153,7 @@ import org.apache.tomcat.util.res.StringManager;
* see setters for doc. It can be used for simple tests and
* demo.
*
- * @see https://svn.apache.org/repos/asf/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java";>TestTomcat
+ * @see https://gitbox.apache.org/repos/asf?p=tomcat.git;a=blob;f=test/org/apache/catalina/startup/TestTomcat.java";>TestTomcat
* @author Costin Manolache
*/
public class Tomcat {
-
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: Use a link to TestTomcat in Git instead of SVN
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 e487719 Use a link to TestTomcat in Git instead of SVN
e487719 is described below
commit e487719b1dff28babedb0eb7873f617b5180f996
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed Sep 30 10:36:50 2020 +0300
Use a link to TestTomcat in Git instead of SVN
(cherry picked from commit 16181fc7b1930ff202ec2e475f2fbdc587f3e314)
---
java/org/apache/catalina/startup/Tomcat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/startup/Tomcat.java
b/java/org/apache/catalina/startup/Tomcat.java
index fd5652e..21120dd 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -149,7 +149,7 @@ import org.apache.tomcat.util.res.StringManager;
* see setters for doc. It can be used for simple tests and
* demo.
*
- * @see https://svn.apache.org/repos/asf/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java";>TestTomcat
+ * @see https://gitbox.apache.org/repos/asf?p=tomcat.git;a=blob;f=test/org/apache/catalina/startup/TestTomcat.java";>TestTomcat
* @author Costin Manolache
*/
public class Tomcat {
-
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: Use a link to TestTomcat in Git instead of SVN
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 c08d2d4 Use a link to TestTomcat in Git instead of SVN
c08d2d4 is described below
commit c08d2d40616c8680a536375419f9719aae0a90ae
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed Sep 30 10:36:50 2020 +0300
Use a link to TestTomcat in Git instead of SVN
(cherry picked from commit 16181fc7b1930ff202ec2e475f2fbdc587f3e314)
---
java/org/apache/catalina/startup/Tomcat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/startup/Tomcat.java
b/java/org/apache/catalina/startup/Tomcat.java
index 67e990d..50515dd 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -147,7 +147,7 @@ import org.apache.tomcat.util.res.StringManager;
* see setters for doc. It can be used for simple tests and
* demo.
*
- * @see https://svn.apache.org/repos/asf/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java";>TestTomcat
+ * @see https://gitbox.apache.org/repos/asf?p=tomcat.git;a=blob;f=test/org/apache/catalina/startup/TestTomcat.java";>TestTomcat
* @author Costin Manolache
*/
public class Tomcat {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: HTTP2 log statement fixes:
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 8185e79 HTTP2 log statement fixes:
8185e79 is described below
commit 8185e79203e9ecb074ea26a1f3e53b497b47ad2b
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed Sep 30 14:55:09 2020 +0300
HTTP2 log statement fixes:
1) http2Parser.processFrameData.lengths: remove comma between name and value
2) stream.header.duplicate: fix the index of the third argument
3) upgradeHandler.initialWindowSize.invalid: remove it, it is not used in
.java code
---
java/org/apache/coyote/http2/LocalStrings.properties | 5 ++---
java/org/apache/coyote/http2/LocalStrings_fr.properties| 3 +--
java/org/apache/coyote/http2/LocalStrings_ja.properties| 3 +--
java/org/apache/coyote/http2/LocalStrings_ko.properties| 3 +--
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 3 +--
5 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index c629a40..ca6e5af 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -60,7 +60,7 @@ http2Parser.processFrame=Connection [{0}], Stream [{1}],
Frame type [{2}], Flags
http2Parser.processFrame.tooMuchPadding=Connection [{0}], Stream [{1}], The
padding length [{2}] was too big for the payload [{3}]
http2Parser.processFrame.unexpectedType=Expected frame type [{0}] but received
frame type [{1}]
http2Parser.processFrameContinuation.notExpected=Connection [{0}],
Continuation frame received for stream [{1}] when no headers were in progress
-http2Parser.processFrameData.lengths=Connection [{0}], Stream [{1}], Data
length, [{2}], Padding length [{3}]
+http2Parser.processFrameData.lengths=Connection [{0}], Stream [{1}], Data
length [{2}], Padding length [{3}]
http2Parser.processFrameData.window=Connection [{0}], Client sent more data
than stream window allowed
http2Parser.processFrameHeaders.decodingDataLeft=Data left over after HPACK
decoding - it should have been consumed
http2Parser.processFrameHeaders.decodingFailed=There was an error during the
HPACK decoding of HTTP headers
@@ -80,7 +80,7 @@ stream.header.case=Connection [{0}], Stream [{1}], HTTP
header name [{2}] must b
stream.header.connection=Connection [{0}], Stream [{1}], HTTP header
[connection] is not permitted in an HTTP/2 request
stream.header.contentLength=Connection [{0}], Stream [{1}], The content length
header value [{2}] does not agree with the size of the data received [{3}]
stream.header.debug=Connection [{0}], Stream [{1}], HTTP header [{2}], Value
[{3}]
-stream.header.duplicate=Connection [{0}], Stream [{1}], received multiple
[{3}] headers
+stream.header.duplicate=Connection [{0}], Stream [{1}], received multiple
[{2}] headers
stream.header.empty=Connection [{0}], Stream [{1}], Invalid empty header name
stream.header.invalid=Connection [{0}], Stream [{1}], The header [{2}]
contained invalid value [{3}]
stream.header.noPath=Connection [{0}], Stream [{1}], The [:path] pseudo header
was empty
@@ -120,7 +120,6 @@ upgradeHandler.connectionError=Connection error
upgradeHandler.dependency.invalid=Connection [{0}], Stream [{1}], Streams may
not depend on themselves
upgradeHandler.goaway.debug=Connection [{0}], Goaway, Last stream [{1}], Error
code [{2}], Debug data [{3}]
upgradeHandler.init=Connection [{0}], State [{1}]
-upgradeHandler.initialWindowSize.invalid=Connection [{0}], Illegal value of
[{1}] ignored for initial window size
upgradeHandler.invalidPreface=Connection [{0}], Invalid connection preface
upgradeHandler.ioerror=Connection [{0}]
upgradeHandler.noAllocation=Connection [{0}], Stream [{1}], Timeout waiting
for allocation
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 04fc51a..7f53857 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -79,7 +79,7 @@ stream.header.case=Connection [{0}], Flux [{1}], Le nom
d''en-tête HTTP [{2}] d
stream.header.connection=Connection [{0}], Flux [{1}], L''en-tête HTTP
[connection] n''est pas autorisé dans une requête HTTP/2
stream.header.contentLength=Connection [{0}], Flux [{1}], La valeur de
l''en-tête content-length [{2}] ne correspond pas à la taille des données reçue
[{3}]
stream.header.debug=Connection [{0}], Flux [{1}], en-tête HTTP [{2}], valeur
[{3}]
-stream.header.duplicate=Connection [{0}], Flux [{1}], Reçu plusieurs en-têtes
[{3}]
+stream.header.duplicate=Connection [{0}], Flux [{1}], Reçu plusieurs en-têtes
[{2}]
stream.header.empty=Connection
[tomcat] branch 9.0.x updated: HTTP2 log statement fixes:
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 8dcf599 HTTP2 log statement fixes:
8dcf599 is described below
commit 8dcf599a0df839226ba18af11e996a8413a04d3a
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed Sep 30 14:55:09 2020 +0300
HTTP2 log statement fixes:
1) http2Parser.processFrameData.lengths: remove comma between name and value
2) stream.header.duplicate: fix the index of the third argument
3) upgradeHandler.initialWindowSize.invalid: remove it, it is not used in
.java code
(cherry picked from commit 8185e79203e9ecb074ea26a1f3e53b497b47ad2b)
---
java/org/apache/coyote/http2/LocalStrings.properties | 5 ++---
java/org/apache/coyote/http2/LocalStrings_fr.properties| 3 +--
java/org/apache/coyote/http2/LocalStrings_ja.properties| 3 +--
java/org/apache/coyote/http2/LocalStrings_ko.properties| 3 +--
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 3 +--
5 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index c629a40..ca6e5af 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -60,7 +60,7 @@ http2Parser.processFrame=Connection [{0}], Stream [{1}],
Frame type [{2}], Flags
http2Parser.processFrame.tooMuchPadding=Connection [{0}], Stream [{1}], The
padding length [{2}] was too big for the payload [{3}]
http2Parser.processFrame.unexpectedType=Expected frame type [{0}] but received
frame type [{1}]
http2Parser.processFrameContinuation.notExpected=Connection [{0}],
Continuation frame received for stream [{1}] when no headers were in progress
-http2Parser.processFrameData.lengths=Connection [{0}], Stream [{1}], Data
length, [{2}], Padding length [{3}]
+http2Parser.processFrameData.lengths=Connection [{0}], Stream [{1}], Data
length [{2}], Padding length [{3}]
http2Parser.processFrameData.window=Connection [{0}], Client sent more data
than stream window allowed
http2Parser.processFrameHeaders.decodingDataLeft=Data left over after HPACK
decoding - it should have been consumed
http2Parser.processFrameHeaders.decodingFailed=There was an error during the
HPACK decoding of HTTP headers
@@ -80,7 +80,7 @@ stream.header.case=Connection [{0}], Stream [{1}], HTTP
header name [{2}] must b
stream.header.connection=Connection [{0}], Stream [{1}], HTTP header
[connection] is not permitted in an HTTP/2 request
stream.header.contentLength=Connection [{0}], Stream [{1}], The content length
header value [{2}] does not agree with the size of the data received [{3}]
stream.header.debug=Connection [{0}], Stream [{1}], HTTP header [{2}], Value
[{3}]
-stream.header.duplicate=Connection [{0}], Stream [{1}], received multiple
[{3}] headers
+stream.header.duplicate=Connection [{0}], Stream [{1}], received multiple
[{2}] headers
stream.header.empty=Connection [{0}], Stream [{1}], Invalid empty header name
stream.header.invalid=Connection [{0}], Stream [{1}], The header [{2}]
contained invalid value [{3}]
stream.header.noPath=Connection [{0}], Stream [{1}], The [:path] pseudo header
was empty
@@ -120,7 +120,6 @@ upgradeHandler.connectionError=Connection error
upgradeHandler.dependency.invalid=Connection [{0}], Stream [{1}], Streams may
not depend on themselves
upgradeHandler.goaway.debug=Connection [{0}], Goaway, Last stream [{1}], Error
code [{2}], Debug data [{3}]
upgradeHandler.init=Connection [{0}], State [{1}]
-upgradeHandler.initialWindowSize.invalid=Connection [{0}], Illegal value of
[{1}] ignored for initial window size
upgradeHandler.invalidPreface=Connection [{0}], Invalid connection preface
upgradeHandler.ioerror=Connection [{0}]
upgradeHandler.noAllocation=Connection [{0}], Stream [{1}], Timeout waiting
for allocation
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 04fc51a..7f53857 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -79,7 +79,7 @@ stream.header.case=Connection [{0}], Flux [{1}], Le nom
d''en-tête HTTP [{2}] d
stream.header.connection=Connection [{0}], Flux [{1}], L''en-tête HTTP
[connection] n''est pas autorisé dans une requête HTTP/2
stream.header.contentLength=Connection [{0}], Flux [{1}], La valeur de
l''en-tête content-length [{2}] ne correspond pas à la taille des données reçue
[{3}]
stream.header.debug=Connection [{0}], Flux [{1}], en-tête HTTP [{2}], valeur
[{3}]
-stream.header.duplicate=Connection [{0}], Flux [{1}], Reçu plusieurs en-têtes
[{3}]
+stream.header.duplicate=Connection [{
[tomcat] branch master updated: Wrap 'error' and 'applicationIOE' with AtomicReference
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 14e5b8c Wrap 'error' and 'applicationIOE' with AtomicReference
14e5b8c is described below
commit 14e5b8c2b1d0a88e6220a08feefba559bec2335e
Author: Martin Tzvetanov Grigorov
AuthorDate: Thu Oct 1 13:29:42 2020 +0300
Wrap 'error' and 'applicationIOE' with AtomicReference
Under high load it is possible that one thread makes the check for non-null
and before the copy another thread to null-fy the member field.
SEVERE: Servlet.service() for servlet [plaintext] in context with path []
threw exception
java.lang.NullPointerException: Cannot throw exception because "ioe" is null
at
org.apache.coyote.http2.Http2UpgradeHandler.handleAppInitiatedIOException(Http2UpgradeHandler.java:797)
at
org.apache.coyote.http2.Http2AsyncUpgradeHandler.handleAsyncException(Http2AsyncUpgradeHandler.java:276)
at
org.apache.coyote.http2.Http2AsyncUpgradeHandler.writeWindowUpdate(Http2AsyncUpgradeHandler.java:252)
at
org.apache.coyote.http2.Stream$StreamInputBuffer.doRead(Stream.java:1088)
at org.apache.coyote.Request.doRead(Request.java:555)
at
org.apache.catalina.connector.InputBuffer.realReadBytes(InputBuffer.java:336)
at
org.apache.catalina.connector.InputBuffer.checkByteBufferEof(InputBuffer.java:632)
at org.apache.catalina.connector.InputBuffer.read(InputBuffer.java:362)
at
org.apache.catalina.connector.CoyoteInputStream.read(CoyoteInputStream.java:132)
at org.apache.catalina.connector.Request.readPostBody(Request.java:3308)
at
org.apache.catalina.connector.Request.parseParameters(Request.java:3241)
at org.apache.catalina.connector.Request.getParameter(Request.java:1124)
at
org.apache.catalina.connector.RequestFacade.getParameter(RequestFacade.java:381)
at
info.mgsolutions.tomcat.PlainTextServlet.doPost(PlainTextServlet.java:41)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:652)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:733)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)
...
---
.../coyote/http2/Http2AsyncUpgradeHandler.java | 36 --
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
index 9c274ac..defbb1c 100644
--- a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -25,6 +25,7 @@ import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
import jakarta.servlet.http.WebConnection;
@@ -43,8 +44,8 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
// Because of the compression used, headers need to be written to the
// network in the same order they are generated.
private final Object headerWriteLock = new Object();
-private Throwable error = null;
-private IOException applicationIOE = null;
+private final AtomicReference error = new AtomicReference<>();
+private final AtomicReference applicationIOE = new
AtomicReference<>();
public Http2AsyncUpgradeHandler(Http2Protocol protocol, Adapter adapter,
Request coyoteRequest) {
@@ -57,7 +58,7 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
}
@Override
public void failed(Throwable t, Void attachment) {
-error = t;
+error.set(t);
}
};
private final CompletionHandler applicationErrorCompletion =
new CompletionHandler() {
@@ -67,9 +68,9 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
@Override
public void failed(Throwable t, Void attachment) {
if (t instanceof IOException) {
-applicationIOE = (IOException) t;
+applicationIOE.set((IOException) t);
}
-error = t;
+error.set(t);
}
};
@@ -109,12 +110,13 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
TimeUnit.MILLISECONDS, null, SocketWrapperBase.COMPLETE_WRITE,
errorCompletion,
ByteBuffer.wrap(localSettings.getSettingsFrameForPending()),
ByteBuffer.wrap(createWindowUpdateForSettings()));
-if (error != null) {
+Throwable err = error.get();
+if (err != null) {
String msg = sm.getString(&qu
[tomcat] branch 9.0.x updated: Wrap 'error' and 'applicationIOE' with AtomicReference
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 a84cdbf Wrap 'error' and 'applicationIOE' with AtomicReference
a84cdbf is described below
commit a84cdbfcdabefef4ed0030f430eecf7435a8ef58
Author: Martin Tzvetanov Grigorov
AuthorDate: Thu Oct 1 13:29:42 2020 +0300
Wrap 'error' and 'applicationIOE' with AtomicReference
Under high load it is possible that one thread makes the check for non-null
and before the copy another thread to null-fy the member field.
SEVERE: Servlet.service() for servlet [plaintext] in context with path []
threw exception
java.lang.NullPointerException: Cannot throw exception because "ioe" is null
at
org.apache.coyote.http2.Http2UpgradeHandler.handleAppInitiatedIOException(Http2UpgradeHandler.java:797)
at
org.apache.coyote.http2.Http2AsyncUpgradeHandler.handleAsyncException(Http2AsyncUpgradeHandler.java:276)
at
org.apache.coyote.http2.Http2AsyncUpgradeHandler.writeWindowUpdate(Http2AsyncUpgradeHandler.java:252)
at
org.apache.coyote.http2.Stream$StreamInputBuffer.doRead(Stream.java:1088)
at org.apache.coyote.Request.doRead(Request.java:555)
at
org.apache.catalina.connector.InputBuffer.realReadBytes(InputBuffer.java:336)
at
org.apache.catalina.connector.InputBuffer.checkByteBufferEof(InputBuffer.java:632)
at org.apache.catalina.connector.InputBuffer.read(InputBuffer.java:362)
at
org.apache.catalina.connector.CoyoteInputStream.read(CoyoteInputStream.java:132)
at org.apache.catalina.connector.Request.readPostBody(Request.java:3308)
at
org.apache.catalina.connector.Request.parseParameters(Request.java:3241)
at org.apache.catalina.connector.Request.getParameter(Request.java:1124)
at
org.apache.catalina.connector.RequestFacade.getParameter(RequestFacade.java:381)
at
info.mgsolutions.tomcat.PlainTextServlet.doPost(PlainTextServlet.java:41)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:652)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:733)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)
...
(cherry picked from commit 71b70117042bf646183e9e0395625dc1dcbf1333)
---
.../coyote/http2/Http2AsyncUpgradeHandler.java | 36 --
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
index eb116a7..2068044 100644
--- a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -25,6 +25,7 @@ import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
import javax.servlet.http.WebConnection;
@@ -43,8 +44,8 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
// Because of the compression used, headers need to be written to the
// network in the same order they are generated.
private final Object headerWriteLock = new Object();
-private Throwable error = null;
-private IOException applicationIOE = null;
+private final AtomicReference error = new AtomicReference<>();
+private final AtomicReference applicationIOE = new
AtomicReference<>();
public Http2AsyncUpgradeHandler(Http2Protocol protocol, Adapter adapter,
Request coyoteRequest) {
@@ -57,7 +58,7 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
}
@Override
public void failed(Throwable t, Void attachment) {
-error = t;
+error.set(t);
}
};
private final CompletionHandler applicationErrorCompletion =
new CompletionHandler() {
@@ -67,9 +68,9 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
@Override
public void failed(Throwable t, Void attachment) {
if (t instanceof IOException) {
-applicationIOE = (IOException) t;
+applicationIOE.set((IOException) t);
}
-error = t;
+error.set(t);
}
};
@@ -109,12 +110,13 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
TimeUnit.MILLISECONDS, null, SocketWrapperBase.COMPLETE_WRITE,
errorCompletion,
ByteBuffer.wrap(localSettings.getSettingsFrameForPending()),
ByteBuffer.wrap(createWindowUpdateForSettings()));
-if (error != null) {
+Throwable err = error.get();
+
[tomcat] branch 9.0.x updated: Update FailedRequestFilter's javadoc
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 b8a0625 Update FailedRequestFilter's javadoc
b8a0625 is described below
commit b8a0625e18395f90c87dfb595641917a094530fe
Author: Martin Tzvetanov Grigorov
AuthorDate: Tue Oct 6 09:44:01 2020 +0300
Update FailedRequestFilter's javadoc
Use same text as at
http://tomcat.apache.org/tomcat-9.0-doc/config/filter.html#Failed_Request_Filter
discussed-at: https://markmail.org/message/ys3el54jmzta5jby
(cherry picked from commit 864b138b3948011219b23a9b754cce3a94abe25e)
---
java/org/apache/catalina/filters/FailedRequestFilter.java | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/filters/FailedRequestFilter.java
b/java/org/apache/catalina/filters/FailedRequestFilter.java
index 2e504e6..7a64737 100644
--- a/java/org/apache/catalina/filters/FailedRequestFilter.java
+++ b/java/org/apache/catalina/filters/FailedRequestFilter.java
@@ -35,11 +35,12 @@ import org.apache.tomcat.util.http.Parameters.FailReason;
* submitted by client are lost.
*
*
- * Note that it has side effect that it triggers parameter parsing and thus
- * consumes the body for POST requests. Parameter parsing does check content
- * type of the request, so there should not be problems with addresses that use
- * request.getInputStream() and request.getReader(),
- * if requests parsed by them do not use standard value for content mime-type.
+ * Note that parameter parsing may consume the body of an HTTP request, so
+ * caution is needed if the servlet protected by this filter uses
+ * request.getInputStream() or request.getReader()
+ * calls. In general the risk of breaking a web application by adding this
+ * filter is not so high, because parameter parsing does check content type
+ * of the request before consuming the request body.
*/
public class FailedRequestFilter extends FilterBase {
-
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: Update FailedRequestFilter's javadoc
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 2b616c2 Update FailedRequestFilter's javadoc
2b616c2 is described below
commit 2b616c2362863c7dc02da68db8b236ab9710fe9d
Author: Martin Tzvetanov Grigorov
AuthorDate: Tue Oct 6 09:44:01 2020 +0300
Update FailedRequestFilter's javadoc
Use same text as at
http://tomcat.apache.org/tomcat-9.0-doc/config/filter.html#Failed_Request_Filter
discussed-at: https://markmail.org/message/ys3el54jmzta5jby
(cherry picked from commit 864b138b3948011219b23a9b754cce3a94abe25e)
---
java/org/apache/catalina/filters/FailedRequestFilter.java | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/filters/FailedRequestFilter.java
b/java/org/apache/catalina/filters/FailedRequestFilter.java
index 2e504e6..7a64737 100644
--- a/java/org/apache/catalina/filters/FailedRequestFilter.java
+++ b/java/org/apache/catalina/filters/FailedRequestFilter.java
@@ -35,11 +35,12 @@ import org.apache.tomcat.util.http.Parameters.FailReason;
* submitted by client are lost.
*
*
- * Note that it has side effect that it triggers parameter parsing and thus
- * consumes the body for POST requests. Parameter parsing does check content
- * type of the request, so there should not be problems with addresses that use
- * request.getInputStream() and request.getReader(),
- * if requests parsed by them do not use standard value for content mime-type.
+ * Note that parameter parsing may consume the body of an HTTP request, so
+ * caution is needed if the servlet protected by this filter uses
+ * request.getInputStream() or request.getReader()
+ * calls. In general the risk of breaking a web application by adding this
+ * filter is not so high, because parameter parsing does check content type
+ * of the request before consuming the request body.
*/
public class FailedRequestFilter extends FilterBase {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Update FailedRequestFilter's javadoc
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 864b138 Update FailedRequestFilter's javadoc
864b138 is described below
commit 864b138b3948011219b23a9b754cce3a94abe25e
Author: Martin Tzvetanov Grigorov
AuthorDate: Tue Oct 6 09:44:01 2020 +0300
Update FailedRequestFilter's javadoc
Use same text as at
http://tomcat.apache.org/tomcat-9.0-doc/config/filter.html#Failed_Request_Filter
discussed-at: https://markmail.org/message/ys3el54jmzta5jby
---
java/org/apache/catalina/filters/FailedRequestFilter.java | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/filters/FailedRequestFilter.java
b/java/org/apache/catalina/filters/FailedRequestFilter.java
index 7c62232..41ee200 100644
--- a/java/org/apache/catalina/filters/FailedRequestFilter.java
+++ b/java/org/apache/catalina/filters/FailedRequestFilter.java
@@ -35,11 +35,12 @@ import org.apache.tomcat.util.http.Parameters.FailReason;
* submitted by client are lost.
*
*
- * Note that it has side effect that it triggers parameter parsing and thus
- * consumes the body for POST requests. Parameter parsing does check content
- * type of the request, so there should not be problems with addresses that use
- * request.getInputStream() and request.getReader(),
- * if requests parsed by them do not use standard value for content mime-type.
+ * Note that parameter parsing may consume the body of an HTTP request, so
+ * caution is needed if the servlet protected by this filter uses
+ * request.getInputStream() or request.getReader()
+ * calls. In general the risk of breaking a web application by adding this
+ * filter is not so high, because parameter parsing does check content type
+ * of the request before consuming the request body.
*/
public class FailedRequestFilter extends FilterBase {
-
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: Update FailedRequestFilter's javadoc
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 ffc8259 Update FailedRequestFilter's javadoc
ffc8259 is described below
commit ffc82592db196ae320820bc0d0b9f9510fb303bf
Author: Martin Tzvetanov Grigorov
AuthorDate: Tue Oct 6 09:44:01 2020 +0300
Update FailedRequestFilter's javadoc
Use same text as at
http://tomcat.apache.org/tomcat-9.0-doc/config/filter.html#Failed_Request_Filter
discussed-at: https://markmail.org/message/ys3el54jmzta5jby
(cherry picked from commit 864b138b3948011219b23a9b754cce3a94abe25e)
---
java/org/apache/catalina/filters/FailedRequestFilter.java | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/filters/FailedRequestFilter.java
b/java/org/apache/catalina/filters/FailedRequestFilter.java
index c2ad5b4..7b2e188 100644
--- a/java/org/apache/catalina/filters/FailedRequestFilter.java
+++ b/java/org/apache/catalina/filters/FailedRequestFilter.java
@@ -38,11 +38,12 @@ import org.apache.tomcat.util.http.Parameters.FailReason;
* submitted by client are lost.
*
*
- * Note that it has side effect that it triggers parameter parsing and thus
- * consumes the body for POST requests. Parameter parsing does check content
- * type of the request, so there should not be problems with addresses that use
- * request.getInputStream() and request.getReader(),
- * if requests parsed by them do not use standard value for content mime-type.
+ * Note that parameter parsing may consume the body of an HTTP request, so
+ * caution is needed if the servlet protected by this filter uses
+ * request.getInputStream() or request.getReader()
+ * calls. In general the risk of breaking a web application by adding this
+ * filter is not so high, because parameter parsing does check content type
+ * of the request before consuming the request body.
*/
public class FailedRequestFilter extends FilterBase implements CometFilter {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix a typo in changelog
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 25b Fix a typo in changelog 25b is described below commit 25b55a4adb5f792dacc1a7418d7112f6f4e8 Author: Martin Tzvetanov Grigorov AuthorDate: Fri Oct 9 10:21:49 2020 +0300 Fix a typo in changelog --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ec41058..d50d331 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -61,7 +61,7 @@ Refactor the HTTP/2 window update handling for padding in data frames to ensure that the connection window is correctly updated after a data -frame with zero lngth padding is received. (markt) +frame with zero length padding is received. (markt) - 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 a typo in changelog
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 2cc9522 Fix a typo in changelog 2cc9522 is described below commit 2cc95227675345097a803f60682592a851d0c2d5 Author: Martin Tzvetanov Grigorov AuthorDate: Fri Oct 9 10:21:49 2020 +0300 Fix a typo in changelog (cherry picked from commit 25b55a4adb5f792dacc1a7418d7112f6f4e8) --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 07bdea9..64d42d9 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -61,7 +61,7 @@ Refactor the HTTP/2 window update handling for padding in data frames to ensure that the connection window is correctly updated after a data -frame with zero lngth padding is received. (markt) +frame with zero length padding is received. (markt) - 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 a typo in changelog
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 c31df67 Fix a typo in changelog c31df67 is described below commit c31df679a20339e4737db8774064ce1b9e065579 Author: Martin Tzvetanov Grigorov AuthorDate: Fri Oct 9 10:21:49 2020 +0300 Fix a typo in changelog (cherry picked from commit 25b55a4adb5f792dacc1a7418d7112f6f4e8) --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 3012e9a..f32c1a7 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -64,7 +64,7 @@ Refactor the HTTP/2 window update handling for padding in data frames to ensure that the connection window is correctly updated after a data -frame with zero lngth padding is received. (markt) +frame with zero length padding is received. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Remove the entry for org.apache.tomcat.util.descriptor.tld.LocalStrings from tomcat-embed-core's GraalVM tomcat-resource.json. It no more part of the jar since https://
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 cf5130a Remove the entry for
org.apache.tomcat.util.descriptor.tld.LocalStrings from tomcat-embed-core's
GraalVM tomcat-resource.json. It no more part of the jar since
https://github.com/apache/tomcat/commit/3815b4951eb3acd30a0b77aafa75fbdb928d5782
( Fix unwanted JPMS dependency of embed-core on embed-jasper )
cf5130a is described below
commit cf5130a39348e20966faf89f4c3e2183f37ad73a
Author: Martin Tzvetanov Grigorov
AuthorDate: Mon Oct 19 10:25:59 2020 +0300
Remove the entry for org.apache.tomcat.util.descriptor.tld.LocalStrings
from tomcat-embed-core's GraalVM tomcat-resource.json. It no more part of
the jar
since
https://github.com/apache/tomcat/commit/3815b4951eb3acd30a0b77aafa75fbdb928d5782
( Fix unwanted JPMS dependency of embed-core on embed-jasper )
---
res/graal/tomcat-embed-core/native-image/tomcat-resource.json | 1 -
webapps/docs/changelog.xml| 6 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
b/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
index 577c660..3c8d079 100644
--- a/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
+++ b/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
@@ -36,7 +36,6 @@
{"name":"org.apache.tomcat.util.codec.binary.LocalStrings"},
{"name":"org.apache.tomcat.util.compat.LocalStrings"},
{"name":"org.apache.tomcat.util.descriptor.LocalStrings"},
-{"name":"org.apache.tomcat.util.descriptor.tld.LocalStrings"},
{"name":"org.apache.tomcat.util.descriptor.web.LocalStrings"},
{"name":"org.apache.tomcat.util.digester.LocalStrings"},
{"name":"org.apache.tomcat.util.http.LocalStrings"},
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 55c7a7f..0e182f2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -63,6 +63,12 @@
retries are made on a new connection, just like with the single
connection scenario. (remm)
+
+Remove the entry for
org.apache.tomcat.util.descriptor.tld.LocalStrings
+from tomcat-embed-core's GraalVM tomcat-resource.json. It no more part
of the jar
+since https://github.com/apache/tomcat/commit/3815b4951eb3acd30a0b77aafa75fbdb928d5782";>
+Fix unwanted JPMS dependency of embed-core on embed-jasper.
(mgrigorov)
+
Add JsonErrorReportValve that extends the
ErrorReportValve that returns response as JSON instead of
-
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: Remove the entry for org.apache.tomcat.util.descriptor.tld.LocalStrings from tomcat-embed-core's GraalVM tomcat-resource.json. It no more part of the jar since https://g
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 515e856 Remove the entry for
org.apache.tomcat.util.descriptor.tld.LocalStrings from tomcat-embed-core's
GraalVM tomcat-resource.json. It no more part of the jar since
https://github.com/apache/tomcat/commit/3815b4951eb3acd30a0b77aafa75fbdb928d5782
( Fix unwanted JPMS dependency of embed-core on embed-jasper )
515e856 is described below
commit 515e85615e4f8bdbafae7c74da9f441aa1bfe515
Author: Martin Tzvetanov Grigorov
AuthorDate: Mon Oct 19 10:25:59 2020 +0300
Remove the entry for org.apache.tomcat.util.descriptor.tld.LocalStrings
from tomcat-embed-core's GraalVM tomcat-resource.json. It no more part of
the jar
since
https://github.com/apache/tomcat/commit/3815b4951eb3acd30a0b77aafa75fbdb928d5782
( Fix unwanted JPMS dependency of embed-core on embed-jasper )
(cherry picked from commit cf5130a39348e20966faf89f4c3e2183f37ad73a)
---
res/graal/tomcat-embed-core/native-image/tomcat-resource.json | 1 -
webapps/docs/changelog.xml| 6 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
b/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
index d57c718..4b5cc5d 100644
--- a/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
+++ b/res/graal/tomcat-embed-core/native-image/tomcat-resource.json
@@ -36,7 +36,6 @@
{"name":"org.apache.tomcat.util.codec.binary.LocalStrings"},
{"name":"org.apache.tomcat.util.compat.LocalStrings"},
{"name":"org.apache.tomcat.util.descriptor.LocalStrings"},
-{"name":"org.apache.tomcat.util.descriptor.tld.LocalStrings"},
{"name":"org.apache.tomcat.util.descriptor.web.LocalStrings"},
{"name":"org.apache.tomcat.util.digester.LocalStrings"},
{"name":"org.apache.tomcat.util.http.LocalStrings"},
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1cbbb49..90b6f97 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -63,6 +63,12 @@
retries are made on a new connection, just like with the single
connection scenario. (remm)
+
+Remove the entry for
org.apache.tomcat.util.descriptor.tld.LocalStrings
+from tomcat-embed-core's GraalVM tomcat-resource.json. It no more part
of the jar
+since https://github.com/apache/tomcat/commit/3815b4951eb3acd30a0b77aafa75fbdb928d5782";>
+Fix unwanted JPMS dependency of embed-core on embed-jasper.
(mgrigorov)
+
Add JsonErrorReportValve that extends the
ErrorReportValve that returns response as JSON instead of
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Make it possible to use Http11Nio2Protocol in GraalVM native image
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 6f934c7 Make it possible to use Http11Nio2Protocol in GraalVM native
image
6f934c7 is described below
commit 6f934c7f6e204321f5add7e66a37036f00f80075
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed Oct 21 10:19:44 2020 +0300
Make it possible to use Http11Nio2Protocol in GraalVM native image
---
res/graal/tomcat-embed-core/native-image/tomcat-reflection.json | 1 +
webapps/docs/changelog.xml | 4
2 files changed, 5 insertions(+)
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
b/res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
index ee96509..863ceef 100644
--- a/res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
+++ b/res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
@@ -41,6 +41,7 @@
{ "name":"org.apache.catalina.servlets.DefaultServlet",
"allDeclaredFields":true, "allDeclaredMethods":true },
{ "name":"org.apache.catalina.valves.ErrorReportValve", "methods" : [{"name":
"","parameterTypes":[]}] },
{ "name":"org.apache.coyote.http11.Http11NioProtocol", "methods" : [{"name":
"","parameterTypes":[]}] },
+{ "name":"org.apache.coyote.http11.Http11Nio2Protocol", "methods" : [{"name":
"","parameterTypes":[]}] },
{ "name":"org.apache.coyote.http11.Http11AprProtocol",
"allDeclaredConstructors" : true, "allPublicConstructors" : true,
"allDeclaredMethods" : true, "allPublicMethods" : true},
{ "name":"org.apache.coyote.UpgradeProtocol" },
{ "name":"org.apache.coyote.Request",
"methods":[{"name":"","parameterTypes":[] }] },
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1f72a47..e64cc03 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -70,6 +70,10 @@
since https://github.com/apache/tomcat/commit/3815b4951eb3acd30a0b77aafa75fbdb928d5782";>
Fix unwanted JPMS dependency of embed-core on embed-jasper.
(mgrigorov)
+
+Add org.apache.coyote.http11.Http11Nio2Protocol to the list of classes
which could be instantiated
+via reflection in GraalVM. (mgrigorov)
+
Add JsonErrorReportValve that extends the
ErrorReportValve that returns response as JSON instead of
-
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: Make it possible to use Http11Nio2Protocol in GraalVM native image
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 803fc20 Make it possible to use Http11Nio2Protocol in GraalVM native
image
803fc20 is described below
commit 803fc20b615fec5f1e269ee04b6a08bd3098abee
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed Oct 21 10:19:44 2020 +0300
Make it possible to use Http11Nio2Protocol in GraalVM native image
(cherry picked from commit 6f934c7f6e204321f5add7e66a37036f00f80075)
---
res/graal/tomcat-embed-core/native-image/tomcat-reflection.json | 1 +
webapps/docs/changelog.xml | 4
2 files changed, 5 insertions(+)
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
b/res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
index f4d6560..fefe562 100644
--- a/res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
+++ b/res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
@@ -41,6 +41,7 @@
{ "name":"org.apache.catalina.servlets.DefaultServlet",
"allDeclaredFields":true, "allDeclaredMethods":true },
{ "name":"org.apache.catalina.valves.ErrorReportValve", "methods" : [{"name":
"","parameterTypes":[]}] },
{ "name":"org.apache.coyote.http11.Http11NioProtocol", "methods" : [{"name":
"","parameterTypes":[]}] },
+{ "name":"org.apache.coyote.http11.Http11Nio2Protocol", "methods" : [{"name":
"","parameterTypes":[]}] },
{ "name":"org.apache.coyote.http11.Http11AprProtocol",
"allDeclaredConstructors" : true, "allPublicConstructors" : true,
"allDeclaredMethods" : true, "allPublicMethods" : true},
{ "name":"org.apache.coyote.UpgradeProtocol" },
{ "name":"org.apache.coyote.Request",
"methods":[{"name":"","parameterTypes":[] }] },
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 85220d4..4bf0caf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -70,6 +70,10 @@
since https://github.com/apache/tomcat/commit/3815b4951eb3acd30a0b77aafa75fbdb928d5782";>
Fix unwanted JPMS dependency of embed-core on embed-jasper.
(mgrigorov)
+
+Add org.apache.coyote.http11.Http11Nio2Protocol to the list of classes
which could be instantiated
+via reflection in GraalVM. (mgrigorov)
+
Add JsonErrorReportValve that extends the
ErrorReportValve that returns response as JSON instead of
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Add GraalVM config for Tomcat JNI
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 c6f5764 Add GraalVM config for Tomcat JNI
c6f5764 is described below
commit c6f576416900a4e72aa9a2d8ddf97b1e41f1220a
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed Oct 21 11:59:30 2020 +0300
Add GraalVM config for Tomcat JNI
This way it is possible to use the APR connector in GraalVM native images
---
.../native-image/native-image.properties | 2 +-
.../tomcat-embed-core/native-image/tomcat-jni.json | 34 ++
webapps/docs/changelog.xml | 4 +++
3 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/res/graal/tomcat-embed-core/native-image/native-image.properties
b/res/graal/tomcat-embed-core/native-image/native-image.properties
index 29b501f..5cbfb55 100644
--- a/res/graal/tomcat-embed-core/native-image/native-image.properties
+++ b/res/graal/tomcat-embed-core/native-image/native-image.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
\ No newline at end of file
+Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
-H:JNIConfigurationResources=${.}/tomcat-jni.json
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-jni.json
b/res/graal/tomcat-embed-core/native-image/tomcat-jni.json
new file mode 100644
index 000..d53270c
--- /dev/null
+++ b/res/graal/tomcat-embed-core/native-image/tomcat-jni.json
@@ -0,0 +1,34 @@
+[
+ { "name":"org.apache.tomcat.jni.Address", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
+ { "name":"org.apache.tomcat.jni.Buffer", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
+ { "name":"org.apache.tomcat.jni.Directory", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
+ { "name":"org.apache.tomcat.jni.Error", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
+ { "name":"org.apache.tomcat.jni.File", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
+ { "name":"org.apache.tomcat.jni.FileInfo", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
+ { "name":"org.apache.tomcat.jni.Global", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
+ { "name":"org.apache.tomcat.jni.Library", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
+ { "name":"org.apache.tomcat.jni.Local", "allDeclaredConstructors" :
true,"allP
[tomcat] branch 9.0.x updated: Add GraalVM config for Tomcat JNI
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 6287552 Add GraalVM config for Tomcat JNI
6287552 is described below
commit 6287552d9a14b698990954c6591f5f8512bc4a78
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed Oct 21 11:59:30 2020 +0300
Add GraalVM config for Tomcat JNI
This way it is possible to use the APR connector in GraalVM native images
(cherry picked from commit c6f576416900a4e72aa9a2d8ddf97b1e41f1220a)
---
.../native-image/native-image.properties | 2 +-
.../tomcat-embed-core/native-image/tomcat-jni.json | 34 ++
webapps/docs/changelog.xml | 4 +++
3 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/res/graal/tomcat-embed-core/native-image/native-image.properties
b/res/graal/tomcat-embed-core/native-image/native-image.properties
index 29b501f..5cbfb55 100644
--- a/res/graal/tomcat-embed-core/native-image/native-image.properties
+++ b/res/graal/tomcat-embed-core/native-image/native-image.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
\ No newline at end of file
+Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
-H:JNIConfigurationResources=${.}/tomcat-jni.json
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-jni.json
b/res/graal/tomcat-embed-core/native-image/tomcat-jni.json
new file mode 100644
index 000..d53270c
--- /dev/null
+++ b/res/graal/tomcat-embed-core/native-image/tomcat-jni.json
@@ -0,0 +1,34 @@
+[
+ { "name":"org.apache.tomcat.jni.Address", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
+ { "name":"org.apache.tomcat.jni.Buffer", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
+ { "name":"org.apache.tomcat.jni.Directory", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
+ { "name":"org.apache.tomcat.jni.Error", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
+ { "name":"org.apache.tomcat.jni.File", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
+ { "name":"org.apache.tomcat.jni.FileInfo", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
+ { "name":"org.apache.tomcat.jni.Global", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
+ { "name":"org.apache.tomcat.jni.Library", "allDeclaredConstructors" :
true,"allPublicConstructors" : true,"allDeclaredMethods" :
true,"allPublicMethods" : true,"allDeclaredClasses" : true,"allPublicClasses" :
true,"allPublicFields" : true,"allDeclaredFields" : true},
+ { "name":&q
[tomcat] branch master updated: Don't activate Tomcat's GraalVM JNI resources by default
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 20edb41 Don't activate Tomcat's GraalVM JNI resources by default
20edb41 is described below
commit 20edb410286fdfe141dc0178f361493d4f3ca72c
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed Nov 11 10:06:31 2020 +0200
Don't activate Tomcat's GraalVM JNI resources by default
If an application needs to use APR protocol then it could activate the JNI
config by adding
'-H:JNIConfigurationResources=META-INF/native-image/org.apache.tomcat.embed/tomcat-embed-core/tomcat-jni.json'
to native-image's arguments
https://bz.apache.org/bugzilla/show_bug.cgi?id=64875
---
res/graal/tomcat-embed-core/native-image/native-image.properties | 2 +-
webapps/docs/changelog.xml | 5 -
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/res/graal/tomcat-embed-core/native-image/native-image.properties
b/res/graal/tomcat-embed-core/native-image/native-image.properties
index 5cbfb55..8944701 100644
--- a/res/graal/tomcat-embed-core/native-image/native-image.properties
+++ b/res/graal/tomcat-embed-core/native-image/native-image.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
-H:JNIConfigurationResources=${.}/tomcat-jni.json
+Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c49ff08..a1b224c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -85,7 +85,10 @@
Add GraalVM config for Tomcat JNI related classes. This makes it
-possible to use the APR protocol in GraalVM native images. (mgrigorov)
+possible to use the APR protocol in GraalVM native images.
+To use it add the following to the native-image arguments:
+
-H:JNIConfigurationResources=META-INF/native-image/org.apache.tomcat.embed/tomcat-embed-core/tomcat-jni.json
+(mgrigorov)
JNDIRealm connections should only be created with the container
-
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: Don't activate Tomcat's GraalVM JNI resources by default
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 447d24c Don't activate Tomcat's GraalVM JNI resources by default
447d24c is described below
commit 447d24c773dc9bafb7a37bbc583dea5242644065
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed Nov 11 10:06:31 2020 +0200
Don't activate Tomcat's GraalVM JNI resources by default
If an application needs to use APR protocol then it could activate the JNI
config by adding
'-H:JNIConfigurationResources=META-INF/native-image/org.apache.tomcat.embed/tomcat-embed-core/tomcat-jni.json'
to native-image's arguments
https://bz.apache.org/bugzilla/show_bug.cgi?id=64875
(cherry picked from commit 20edb410286fdfe141dc0178f361493d4f3ca72c)
---
res/graal/tomcat-embed-core/native-image/native-image.properties | 2 +-
webapps/docs/changelog.xml | 7 +--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/res/graal/tomcat-embed-core/native-image/native-image.properties
b/res/graal/tomcat-embed-core/native-image/native-image.properties
index 5cbfb55..8944701 100644
--- a/res/graal/tomcat-embed-core/native-image/native-image.properties
+++ b/res/graal/tomcat-embed-core/native-image/native-image.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
-H:JNIConfigurationResources=${.}/tomcat-jni.json
+Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0a1a928..84c09d0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -80,8 +80,11 @@
HTML. (kfujino)
-Add GraalVM config for Tomcat JNI related classes. This makes it
possible to use the APR
-protocol in GraalVM native images. (mgrigorov)
+Add GraalVM config for Tomcat JNI related classes. This makes it
+possible to use the APR protocol in GraalVM native images.
+To use it add the following to the native-image arguments:
+
-H:JNIConfigurationResources=META-INF/native-image/org.apache.tomcat.embed/tomcat-embed-core/tomcat-jni.json
+(mgrigorov)
JNDIRealm connections should only be created with the container
-
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: Don't activate Tomcat's GraalVM JNI resources by default
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 447d24c Don't activate Tomcat's GraalVM JNI resources by default
447d24c is described below
commit 447d24c773dc9bafb7a37bbc583dea5242644065
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed Nov 11 10:06:31 2020 +0200
Don't activate Tomcat's GraalVM JNI resources by default
If an application needs to use APR protocol then it could activate the JNI
config by adding
'-H:JNIConfigurationResources=META-INF/native-image/org.apache.tomcat.embed/tomcat-embed-core/tomcat-jni.json'
to native-image's arguments
https://bz.apache.org/bugzilla/show_bug.cgi?id=64875
(cherry picked from commit 20edb410286fdfe141dc0178f361493d4f3ca72c)
---
res/graal/tomcat-embed-core/native-image/native-image.properties | 2 +-
webapps/docs/changelog.xml | 7 +--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/res/graal/tomcat-embed-core/native-image/native-image.properties
b/res/graal/tomcat-embed-core/native-image/native-image.properties
index 5cbfb55..8944701 100644
--- a/res/graal/tomcat-embed-core/native-image/native-image.properties
+++ b/res/graal/tomcat-embed-core/native-image/native-image.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
-H:JNIConfigurationResources=${.}/tomcat-jni.json
+Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0a1a928..84c09d0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -80,8 +80,11 @@
HTML. (kfujino)
-Add GraalVM config for Tomcat JNI related classes. This makes it
possible to use the APR
-protocol in GraalVM native images. (mgrigorov)
+Add GraalVM config for Tomcat JNI related classes. This makes it
+possible to use the APR protocol in GraalVM native images.
+To use it add the following to the native-image arguments:
+
-H:JNIConfigurationResources=META-INF/native-image/org.apache.tomcat.embed/tomcat-embed-core/tomcat-jni.json
+(mgrigorov)
JNDIRealm connections should only be created with the container
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Don't activate Tomcat's GraalVM JNI resources by default
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 20edb41 Don't activate Tomcat's GraalVM JNI resources by default
20edb41 is described below
commit 20edb410286fdfe141dc0178f361493d4f3ca72c
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed Nov 11 10:06:31 2020 +0200
Don't activate Tomcat's GraalVM JNI resources by default
If an application needs to use APR protocol then it could activate the JNI
config by adding
'-H:JNIConfigurationResources=META-INF/native-image/org.apache.tomcat.embed/tomcat-embed-core/tomcat-jni.json'
to native-image's arguments
https://bz.apache.org/bugzilla/show_bug.cgi?id=64875
---
res/graal/tomcat-embed-core/native-image/native-image.properties | 2 +-
webapps/docs/changelog.xml | 5 -
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/res/graal/tomcat-embed-core/native-image/native-image.properties
b/res/graal/tomcat-embed-core/native-image/native-image.properties
index 5cbfb55..8944701 100644
--- a/res/graal/tomcat-embed-core/native-image/native-image.properties
+++ b/res/graal/tomcat-embed-core/native-image/native-image.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
-H:JNIConfigurationResources=${.}/tomcat-jni.json
+Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c49ff08..a1b224c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -85,7 +85,10 @@
Add GraalVM config for Tomcat JNI related classes. This makes it
-possible to use the APR protocol in GraalVM native images. (mgrigorov)
+possible to use the APR protocol in GraalVM native images.
+To use it add the following to the native-image arguments:
+
-H:JNIConfigurationResources=META-INF/native-image/org.apache.tomcat.embed/tomcat-embed-core/tomcat-jni.json
+(mgrigorov)
JNDIRealm connections should only be created with the container
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo in method's javadoc (#429)
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 40920f6 Fix typo in method's javadoc (#429)
40920f6 is described below
commit 40920f6522f3f390a503738dd943a1a5be5b96b2
Author: Shi.Kun <34267068+pachul...@users.noreply.github.com>
AuthorDate: Wed Jun 30 19:06:59 2021 +0800
Fix typo in method's javadoc (#429)
s/contain/container/
---
java/jakarta/servlet/ServletOutputStream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/jakarta/servlet/ServletOutputStream.java
b/java/jakarta/servlet/ServletOutputStream.java
index d788b08..86a57c6 100644
--- a/java/jakarta/servlet/ServletOutputStream.java
+++ b/java/jakarta/servlet/ServletOutputStream.java
@@ -282,7 +282,7 @@ public abstract class ServletOutputStream extends
OutputStream {
* false, it will cause a callback to
* {@link WriteListener#onWritePossible()} when the buffer has emptied. If
* this method returns false no further data must be written
- * until the contain calls {@link WriteListener#onWritePossible()}.
+ * until the container calls {@link WriteListener#onWritePossible()}.
*
* @return true if data can be written, else
false
*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Fix typo in method's javadoc (#429)
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 7ccef09 Fix typo in method's javadoc (#429)
7ccef09 is described below
commit 7ccef0989324f3428d3ce6d6edabf18d43e6f0c0
Author: Shi.Kun <34267068+pachul...@users.noreply.github.com>
AuthorDate: Wed Jun 30 19:06:59 2021 +0800
Fix typo in method's javadoc (#429)
s/contain/container/
(cherry picked from commit 40920f6522f3f390a503738dd943a1a5be5b96b2)
---
java/jakarta/servlet/ServletOutputStream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/jakarta/servlet/ServletOutputStream.java
b/java/jakarta/servlet/ServletOutputStream.java
index d788b08..86a57c6 100644
--- a/java/jakarta/servlet/ServletOutputStream.java
+++ b/java/jakarta/servlet/ServletOutputStream.java
@@ -282,7 +282,7 @@ public abstract class ServletOutputStream extends
OutputStream {
* false, it will cause a callback to
* {@link WriteListener#onWritePossible()} when the buffer has emptied. If
* this method returns false no further data must be written
- * until the contain calls {@link WriteListener#onWritePossible()}.
+ * until the container calls {@link WriteListener#onWritePossible()}.
*
* @return true if data can be written, else
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: Fix typo in method's javadoc (#429)
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 26d5fe4 Fix typo in method's javadoc (#429)
26d5fe4 is described below
commit 26d5fe47268dccbc35a62844a5fbe2f0167fef8f
Author: Shi.Kun <34267068+pachul...@users.noreply.github.com>
AuthorDate: Wed Jun 30 19:06:59 2021 +0800
Fix typo in method's javadoc (#429)
s/contain/container/
(cherry picked from commit 40920f6522f3f390a503738dd943a1a5be5b96b2)
---
java/javax/servlet/ServletOutputStream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/javax/servlet/ServletOutputStream.java
b/java/javax/servlet/ServletOutputStream.java
index bf40d97..7cc1d38 100644
--- a/java/javax/servlet/ServletOutputStream.java
+++ b/java/javax/servlet/ServletOutputStream.java
@@ -282,7 +282,7 @@ public abstract class ServletOutputStream extends
OutputStream {
* false, it will cause a callback to
* {@link WriteListener#onWritePossible()} when the buffer has emptied. If
* this method returns false no further data must be written
- * until the contain calls {@link WriteListener#onWritePossible()}.
+ * until the container calls {@link WriteListener#onWritePossible()}.
*
* @return true if data can be written, else
false
*
-
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 typo in method's javadoc (#429)
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 bcee3ac Fix typo in method's javadoc (#429)
bcee3ac is described below
commit bcee3ac19a6b4d41fc343db175cf0abb4b0ac3fc
Author: Shi.Kun <34267068+pachul...@users.noreply.github.com>
AuthorDate: Wed Jun 30 19:06:59 2021 +0800
Fix typo in method's javadoc (#429)
s/contain/container/
(cherry picked from commit 40920f6522f3f390a503738dd943a1a5be5b96b2)
---
java/javax/servlet/ServletOutputStream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/javax/servlet/ServletOutputStream.java
b/java/javax/servlet/ServletOutputStream.java
index bf40d97..7cc1d38 100644
--- a/java/javax/servlet/ServletOutputStream.java
+++ b/java/javax/servlet/ServletOutputStream.java
@@ -282,7 +282,7 @@ public abstract class ServletOutputStream extends
OutputStream {
* false, it will cause a callback to
* {@link WriteListener#onWritePossible()} when the buffer has emptied. If
* this method returns false no further data must be written
- * until the contain calls {@link WriteListener#onWritePossible()}.
+ * until the container calls {@link WriteListener#onWritePossible()}.
*
* @return true if data can be written, else
false
*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1872383 - /tomcat/site/trunk/docs/native-1.1-doc/index.html
Author: mgrigorov Date: Mon Jan 6 14:38:42 2020 New Revision: 1872383 URL: http://svn.apache.org/viewvc?rev=1872383&view=rev Log: Fix the name of the Debian package for libapr1-dev Modified: tomcat/site/trunk/docs/native-1.1-doc/index.html Modified: tomcat/site/trunk/docs/native-1.1-doc/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-1.1-doc/index.html?rev=1872383&r1=1872382&r2=1872383&view=diff == --- tomcat/site/trunk/docs/native-1.1-doc/index.html (original) +++ tomcat/site/trunk/docs/native-1.1-doc/index.html Mon Jan 6 14:38:42 2020 @@ -60,7 +60,7 @@ Tomcat Native 1.1.34 Stable. In debian based Linux those dependencies could be installed by something like: -apt-get install libapr1.0-dev libssl-dev +apt-get install libapr1-dev libssl-dev In rpm based Linux those dependencies could be installed by something like: @@ -187,4 +187,4 @@ INFO: Initializing Coyote HTTP/1.1 on ht Copyright © 2008-2015, The Apache Software Foundation - \ No newline at end of file + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch master updated: Replace usage of 'svn' in the documentation with 'git'
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-native.git The following commit(s) were added to refs/heads/master by this push: new 66c8296 Replace usage of 'svn' in the documentation with 'git' 66c8296 is described below commit 66c8296137a80b35e24bda542bb2abb8d8dbae39 Author: Martin Tzvetanov Grigorov AuthorDate: Tue Jan 7 17:17:12 2020 +0200 Replace usage of 'svn' in the documentation with 'git' --- native/BUILDING | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/native/BUILDING b/native/BUILDING index f3dd72b..d175332 100644 --- a/native/BUILDING +++ b/native/BUILDING @@ -22,13 +22,13 @@ Linux / Unix / OSX (dynamic linking) Install OpenSSL version 1.0.2 or higher Install APR version 1.4.0 or higher. - Download and expand the source package or use an svn checkout + Download and expand the source package or use an git checkout > cd native 2. Configure build environment - Note: This step is only required if you are building from an svn checkout. It + Note: This step is only required if you are building from an git checkout. It is not required when building from a source package. > sh buildconf --with-apr=apr_source_location. @@ -88,7 +88,7 @@ Windows 2. Obtain tc-native source - Download and expand the source package or use an svn checkout + Download and expand the source package or use an git checkout 3. Build APR - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] 01/01: Install libtcnative** files in $prefix/bin folder
This is an automated email from the ASF dual-hosted git repository. mgrigorov pushed a commit to branch feature/install-libtcnative-in-catalina-bin-folder in repository https://gitbox.apache.org/repos/asf/tomcat-native.git commit 0fc2e32a645abbf97a8f93c8e5cce8561842fbe3 Author: Martin Tzvetanov Grigorov AuthorDate: Thu Jan 9 08:52:41 2020 +0200 Install libtcnative** files in $prefix/bin folder $prefix == $CATALINA_HOME As explained by Remy Maucherat at https://markmail.org/message/3fb7o7xljawktilr the native libraries should be installed at $CATALINA_HOME/bin instead of $CATALINA_HOME/lib folder. --- native/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native/Makefile.in b/native/Makefile.in index 6e6c68a..1780faa 100644 --- a/native/Makefile.in +++ b/native/Makefile.in @@ -84,7 +84,7 @@ install: $(TARGET_LIB) list='$(INSTALL_SUBDIRS)'; for i in $$list; do \ ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \ done - $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir) + $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(bindir) $(TARGET_LIB): $(OBJECTS) $(LINK) @lib_target@ $(TCNATIVE_LDFLAGS) $(TCNATIVE_LIBS) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch feature/install-libtcnative-in-catalina-bin-folder created (now 0fc2e32)
This is an automated email from the ASF dual-hosted git repository. mgrigorov pushed a change to branch feature/install-libtcnative-in-catalina-bin-folder in repository https://gitbox.apache.org/repos/asf/tomcat-native.git. at 0fc2e32 Install libtcnative** files in $prefix/bin folder This branch includes the following new commits: new 0fc2e32 Install libtcnative** files in $prefix/bin folder The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (920ee08 -> b1225c9)
This is an automated email from the ASF dual-hosted git repository. mgrigorov pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 920ee08 Silence checkstyle warnings add b1225c9 Bugzilla Id: 64067 - Improve the exception message a bit No new revisions were added by this update. Summary of changes: java/org/apache/catalina/valves/rewrite/QuotedStringTokenizer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1872869 - /tomcat/site/trunk/docs/native-doc/index.html
Author: mgrigorov Date: Thu Jan 16 09:13:39 2020 New Revision: 1872869 URL: http://svn.apache.org/viewvc?rev=1872869&view=rev Log: Fix the name of the Debian/Ubuntu package for libapr1-dev Modified: tomcat/site/trunk/docs/native-doc/index.html Modified: tomcat/site/trunk/docs/native-doc/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/index.html?rev=1872869&r1=1872868&r2=1872869&view=diff == --- tomcat/site/trunk/docs/native-doc/index.html (original) +++ tomcat/site/trunk/docs/native-doc/index.html Thu Jan 16 09:13:39 2020 @@ -53,9 +53,9 @@ list of changes. - In debian based Linux those dependencies could be installed by something like: + In Debian based Linux those dependencies could be installed by something like: -apt-get install libapr1.0-dev libssl-dev +apt-get install libapr1-dev libssl-dev In rpm based Linux those dependencies could be installed by something like: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (c69d80a -> f386fbb)
This is an automated email from the ASF dual-hosted git repository. mgrigorov pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from c69d80a Make UTF-8 the default request and response encoding new e6ebd23 Test Tomcat on ARM64 at TravisCI new f00ac55 Merge branch 'master' into feature/build-tomcat-on-arm64 new f386fbb Merge pull request #236 from martin-g/feature/build-tomcat-on-arm64 The 21785 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: .travis.yml| 67 ++ .travis/antTest.sh | 8 +++ 2 files changed, 75 insertions(+) create mode 100644 .travis.yml create mode 100755 .travis/antTest.sh - 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: Test Tomcat on ARM64 at TravisCI
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 58a490b Test Tomcat on ARM64 at TravisCI 58a490b is described below commit 58a490bfa7429d33cd3437b8470569daa7d9be30 Author: Martin Tzvetanov Grigorov AuthorDate: Thu Jan 23 11:53:22 2020 +0200 Test Tomcat on ARM64 at TravisCI (cherry picked from commit e6ebd2346850a14c3ff59a2372169a167958e024) --- .travis.yml| 67 ++ .travis/antTest.sh | 8 +++ 2 files changed, 75 insertions(+) diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000..04a14c9 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,67 @@ +dist: bionic +language: java +jdk: oraclejdk8 +arch: arm64 + +addons: +apt: + packages: +- ant +- build-essential +- automake +- autoconf +- tar +- libssl-dev +- subversion +- git +- libtool-bin + +install: +- ARCH=`uname -p` +- echo $ARCH +- JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz"; +- JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz"; +- if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; else JDK_URL=$JDK_X64; fi +- wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz +- mv jdk8* jdk +- export JAVA_HOME=`pwd`/jdk +- wget -q http://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.7-bin.tar.gz && tar xzf apache-ant-*-bin.tar.gz +- export ANT_HOME=`pwd`/apache-ant-1.10.7 +- export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH" +- java -version +- ant -version +- rm -rf $HOME/tmp +- export CURR_PWD=`pwd` +- svn co -q https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x/ $HOME/tmp/apr +- cd $HOME/tmp/apr +- ./buildconf +- ./configure --prefix=$HOME/tmp/apr-build +- make +- make install +- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/tmp/apr-build/lib" +- git clone -q https://github.com/apache/tomcat-native.git $HOME/tmp/tomcat-native +- cd $HOME/tmp/tomcat-native/native +- sh buildconf --with-apr=$HOME/tmp/apr +- ./configure --with-apr=$HOME/tmp/apr --with-java-home=$JAVA_HOME --with-ssl=yes --prefix=$HOME/tmp/tomcat-native-build +- make +- make install +- cd $CURR_PWD +- yes | cp build.properties.default build.properties +- echo "test.threads=16" >> build.properties +- echo "test.relaxTiming=true" >> build.properties +- echo "test.excludePerformance=true" >> build.properties +- echo "test.openssl.path=/dev/null/openssl" >> build.properties +- echo "test.apr.loc=$HOME/tmp/tomcat-native-build/lib" >> build.properties + + +script: +- ant -q clean +- travis_wait 60 "./.travis/antTest.sh" + +after_failure: +- tail -n 5000 ant-test.log +- ls -laR $HOME/tomcat-build-libs + +notifications: +email: + - dev@tomcat.apache.org \ No newline at end of file diff --git a/.travis/antTest.sh b/.travis/antTest.sh new file mode 100755 index 000..155004c --- /dev/null +++ b/.travis/antTest.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# A helper script for TravisCI builds that saves the std +# out and err streams in a log file. This is needed +# because otherwise TravisCI complains that there is too +# much logging on stdout + +ant -q test 2>&1 > ant-test.log - 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: Test Tomcat on ARM64 at TravisCI
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 7f057cd Test Tomcat on ARM64 at TravisCI 7f057cd is described below commit 7f057cd455ab689fae217761443d9432d6803ff0 Author: Martin Tzvetanov Grigorov AuthorDate: Thu Jan 23 11:53:22 2020 +0200 Test Tomcat on ARM64 at TravisCI (cherry picked from commit e6ebd2346850a14c3ff59a2372169a167958e024) --- .travis.yml| 67 ++ .travis/antTest.sh | 8 +++ 2 files changed, 75 insertions(+) diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000..04a14c9 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,67 @@ +dist: bionic +language: java +jdk: oraclejdk8 +arch: arm64 + +addons: +apt: + packages: +- ant +- build-essential +- automake +- autoconf +- tar +- libssl-dev +- subversion +- git +- libtool-bin + +install: +- ARCH=`uname -p` +- echo $ARCH +- JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz"; +- JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz"; +- if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; else JDK_URL=$JDK_X64; fi +- wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz +- mv jdk8* jdk +- export JAVA_HOME=`pwd`/jdk +- wget -q http://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.7-bin.tar.gz && tar xzf apache-ant-*-bin.tar.gz +- export ANT_HOME=`pwd`/apache-ant-1.10.7 +- export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH" +- java -version +- ant -version +- rm -rf $HOME/tmp +- export CURR_PWD=`pwd` +- svn co -q https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x/ $HOME/tmp/apr +- cd $HOME/tmp/apr +- ./buildconf +- ./configure --prefix=$HOME/tmp/apr-build +- make +- make install +- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/tmp/apr-build/lib" +- git clone -q https://github.com/apache/tomcat-native.git $HOME/tmp/tomcat-native +- cd $HOME/tmp/tomcat-native/native +- sh buildconf --with-apr=$HOME/tmp/apr +- ./configure --with-apr=$HOME/tmp/apr --with-java-home=$JAVA_HOME --with-ssl=yes --prefix=$HOME/tmp/tomcat-native-build +- make +- make install +- cd $CURR_PWD +- yes | cp build.properties.default build.properties +- echo "test.threads=16" >> build.properties +- echo "test.relaxTiming=true" >> build.properties +- echo "test.excludePerformance=true" >> build.properties +- echo "test.openssl.path=/dev/null/openssl" >> build.properties +- echo "test.apr.loc=$HOME/tmp/tomcat-native-build/lib" >> build.properties + + +script: +- ant -q clean +- travis_wait 60 "./.travis/antTest.sh" + +after_failure: +- tail -n 5000 ant-test.log +- ls -laR $HOME/tomcat-build-libs + +notifications: +email: + - dev@tomcat.apache.org \ No newline at end of file diff --git a/.travis/antTest.sh b/.travis/antTest.sh new file mode 100755 index 000..155004c --- /dev/null +++ b/.travis/antTest.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# A helper script for TravisCI builds that saves the std +# out and err streams in a log file. This is needed +# because otherwise TravisCI complains that there is too +# much logging on stdout + +ant -q test 2>&1 > ant-test.log - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Add ASLv2 header to the new Travis CI related files
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 7951df5 Add ASLv2 header to the new Travis CI related files 7951df5 is described below commit 7951df58bbcabdc842b0010e77ed1150df0d875d Author: Martin Tzvetanov Grigorov AuthorDate: Mon Feb 3 11:29:40 2020 +0200 Add ASLv2 header to the new Travis CI related files Also add those files to rat-excludes.txt --- .travis.yml | 17 - .travis/antTest.sh | 15 +++ res/rat/rat-excludes.txt | 5 + 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 04a14c9..526a1ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + dist: bionic language: java jdk: oraclejdk8 @@ -64,4 +79,4 @@ after_failure: notifications: email: - - dev@tomcat.apache.org \ No newline at end of file + - dev@tomcat.apache.org diff --git a/.travis/antTest.sh b/.travis/antTest.sh index 155004c..22ce104 100755 --- a/.travis/antTest.sh +++ b/.travis/antTest.sh @@ -1,5 +1,20 @@ #!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # A helper script for TravisCI builds that saves the std # out and err streams in a log file. This is needed # because otherwise TravisCI complains that there is too diff --git a/res/rat/rat-excludes.txt b/res/rat/rat-excludes.txt index a27cd4e..ab82a2b 100644 --- a/res/rat/rat-excludes.txt +++ b/res/rat/rat-excludes.txt @@ -55,6 +55,8 @@ - Temporary cache files used by Checkstle + - Configuration files for third party Continuous Integration systems like Travis CI + output/build/logs/* output/test-tmp/** @@ -184,3 +186,6 @@ output/dist/temp/safeToDelete.tmp **/*.md output/res/checkstyle/* + +.travis.yml +.travis/antTest.sh - 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 ASLv2 header to the new Travis CI related files
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 efde338 Add ASLv2 header to the new Travis CI related files efde338 is described below commit efde3381c23e7c04b3a1333d0ddc1d50ac225ca5 Author: Martin Tzvetanov Grigorov AuthorDate: Mon Feb 3 11:29:40 2020 +0200 Add ASLv2 header to the new Travis CI related files Also add those files to rat-excludes.txt (cherry picked from commit 7951df58bbcabdc842b0010e77ed1150df0d875d) --- .travis.yml | 17 - .travis/antTest.sh | 15 +++ res/rat/rat-excludes.txt | 5 + 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 04a14c9..526a1ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + dist: bionic language: java jdk: oraclejdk8 @@ -64,4 +79,4 @@ after_failure: notifications: email: - - dev@tomcat.apache.org \ No newline at end of file + - dev@tomcat.apache.org diff --git a/.travis/antTest.sh b/.travis/antTest.sh index 155004c..22ce104 100755 --- a/.travis/antTest.sh +++ b/.travis/antTest.sh @@ -1,5 +1,20 @@ #!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # A helper script for TravisCI builds that saves the std # out and err streams in a log file. This is needed # because otherwise TravisCI complains that there is too diff --git a/res/rat/rat-excludes.txt b/res/rat/rat-excludes.txt index 6e338f2..5aeb94e 100644 --- a/res/rat/rat-excludes.txt +++ b/res/rat/rat-excludes.txt @@ -55,6 +55,8 @@ - Temporary cache files used by Checkstle + - Configuration files for third party Continuous Integration systems like Travis CI + output/build/logs/* output/test-tmp/** @@ -184,3 +186,6 @@ output/dist/temp/safeToDelete.tmp **/*.md output/res/checkstyle/* + +.travis.yml +.travis/antTest.sh - 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 ASLv2 header to the new Travis CI related files
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 ef6d17e Add ASLv2 header to the new Travis CI related files ef6d17e is described below commit ef6d17e4172047fcc701f88cf8445a73835374f1 Author: Martin Tzvetanov Grigorov AuthorDate: Mon Feb 3 11:29:40 2020 +0200 Add ASLv2 header to the new Travis CI related files Also add those files to rat-excludes.txt (cherry picked from commit 7951df58bbcabdc842b0010e77ed1150df0d875d) --- .travis.yml | 17 - .travis/antTest.sh | 15 +++ res/rat/rat-excludes.txt | 5 + 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 04a14c9..526a1ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + dist: bionic language: java jdk: oraclejdk8 @@ -64,4 +79,4 @@ after_failure: notifications: email: - - dev@tomcat.apache.org \ No newline at end of file + - dev@tomcat.apache.org diff --git a/.travis/antTest.sh b/.travis/antTest.sh index 155004c..22ce104 100755 --- a/.travis/antTest.sh +++ b/.travis/antTest.sh @@ -1,5 +1,20 @@ #!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # A helper script for TravisCI builds that saves the std # out and err streams in a log file. This is needed # because otherwise TravisCI complains that there is too diff --git a/res/rat/rat-excludes.txt b/res/rat/rat-excludes.txt index de252c8..48f0937 100644 --- a/res/rat/rat-excludes.txt +++ b/res/rat/rat-excludes.txt @@ -55,6 +55,8 @@ - Temporary cache files used by Checkstle + - Configuration files for third party Continuous Integration systems like Travis CI + output/build/logs/* output/test-tmp/** @@ -182,3 +184,6 @@ output/dist/temp/safeToDelete.tmp **/*.md output/res/checkstyle/* + +.travis.yml +.travis/antTest.sh - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1873527 [1/30] - /tomcat/site/trunk/docs/
Author: mgrigorov Date: Mon Feb 3 09:51:13 2020 New Revision: 1873527 URL: http://svn.apache.org/viewvc?rev=1873527&view=rev Log: Re-generate the site docs The only change is that the generated HTML is indented. Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/ci.html tomcat/site/trunk/docs/conference.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/download-80.html tomcat/site/trunk/docs/download-90.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/download-taglibs.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/maven-plugin.html tomcat/site/trunk/docs/migration-6.html tomcat/site/trunk/docs/migration-7.html tomcat/site/trunk/docs/migration-8.html tomcat/site/trunk/docs/migration-85.html tomcat/site/trunk/docs/migration-9.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/oldnews-2010.html tomcat/site/trunk/docs/oldnews-2011.html tomcat/site/trunk/docs/oldnews-2012.html tomcat/site/trunk/docs/oldnews-2014.html tomcat/site/trunk/docs/oldnews-2016.html tomcat/site/trunk/docs/oldnews-2018.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-8.html tomcat/site/trunk/docs/security-9.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security-native.html tomcat/site/trunk/docs/security-taglibs.html tomcat/site/trunk/docs/source.html tomcat/site/trunk/docs/taglibs.html tomcat/site/trunk/docs/tomcat-55-eol.html tomcat/site/trunk/docs/tomcat-60-eol.html tomcat/site/trunk/docs/tools.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1873527&r1=1873526&r2=1873527&view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Mon Feb 3 09:51:13 2020 @@ -1,589 +1,597 @@ - - - - - -Apache Tomcat® - Reporting Bugs - - - - - - - - - -http://tomcat.apache.org/";> -Apache Tomcat® - - -https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search"; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"> - Save the date! + + + + + +Apache Tomcat® - Reporting Bugs + + + + + + + + + +http://tomcat.apache.org/";> + +Apache Tomcat® + + +https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-left"> + + + + + + + +https://www.google.com/search"; method="get"> + +GO + + + +https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"> + + Save the date! - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi";>To
svn commit: r1873527 [30/30] - /tomcat/site/trunk/docs/
able. (It's a long list, so please be patient.) - - - - -PMC Members & Committers - - - -PMC Chair - - -Mladen Turk (mturk at apache.org) - - - - -PMC Members & Committers - - - -Jean-Francois Arcand (jfarcand at apache.org) - - - - - -Bill Barker (billbarker at apache.org) - - - - - -Ognjen BlagojeviÄ (ognjen at apache.org) - - - - - -Emmanuel Bourg (ebourg at apache.org) - - - - - -Jeremy Boynes (jboynes at apache.org) - - - - - -Jean-Frederic Clere (jfclere at apache.org) - - - - - -Keiichi Fujino (kfujino at apache.org) - - - - - - -Tim Funk (funkman at apache.org) - - - - - -Violeta Georgieva (violetagg at apache.org) - - - - - -Henri Gomez (hgomez at apache.org) - - - - - -Martin Grigorov (mgrigorov at apache.org) - - - - - -Filip Hanik (fhanik at apache.org) - - - - - -Jacob Hookom (jhook at apache.org) - - - - - -Jim Jagielski (jim at apache.org) - - - - - -Rainer Jung (rjung at apache.org) - - - - - -Woonsan Ko (woonsan at apache.org) - - - - - -Konstantin Kolinko (kkolinko at apache.org) - - - - - -Olivier Lamy (olamy at apache.org) - - - - -Sylvain Laurent (slaurent at apache.org) - - - - - -Remy Maucherat (remm at apache.org) - - - - - -Costin Manolache (costin at apache.org) - - - - - -Konstantin Preißer (kpreisser at apache.org) - - - - - -Peter Rossbach (pero at apache.org) - - - - - -William A. Rowe Jr. (wrowe at apache.org) - - - - - -Igal Sapir (isapir at apache.org) - - - - - -Christopher Schultz (schultz at apache.org) - - - - - -Felix Schumacher (fschumacher at apache.org) - - - - - -Coty Sutherland (csutherl at apache.org) - - - - - -Eiji Takahashi (eijit at apache.org) - - - - - -Mark Thomas (markt at apache.org) - - - - - -Keith Wannamaker (keith at apache.org) - - - - - -André Warnier (soliplaya at apache.org) - - - - - -Tim Whittington (timw at apache.org) - - - - - -Huxing Zhang (huxing at apache.org) - - - - - -Emeritus PMC members - - - - -http://www.apache.org/foundation/glossary.html#Emeritus";> -Emeritus is defined in the Apache glossary. - - - - - -Ian Darwin (idarwin at apache.org) - - - - - -Yoav Shapira (yoavs at apache.org) - - - - -Emeritus Committers - - - - -http://www.apache.org/foundation/glossary.html#Emeritus";> -Emeritus is defined in the Apache glossary. - - - - -James Duncan Davidson (duncan at apache.org), + + + +PMC Members & Committers + + +PMC Chair + + +Mladen Turk (mturk at apache.org) + + + +PMC Members & Committers + + +Jean-Francois Arcand (jfarcand at apache.org) + + + + +Bill Barker (billbarker at apache.org) + + + + +Ognjen BlagojeviÄ (ognjen at apache.org) + + + + +Emmanuel Bourg (ebourg at apache.org) + + + + +Jeremy Boynes (jboynes at apache.org) + + + + +Jean-Frederic Clere (jfclere at apache.org) + + + + +Keiichi Fujino (kfujino at apache.org) + + + + +Tim Funk (funkman at apache.org) + + + + +Violeta Georgieva (violetagg at apache.org) + + + + +Henri Gomez (hgomez at apache.org
svn commit: r1873527 [26/30] - /tomcat/site/trunk/docs/
Modified: tomcat/site/trunk/docs/security-jk.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-jk.html?rev=1873527&r1=1873526&r2=1873527&view=diff == --- tomcat/site/trunk/docs/security-jk.html (original) +++ tomcat/site/trunk/docs/security-jk.html Mon Feb 3 09:51:13 2020 @@ -1,289 +1,290 @@ - - - - - -Apache Tomcat® - Apache Tomcat JK Connectors vulnerabilities - - - - - - - - - -http://tomcat.apache.org/";> -Apache Tomcat® - - -https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search"; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"> - Save the date! + + + + + +Apache Tomcat® - Apache Tomcat JK Connectors vulnerabilities + + + + + + + + + +http://tomcat.apache.org/";> + +Apache Tomcat® + + +https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-left"> + + + + + + + +https://www.google.com/search"; method="get"> + +GO + + + +https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"> + + Save the date! - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi";>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi";>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi";>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi";>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi";>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi";>Taglibs - - -https://archive.apache.org/dist/tomcat/";>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://cwiki.apache.org/confluence/display/TOMCAT";>Wiki - - -Migration Guide - - -Presentations - - - - -Problems? - - -Security Reports - - -Find help - - -https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ - - -Mailing Lists - - -Bug Database - - -IRC - - - - -Get Involved - - -Overview - - -Source code - - -Buildbot - - -https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations - - -Tools - - - - -Media - - -https://twitter.com/theapachetomcat";>Twitter - - -https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube - - -https://blogs.apache.org/tomcat/";>Blog - - - - -Misc - - -Who We Are - - -https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag - - -Heritage - - -http://www.apache.org";>Apache Home - - -Resources - - -Contact - - -Legal - - -https://www.apache.org/foundation/contributing.html";>Support Apache - - -https://www.apache.org/foundation/sponsorship.html";>Sponsorship - - -http://www.apache.org/foundation/thanks.html";>Thanks - - -http://www.apache.org/licenses/";>License - - - - - - - - -Content -Table of Contents - - - - -Apache Tomcat JK Connectors vulnerabilities - - -Fixed in Apache Tomcat JK Connector 1.2.46 - - -Fixed in Apache Tomcat JK Connector 1.2.43 - - -Fixed in Apache Tomcat JK Connector 1.2.42 - - -Fixed in Apache Tomcat JK Connector 1.2.41 - - -Fixed in Apache Tomcat JK Connector 1.2.27 - - -Fixed in Apache Tomcat JK Connector 1.2.23 - - -Fixed in Apache Tomcat JK Connector 1.2.21 - - -Fixed in Apache Tomcat JK Connector 1.2.16 - - - - -Apache Tomcat JK Connectors vulnerabilities - - -This page lists all security vulnerabilities fixed in released versions + + + +Apache Tomcat + + +Home + +
svn commit: r1873527 [19/30] - /tomcat/site/trunk/docs/
Modified: tomcat/site/trunk/docs/oldnews-2018.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2018.html?rev=1873527&r1=1873526&r2=1873527&view=diff == --- tomcat/site/trunk/docs/oldnews-2018.html (original) +++ tomcat/site/trunk/docs/oldnews-2018.html Mon Feb 3 09:51:13 2020 @@ -1,1602 +1,1621 @@ - - - - - -Apache Tomcat® - Old news! - - - - - - - - - -http://tomcat.apache.org/";> -Apache Tomcat® - - -https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search"; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"> - Save the date! + + + + + +Apache Tomcat® - Old news! + + + + + + + + + +http://tomcat.apache.org/";> + +Apache Tomcat® + + +https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-left"> + + + + + + + +https://www.google.com/search"; method="get"> + +GO + + + +https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"> + + Save the date! - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi";>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi";>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi";>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi";>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi";>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi";>Taglibs - - -https://archive.apache.org/dist/tomcat/";>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://cwiki.apache.org/confluence/display/TOMCAT";>Wiki - - -Migration Guide - - -Presentations - - - - -Problems? - - -Security Reports - - -Find help - - -https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ - - -Mailing Lists - - -Bug Database - - -IRC - - - - -Get Involved - - -Overview - - -Source code - - -Buildbot - - -https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations - - -Tools - - - - -Media - - -https://twitter.com/theapachetomcat";>Twitter - - -https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube - - -https://blogs.apache.org/tomcat/";>Blog - - - - -Misc - - -Who We Are - - -https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag - - -Heritage - - -http://www.apache.org";>Apache Home - - -Resources - - -Contact - - -Legal - - -https://www.apache.org/foundation/contributing.html";>Support Apache - - -https://www.apache.org/foundation/sponsorship.html";>Sponsorship - - -http://www.apache.org/foundation/thanks.html";>Thanks - - -http://www.apache.org/licenses/";>License - - - - - - - - -Content -Older news - - -Announcements from previous years can be found here: - - - - -year 2019 - - -year 2018 - - -year 2017 - - - -year 2016 - - - -year 2015 - - - -year 2014 - - - -year 2013 - - - -year 2012 - - - -year 2011 - - - -year 2010 - - - - - - -2018-12-18 Tomcat 8.5.37 Released - - - + + + +Apache Tomcat + + +Home + + +Taglibs + + +Maven Plugin + + + +
svn commit: r1873527 [9/30] - /tomcat/site/trunk/docs/
Modified: tomcat/site/trunk/docs/maven-plugin.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin.html?rev=1873527&r1=1873526&r2=1873527&view=diff == --- tomcat/site/trunk/docs/maven-plugin.html (original) +++ tomcat/site/trunk/docs/maven-plugin.html Mon Feb 3 09:51:13 2020 @@ -1,290 +1,298 @@ - - - - - -Apache Tomcat® - Tomcat Maven Plugin - - - - - - - - - -http://tomcat.apache.org/";> -Apache Tomcat® - - -https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search"; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"> - Save the date! + + + + + +Apache Tomcat® - Tomcat Maven Plugin + + + + + + + + + +http://tomcat.apache.org/";> + +Apache Tomcat® + + +https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-left"> + + + + + + + +https://www.google.com/search"; method="get"> + +GO + + + +https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"> + + Save the date! - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi";>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi";>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi";>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi";>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi";>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi";>Taglibs - - -https://archive.apache.org/dist/tomcat/";>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://cwiki.apache.org/confluence/display/TOMCAT";>Wiki - - -Migration Guide - - -Presentations - - - - -Problems? - - -Security Reports - - -Find help - - -https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ - - -Mailing Lists - - -Bug Database - - -IRC - - - - -Get Involved - - -Overview - - -Source code - - -Buildbot - - -https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations - - -Tools - - - - -Media - - -https://twitter.com/theapachetomcat";>Twitter - - -https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube - - -https://blogs.apache.org/tomcat/";>Blog - - - - -Misc - - -Who We Are - - -https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag - - -Heritage - - -http://www.apache.org";>Apache Home - - -Resources - - -Contact - - -Legal - - -https://www.apache.org/foundation/contributing.html";>Support Apache - - -https://www.apache.org/foundation/sponsorship.html";>Sponsorship - - -http://www.apache.org/foundation/thanks.html";>Thanks - - -http://www.apache.org/licenses/";>License - - - - - - - - -Content -Maven Plugin - - - - -The Apache Tomcat Maven Plugin provides goals to manipulate WAR + + + +Apache Tomcat + + +Home + + +Taglibs + + +Maven Plugin + + + + +Download + + +
svn commit: r1873527 [29/30] - /tomcat/site/trunk/docs/
Modified: tomcat/site/trunk/docs/whichversion.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1873527&r1=1873526&r2=1873527&view=diff == --- tomcat/site/trunk/docs/whichversion.html (original) +++ tomcat/site/trunk/docs/whichversion.html Mon Feb 3 09:51:13 2020 @@ -1,236 +1,237 @@ - - - - - -Apache Tomcat® - Which Version Do I Want? - - - - - - - - - - - -http://tomcat.apache.org/";> -Apache Tomcat® - - -https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search"; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"> - Save the date! + + + + + +Apache Tomcat® - Which Version Do I Want? + + + + + + + + + + + +http://tomcat.apache.org/";> + +Apache Tomcat® + + +https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-left"> + + + + + + + +https://www.google.com/search"; method="get"> + +GO + + + +https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"> + + Save the date! - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi";>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi";>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi";>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi";>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi";>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi";>Taglibs - - -https://archive.apache.org/dist/tomcat/";>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://cwiki.apache.org/confluence/display/TOMCAT";>Wiki - - -Migration Guide - - -Presentations - - - - -Problems? - - -Security Reports - - -Find help - - -https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ - - -Mailing Lists - - -Bug Database - - -IRC - - - - -Get Involved - - -Overview - - -Source code - - -Buildbot - - -https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations - - -Tools - - - - -Media - - -https://twitter.com/theapachetomcat";>Twitter - - -https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube - - -https://blogs.apache.org/tomcat/";>Blog - - - - -Misc - - -Who We Are - - -https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag - - -Heritage - - -http://www.apache.org";>Apache Home - - -Resources - - -Contact - - -Legal - - -https://www.apache.org/foundation/contributing.html";>Support Apache - - -https://www.apache.org/foundation/sponsorship.html";>Sponsorship - - -http://www.apache.org/foundation/thanks.html";>Thanks - - -http://www.apache.org/licenses/";>License - - - - - - - - -Content -Apache Tomcat Versions - - -Apache Tomcat® is an open source software implementation of the Java Servlet + + + +Apache Tomcat + + +Home + + +Taglibs + + +Maven Plugin + + + + +Download + +
svn commit: r1873527 [12/30] - /tomcat/site/trunk/docs/
Modified: tomcat/site/trunk/docs/migration-85.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1873527&r1=1873526&r2=1873527&view=diff == --- tomcat/site/trunk/docs/migration-85.html (original) +++ tomcat/site/trunk/docs/migration-85.html Mon Feb 3 09:51:13 2020 @@ -1,389 +1,387 @@ - - - - - -Apache Tomcat® - Migration Guide - Tomcat 8.5.x - - - - - - - - - -http://tomcat.apache.org/";> -Apache Tomcat® - - -https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search"; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"> - Save the date! + + + + + +Apache Tomcat® - Migration Guide - Tomcat 8.5.x + + + + + + + + + +http://tomcat.apache.org/";> + +Apache Tomcat® + + +https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-left"> + + + + + + + +https://www.google.com/search"; method="get"> + +GO + + + +https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"> + + Save the date! - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi";>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi";>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi";>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi";>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi";>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi";>Taglibs - - -https://archive.apache.org/dist/tomcat/";>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://cwiki.apache.org/confluence/display/TOMCAT";>Wiki - - -Migration Guide - - -Presentations - - - - -Problems? - - -Security Reports - - -Find help - - -https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ - - -Mailing Lists - - -Bug Database - - -IRC - - - - -Get Involved - - -Overview - - -Source code - - -Buildbot - - -https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations - - -Tools - - - - -Media - - -https://twitter.com/theapachetomcat";>Twitter - - -https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube - - -https://blogs.apache.org/tomcat/";>Blog - - - - -Misc - - -Who We Are - - -https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag - - -Heritage - - -http://www.apache.org";>Apache Home - - -Resources - - -Contact - - -Legal - - -https://www.apache.org/foundation/contributing.html";>Support Apache - - -https://www.apache.org/foundation/sponsorship.html";>Sponsorship - - -http://www.apache.org/foundation/thanks.html";>Thanks - - -http://www.apache.org/licenses/";>License - - - - - - - - -Content -Table of Contents - - - - -General - - -Migrating from 8.0.x to 8.5.x - - -BIO connector removed - - -HTTP connector changes - - -Comet support removed - - -HTTP/2 support added - - -TLS virtual hosting and multiple certificate support added - - -Internal APIs - - -JSR-77 implementation removed - - -Clustering - - -InstanceListener removed - - -SessionManager - - -Cookies - - -Web applications - - -Context configurations - - - - -Upgrading 8.5.x - - -Tomcat 8.5.x noteable changes - - -Tomcat 8.5.x configuration file differences - - - - - - -General - - - -Please read general Migration Guide page first, + + + +Apache Tomcat + + +Home + +
svn commit: r1873527 [5/30] - /tomcat/site/trunk/docs/
Modified: tomcat/site/trunk/docs/download-connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1873527&r1=1873526&r2=1873527&view=diff == --- tomcat/site/trunk/docs/download-connectors.html (original) +++ tomcat/site/trunk/docs/download-connectors.html Mon Feb 3 09:51:13 2020 @@ -1,249 +1,255 @@ - - - - - -Apache Tomcat® - Tomcat Connectors (mod_jk) Downloads - - - - - - - - -http://tomcat.apache.org/";> -Apache Tomcat® - - -https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search"; method="get"> - -GO - - - -https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"> - Save the date! + + + + + +Apache Tomcat® - Tomcat Connectors (mod_jk) Downloads + + + + + + + + +http://tomcat.apache.org/";> + +Apache Tomcat® + + +https://www.apache.org/foundation/contributing.html"; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-left"> + + + + + + + +https://www.google.com/search"; method="get"> + +GO + + + +https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF event"> + + Save the date! - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi";>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi";>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi";>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi";>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi";>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi";>Taglibs - - -https://archive.apache.org/dist/tomcat/";>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://cwiki.apache.org/confluence/display/TOMCAT";>Wiki - - -Migration Guide - - -Presentations - - - - -Problems? - - -Security Reports - - -Find help - - -https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ - - -Mailing Lists - - -Bug Database - - -IRC - - - - -Get Involved - - -Overview - - -Source code - - -Buildbot - - -https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations - - -Tools - - - - -Media - - -https://twitter.com/theapachetomcat";>Twitter - - -https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube - - -https://blogs.apache.org/tomcat/";>Blog - - - - -Misc - - -Who We Are - - -https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag - - -Heritage - - -http://www.apache.org";>Apache Home - - -Resources - - -Contact - - -Legal - - -https://www.apache.org/foundation/contributing.html";>Support Apache - - -https://www.apache.org/foundation/sponsorship.html";>Sponsorship - - -http://www.apache.org/foundation/thanks.html";>Thanks - - -http://www.apache.org/licenses/";>License - - - - - - - - -Content -Tomcat Connectors (mod_jk) Downloads - - - -Use the links below to download the Apache Tomcat® Connectors + + + +Apache Tomcat + + +Home + + +Taglibs + + +Maven Plugin + + + + +Download + +
