[tomcat] branch 9.0.x updated: Reproducible builds: Consistent line endings for .sh files in src distro
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 75d2cdb Reproducible builds: Consistent line endings for .sh files in src distro 75d2cdb is described below commit 75d2cdb4c43c999fc7c640771b950afae0e19667 Author: Mark Thomas AuthorDate: Tue Mar 23 20:56:50 2021 + Reproducible builds: Consistent line endings for .sh files in src distro --- build.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.xml b/build.xml index 7a134fb..ed4ea4d 100644 --- a/build.xml +++ b/build.xml @@ -2962,6 +2962,7 @@ skip.installer property in build.properties" /> + @@ -2986,6 +2987,7 @@ skip.installer property in build.properties" /> + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Reproducible builds: Consistent line endings for .sh files in src distro
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new d44dd7b Reproducible builds: Consistent line endings for .sh files in src distro d44dd7b is described below commit d44dd7b511c187dd9771a00c11169cbb8e39772a Author: Mark Thomas AuthorDate: Tue Mar 23 20:56:50 2021 + Reproducible builds: Consistent line endings for .sh files in src distro --- build.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.xml b/build.xml index 4397fef..14c3657 100644 --- a/build.xml +++ b/build.xml @@ -2984,6 +2984,7 @@ skip.installer property in build.properties" /> + @@ -3008,6 +3009,7 @@ skip.installer property in build.properties" /> + - 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: Ensure consistent line ending in src distro for antTest.sh
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new bc659ea Ensure consistent line ending in src distro for antTest.sh bc659ea is described below commit bc659ea35d2d79ca261a6da6291ffd0c770a6a9c Author: Mark Thomas AuthorDate: Tue Mar 23 20:35:24 2021 + Ensure consistent line ending in src distro for antTest.sh --- build.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.xml b/build.xml index 6ca421f..a581ff7 100644 --- a/build.xml +++ b/build.xml @@ -2643,6 +2643,7 @@ skip.installer property in build.properties" /> + @@ -2666,6 +2667,7 @@ skip.installer property in build.properties" /> + - 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: Ensure consistent line ending in src distro for antTest.sh
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 665c20a Ensure consistent line ending in src distro for antTest.sh 665c20a is described below commit 665c20aef54190f3035ca26620dfdd284cb9196f Author: Mark Thomas AuthorDate: Tue Mar 23 20:35:24 2021 + Ensure consistent line ending in src distro for antTest.sh --- build.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.xml b/build.xml index a527dbb..7a134fb 100644 --- a/build.xml +++ b/build.xml @@ -2961,6 +2961,7 @@ skip.installer property in build.properties" /> + @@ -2984,6 +2985,7 @@ skip.installer property in build.properties" /> + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Ensure consistent line ending in src distro for antTest.sh
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new a3c00f4 Ensure consistent line ending in src distro for antTest.sh a3c00f4 is described below commit a3c00f4a8e68e3051c1165a0207a50248c0cf1d0 Author: Mark Thomas AuthorDate: Tue Mar 23 20:35:24 2021 + Ensure consistent line ending in src distro for antTest.sh --- build.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.xml b/build.xml index cff6153..4397fef 100644 --- a/build.xml +++ b/build.xml @@ -2983,6 +2983,7 @@ skip.installer property in build.properties" /> + @@ -3006,6 +3007,7 @@ skip.installer property in build.properties" /> + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/04: Repeatable builds: Always use UTF-8 rather than platform encoding
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit a0cc710d9081a49955570a6de7c037ed71915a95 Author: Mark Thomas AuthorDate: Tue Mar 23 19:23:05 2021 + Repeatable builds: Always use UTF-8 rather than platform encoding --- build.xml | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/build.xml b/build.xml index 3da50de..d5c9486 100644 --- a/build.xml +++ b/build.xml @@ -1390,7 +1390,8 @@ - + @@ -2395,7 +2396,8 @@ skip.installer property in build.properties" /> - + @@ -2435,7 +2437,8 @@ skip.installer property in build.properties" /> - + @@ -2461,7 +2464,8 @@ skip.installer property in build.properties" /> - + @@ -2509,7 +2513,8 @@ skip.installer property in build.properties" /> - + @@ -2644,7 +2649,8 @@ skip.installer property in build.properties" /> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/04: Increase minimum Ant version to 1.9.10
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit cd63bf0668cdef80fb425cd3ef3a077ffed33449 Author: Mark Thomas AuthorDate: Tue Mar 23 19:43:07 2021 + Increase minimum Ant version to 1.9.10 This is the earliest version to support ant.tstamp.now.iso --- BUILDING.txt | 4 ++-- webapps/docs/building.xml | 6 +++--- webapps/docs/changelog.xml | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index 8643fb9..11f68ca 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -64,9 +64,9 @@ source distribution, do the following: into which you installed the JDK release. -(2) Install Apache Ant version 1.9.8 or later on your computer. +(2) Install Apache Ant version 1.9.10 or later on your computer. - 1. If Apache Ant version 1.9.8 or later is already installed on your + 1. If Apache Ant version 1.9.10 or later is already installed on your computer, skip to (3). 2. Download a binary distribution of Ant from: diff --git a/webapps/docs/building.xml b/webapps/docs/building.xml index 5b0bcad..b1302ec 100644 --- a/webapps/docs/building.xml +++ b/webapps/docs/building.xml @@ -59,10 +59,10 @@ directory into which you installed the JDK release. - + -Download a binary distribution of Ant 1.9.8 or later from +Download a binary distribution of Ant 1.9.10 or later from https://ant.apache.org/bindownload.cgi;>here. @@ -227,7 +227,7 @@ Variables to add two new Classpath Variables: TOMCAT_LIBS_BASEThe same location as the base.path setting in build.properties, where the binary dependencies have been downloaded - ANT_HOMEthe base path of Ant 1.9.8 or later + ANT_HOMEthe base path of Ant 1.9.10 or later diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 5493b1a6..9e45deb 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -153,7 +153,8 @@ Implement the first phase of reproducible builds. Sequential builds on the same machine now produce identical output provided that the Ant -property ant.tstamp.now.iso is set. (markt) +property ant.tstamp.now.iso is set. The minimum required +Ant version is now 1.9.10. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/04: Add additional extension for YAML files
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 0b4d2ea351338a73f977aff48fd483bfde610605 Author: Mark Thomas AuthorDate: Tue Mar 23 18:51:35 2021 + Add additional extension for YAML files --- build.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.xml b/build.xml index 0f8a7af..3da50de 100644 --- a/build.xml +++ b/build.xml @@ -322,6 +322,9 @@ + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/04: Add additional services API file to text files
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 1e71c12772628459712915d94a621a1cebcbb139 Author: Mark Thomas AuthorDate: Tue Mar 23 19:25:02 2021 + Add additional services API file to text files --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml index d5c9486..6ca421f 100644 --- a/build.xml +++ b/build.xml @@ -281,6 +281,7 @@ + - 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 (017f2fa -> cd63bf0)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 017f2fa Reproducible builds. Implement better solution for JARs new 0b4d2ea Add additional extension for YAML files new a0cc710 Repeatable builds: Always use UTF-8 rather than platform encoding new 1e71c12 Add additional services API file to text files new cd63bf0 Increase minimum Ant version to 1.9.10 The 4 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: BUILDING.txt | 4 ++-- build.xml | 22 -- webapps/docs/building.xml | 6 +++--- webapps/docs/changelog.xml | 3 ++- 4 files changed, 23 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/04: Increase minimum Ant version to 1.9.10
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 587c0b17e8fb576c6d1ae84d3b349e9411e032cf Author: Mark Thomas AuthorDate: Tue Mar 23 19:43:07 2021 + Increase minimum Ant version to 1.9.10 This is the earliest version to support ant.tstamp.now.iso --- BUILDING.txt | 4 ++-- build.properties.default | 2 +- webapps/docs/building.xml | 6 +++--- webapps/docs/changelog.xml | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index f8695fb..baa50f7 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -64,9 +64,9 @@ source distribution, do the following: into which you installed the JDK release. -(2) Install Apache Ant version 1.9.8 or later on your computer. +(2) Install Apache Ant version 1.9.10 or later on your computer. - 1. If Apache Ant version 1.9.8 or later is already installed on your + 1. If Apache Ant version 1.9.10 or later is already installed on your computer, skip to (3). 2. Download a binary distribution of Ant from: diff --git a/build.properties.default b/build.properties.default index 2103fb9..56eaf61 100644 --- a/build.properties.default +++ b/build.properties.default @@ -38,7 +38,7 @@ git.branch=master # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed -ant.version.required=1.9.8 +ant.version.required=1.9.10 execute.validate=false execute.download=true execute.test.nio=true diff --git a/webapps/docs/building.xml b/webapps/docs/building.xml index 129795d..450d5e5 100644 --- a/webapps/docs/building.xml +++ b/webapps/docs/building.xml @@ -59,10 +59,10 @@ directory into which you installed the JDK release. - + -Download a binary distribution of Ant 1.9.8 or later from +Download a binary distribution of Ant 1.9.10 or later from https://ant.apache.org/bindownload.cgi;>here. @@ -227,7 +227,7 @@ Variables to add two new Classpath Variables: TOMCAT_LIBS_BASEThe same location as the base.path setting in build.properties, where the binary dependencies have been downloaded - ANT_HOMEthe base path of Ant 1.9.8 or later + ANT_HOMEthe base path of Ant 1.9.10 or later diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 7385761..22b4875 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -165,7 +165,8 @@ Implement the first phase of reproducible builds. Sequential builds on the same machine now produce identical output provided that the Ant -property ant.tstamp.now.iso is set. (markt) +property ant.tstamp.now.iso is set. The minimum required +Ant version is now 1.9.10. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/04: Add additional services API file to text files
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 817dd852e1d4fa9d294f05db11ec13e63f9f1c60 Author: Mark Thomas AuthorDate: Tue Mar 23 19:25:02 2021 + Add additional services API file to text files --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml index d6fb9c2..a527dbb 100644 --- a/build.xml +++ b/build.xml @@ -283,6 +283,7 @@ + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/04: Repeatable builds: Always use UTF-8 rather than platform encoding
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 0a6f9a0fdf252532e61240cefa7aa128f7120dee Author: Mark Thomas AuthorDate: Tue Mar 23 19:23:05 2021 + Repeatable builds: Always use UTF-8 rather than platform encoding --- build.xml | 21 ++--- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/build.xml b/build.xml index 2ba94b8..d6fb9c2 100644 --- a/build.xml +++ b/build.xml @@ -1777,7 +1777,8 @@ - + @@ -2713,7 +2714,8 @@ skip.installer property in build.properties" /> - + @@ -2753,7 +2755,8 @@ skip.installer property in build.properties" /> - + @@ -2779,7 +2782,8 @@ skip.installer property in build.properties" /> - + @@ -2827,7 +2831,8 @@ skip.installer property in build.properties" /> - + @@ -2962,7 +2967,8 @@ skip.installer property in build.properties" /> - + @@ -3812,7 +3818,8 @@ Read the Building page on the Apache Tomcat documentation site for details on ho - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/04: Add additional extension for YAML files
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 147975d57cda0c8c31dc94a47a6de6ac43eb9162 Author: Mark Thomas AuthorDate: Tue Mar 23 18:51:35 2021 + Add additional extension for YAML files --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml index ee962b1..2ba94b8 100644 --- a/build.xml +++ b/build.xml @@ -329,6 +329,7 @@ + - 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 (ad731ed -> 587c0b1)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from ad731ed Reproducible builds. Implement better solution for JARs new 147975d Add additional extension for YAML files new 0a6f9a0 Repeatable builds: Always use UTF-8 rather than platform encoding new 817dd85 Add additional services API file to text files new 587c0b1 Increase minimum Ant version to 1.9.10 The 4 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: BUILDING.txt | 4 ++-- build.properties.default | 2 +- build.xml | 23 --- webapps/docs/building.xml | 6 +++--- webapps/docs/changelog.xml | 3 ++- 5 files changed, 24 insertions(+), 14 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Increase minimum Ant version to 1.9.10
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 830e900 Increase minimum Ant version to 1.9.10 830e900 is described below commit 830e90024dad1a6519e7d364f7a335337863f4e0 Author: Mark Thomas AuthorDate: Tue Mar 23 19:43:07 2021 + Increase minimum Ant version to 1.9.10 This is the earliest version to support ant.tstamp.now.iso --- BUILDING.txt | 4 ++-- build.properties.default | 2 +- webapps/docs/building.xml | 6 +++--- webapps/docs/changelog.xml | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index a8d31a6..526da87 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -65,9 +65,9 @@ source distribution, do the following: into which you installed the JDK release. -(2) Install Apache Ant version 1.9.8 or later on your computer. +(2) Install Apache Ant version 1.9.10 or later on your computer. - 1. If Apache Ant version 1.9.8 or later is already installed on your + 1. If Apache Ant version 1.9.10 or later is already installed on your computer, skip to (3). 2. Download a binary distribution of Ant from: diff --git a/build.properties.default b/build.properties.default index 3878450..f3e030d 100644 --- a/build.properties.default +++ b/build.properties.default @@ -38,7 +38,7 @@ git.branch=master # - Build control flags - # Note enabling validation uses Checkstyle which is LGPL licensed -ant.version.required=1.9.8 +ant.version.required=1.9.10 execute.validate=false execute.download=true execute.test.nio=true diff --git a/webapps/docs/building.xml b/webapps/docs/building.xml index 129795d..450d5e5 100644 --- a/webapps/docs/building.xml +++ b/webapps/docs/building.xml @@ -59,10 +59,10 @@ directory into which you installed the JDK release. - + -Download a binary distribution of Ant 1.9.8 or later from +Download a binary distribution of Ant 1.9.10 or later from https://ant.apache.org/bindownload.cgi;>here. @@ -227,7 +227,7 @@ Variables to add two new Classpath Variables: TOMCAT_LIBS_BASEThe same location as the base.path setting in build.properties, where the binary dependencies have been downloaded - ANT_HOMEthe base path of Ant 1.9.8 or later + ANT_HOMEthe base path of Ant 1.9.10 or later diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index c6eaffe..d3d2e2b 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -165,7 +165,8 @@ Implement the first phase of reproducible builds. Sequential builds on the same machine now produce identical output provided that the Ant -property ant.tstamp.now.iso is set. (markt) +property ant.tstamp.now.iso is set. The minimum required +Ant version is now 1.9.10. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Add additional services API file to text files
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 8bea0cb Add additional services API file to text files 8bea0cb is described below commit 8bea0cb92ee9792c100be541f530eed0cdfb8d2a Author: Mark Thomas AuthorDate: Tue Mar 23 19:25:02 2021 + Add additional services API file to text files --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml index 7da8365..cff6153 100644 --- a/build.xml +++ b/build.xml @@ -288,6 +288,7 @@ + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Repeatable builds: Always use UTF-8 rather than platform encoding
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 78fd8b3 Repeatable builds: Always use UTF-8 rather than platform encoding 78fd8b3 is described below commit 78fd8b3d291cd142071dbc4934154795cf96ea36 Author: Mark Thomas AuthorDate: Tue Mar 23 19:23:05 2021 + Repeatable builds: Always use UTF-8 rather than platform encoding --- build.xml | 21 ++--- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/build.xml b/build.xml index 26f917b..7da8365 100644 --- a/build.xml +++ b/build.xml @@ -1799,7 +1799,8 @@ - + @@ -2735,7 +2736,8 @@ skip.installer property in build.properties" /> - + @@ -2775,7 +2777,8 @@ skip.installer property in build.properties" /> - + @@ -2801,7 +2804,8 @@ skip.installer property in build.properties" /> - + @@ -2849,7 +2853,8 @@ skip.installer property in build.properties" /> - + @@ -2984,7 +2989,8 @@ skip.installer property in build.properties" /> - + @@ -3844,7 +3850,8 @@ Read the Building page on the Apache Tomcat documentation site for details on ho - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Add additional extension for YAML files
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 81e30dd Add additional extension for YAML files 81e30dd is described below commit 81e30dd766a42ebd224a628dcba9e22e33ba861c Author: Mark Thomas AuthorDate: Tue Mar 23 18:51:35 2021 + Add additional extension for YAML files --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml index b701195..26f917b 100644 --- a/build.xml +++ b/build.xml @@ -334,6 +334,7 @@ + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65201] Setting both response headers "Transfer-Encoding: chunked" and "Connection: Close" results in an empty response
https://bz.apache.org/bugzilla/show_bug.cgi?id=65201 Mark Thomas changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- If an application sets "Transfer-Encoding: chunked" then the application also has to take responsibility for generating the appropriate chunk headers. This is non-trivial. It is much better to let containers handle this for the application. Applications that try to do this themselves will quickly hit all sorts of complications and edge cases. Applications also need to check they aren't running over HTTP/1.0 or HTTP/2 since chunked is not supported. In this case, setting the headers (less "Transfer-Encoding" and "Connection") and flushing the (currently empty) response will do the right thing for all HTTP versions. There has been some discussion about blocking applications from setting certain headers. Transfer-Encoding and Connection were both included in that discussion. However, the discussion concluded that a better approach would be to implement the equivalent of mod_headers for Tomcat. Resolving as invalid since this is an application bug. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat-jakartaee-migration] ppkarwasz opened a new pull request #16: Modifies TOMCAT profile
ppkarwasz opened a new pull request #16: URL: https://github.com/apache/tomcat-jakartaee-migration/pull/16 Although Tomcat's code references several Jakarta EE APIs, it is distributed with just `annotations-api.jar`, `el-api.jar`, `jaspic-api.jar`, `servlet-api.jar` and `websocket-api.jar`. Therefore all the remaining APIs (e.g. Persistence API) are distributed with the applications. The current TOMCAT profile causes most applications to fail with a `NoClassDefFoundError`, when the Migration Tool is used as `ClassTransformer` through the `` context configuration: the `WebAppClassloader` replaces many references to `javax.*` classes with `jakarta.*` classes, but does not make the inverse transformation, when loading the external API classes. IMHO the migration tool shouldn't replace `javax.persistence` with `jakarta.persistence` also in other usage context, since this operation requires also the replacement of the JARs shipped with the application. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-85-trunk
The Buildbot has detected a restored build on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2661 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 017f2fa045d851591569c489de45f19cbbb658a5 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65201] New: Setting both response headers "Transfer-Encoding: chunked" and "Connection: Close" results in an empty response
https://bz.apache.org/bugzilla/show_bug.cgi?id=65201
Bug ID: 65201
Summary: Setting both response headers "Transfer-Encoding:
chunked" and "Connection: Close" results in an empty
response
Product: Tomcat 9
Version: 9.0.44
Hardware: PC
OS: Linux
Status: NEW
Severity: normal
Priority: P2
Component: Servlet
Assignee: dev@tomcat.apache.org
Reporter: johannes.geba...@adesso.de
Target Milestone: -
During the analysis of a potential bug in the spring framework
(https://github.com/spring-projects/spring-framework/issues/24699) it was found
that the Tomcat servlet implementation seems to close connections too soon when
two response headers are set.
Transfer-Encoding: chunked
Connection: Close
The problem could be reproduced by using pure servlet api using tomcat 9.0.44
```
public class MyServlet extends HttpServlet {
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws IOException {
resp.setStatus(500);
resp.setHeader("Transfer-Encoding", "chunked");
resp.setHeader("Connection", "close");
resp.getOutputStream().write('{');
}
}
```
Querying such an endpoint via curl results in some broken empty response.
```
curl http://localhost:8000/api/some/resource
curl: (56) Illegal or missing hexadecimal sequence in chunked-encoding
```
See original comment for more details:
https://github.com/spring-projects/spring-framework/issues/24699#issuecomment-600307198
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-9-trunk
The Buildbot has detected a restored build on builder tomcat-9-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9-trunk/builds/698 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' triggered this build Build Source Stamp: [branch 9.0.x] ad731ed3faff23d4b5c9521f2f964de056351591 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5746 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 53011ceadc706049cc92c03c3af401e8e1f5f206 Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - 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: Reproducible builds. Implement better solution for JARs
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 017f2fa Reproducible builds. Implement better solution for JARs
017f2fa is described below
commit 017f2fa045d851591569c489de45f19cbbb658a5
Author: Mark Thomas
AuthorDate: Tue Mar 23 14:23:04 2021 +
Reproducible builds. Implement better solution for JARs
Ant's jar task (and zip task) has a undocumented attribute that can be
used to control the last modified time for all the files in the archive.
Use this instead of switching to the zip task as the zip task does not
store /META-INF/MANIFEST at the start of the archive as expected by
JarInputStream
# Conflicts:
# build.xml
---
build.xml | 92 ++---
modules/jdbc-pool/build.xml | 20 +++---
2 files changed, 41 insertions(+), 71 deletions(-)
diff --git a/build.xml b/build.xml
index 9c23c75..0f8a7af 100644
--- a/build.xml
+++ b/build.xml
@@ -732,13 +732,6 @@
when loading the ResourceBundles -->
-
-
-
-
-
-
-
-
-
-
-
@@ -895,91 +883,83 @@
filesId="files.tomcat-dbcp" />
-
-
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
+
@@ -2111,7 +2091,9 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
+
@@ -2136,14 +2118,11 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
-
-
+
@@ -3391,7 +3370,9 @@ Read the Building page on the Apache Tomcat documentation
site for details on ho
-
+
@@ -3399,10 +3380,9 @@ Read the Building page on the Apache Tomcat
documentation site for details on ho
-
-
+
diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index c9a2444..3394e18 100644
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -160,21 +160,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -182,7 +172,7 @@
-
+
-
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: Reproducible builds. Implement better solution for JARs
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new ad731ed Reproducible builds. Implement better solution for JARs
ad731ed is described below
commit ad731ed3faff23d4b5c9521f2f964de056351591
Author: Mark Thomas
AuthorDate: Tue Mar 23 14:23:04 2021 +
Reproducible builds. Implement better solution for JARs
Ant's jar task (and zip task) has a undocumented attribute that can be
used to control the last modified time for all the files in the archive.
Use this instead of switching to the zip task as the zip task does not
store /META-INF/MANIFEST at the start of the archive as expected by
JarInputStream
---
build.xml | 110 ++--
modules/jdbc-pool/build.xml | 20 ++--
2 files changed, 49 insertions(+), 81 deletions(-)
diff --git a/build.xml b/build.xml
index 45dafa3..ee962b1 100644
--- a/build.xml
+++ b/build.xml
@@ -986,13 +986,6 @@
when loading the ResourceBundles -->
-
-
-
-
-
-
-
-
-
-
-
@@ -1175,115 +1163,105 @@
addOSGi="true" />
-
-
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
+
@@ -2440,7 +2418,9 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
+
@@ -2465,14 +2445,11 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
-
-
+
@@ -3777,7 +3754,9 @@ Read the Building page on the Apache Tomcat documentation
site for details on ho
-
+
@@ -3785,10 +3764,9 @@ Read the Building page on the Apache Tomcat
documentation site for details on ho
-
-
+
diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 3bc8c3d..21372bc 100644
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -160,21 +160,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -182,7 +172,7 @@
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Reproducible builds. Implement better solution for JARs
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 2a065a5 Reproducible builds. Implement better solution for JARs
2a065a5 is described below
commit 2a065a51d959509c93b95f9fce5979ea39ec10a7
Author: Mark Thomas
AuthorDate: Tue Mar 23 14:23:04 2021 +
Reproducible builds. Implement better solution for JARs
Ant's jar task (and zip task) has a undocumented attribute that can be
used to control the last modified time for all the files in the archive.
Use this instead of switching to the zip task as the zip task does not
store /META-INF/MANIFEST at the start of the archive as expected by
JarInputStream
---
build.xml | 110 ++--
modules/jdbc-pool/build.xml | 20 ++--
2 files changed, 49 insertions(+), 81 deletions(-)
diff --git a/build.xml b/build.xml
index 60fd8cc..b701195 100644
--- a/build.xml
+++ b/build.xml
@@ -991,13 +991,6 @@
when loading the ResourceBundles -->
-
-
-
-
-
-
-
-
-
-
-
@@ -1186,115 +1174,105 @@
addOSGi="true" />
-
-
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
+
@@ -2462,7 +2440,9 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
+
@@ -2487,14 +2467,11 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
-
-
+
@@ -3809,7 +3786,9 @@ Read the Building page on the Apache Tomcat documentation
site for details on ho
-
+
@@ -3817,10 +3796,9 @@ Read the Building page on the Apache Tomcat
documentation site for details on ho
-
-
+
diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 3bc8c3d..21372bc 100644
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -160,21 +160,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -182,7 +172,7 @@
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65181] Tomcat Native library with OpenSSL Engine private key loading
https://bz.apache.org/bugzilla/show_bug.cgi?id=65181 --- Comment #5 from mgrigorov --- (In reply to Edin Hodzic from comment #4) > Could I submit a pull request somehow? https://github.com/apache/tomcat-native -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Reproducible builds
On 23/03/2021 13:15, Mark Thomas wrote: I did a little more digging. There is an assumption in JarInputStream that /META-INF/MANIFEST.MF is either first or only preceded by /META-INF/ I suspect I'm going to need to revert the to changes. I'm currently looking into alternatives. Aha! There is an undocumented attribute on the Zip task (and hence inherited by the Jar task) that can be used to specify the last modified time for all Jar entries. I'll revert the to and use this attribute instead. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-85-trunk
The Buildbot has detected a new failure on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2660 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 50484f0b3a44cbe6599d18449c6d8f6454355310 Blamelist: Mark Thomas BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Reproducible builds
On 22/03/2021 14:53, Konstantin Kolinko wrote: пн, 22 мар. 2021 г. в 17:32, Mark Thomas : On 22/03/2021 13:16, Konstantin Kolinko wrote: сб, 20 мар. 2021 г. в 18:24, Emmanuel Bourg : I got a quick look, I guess you replaced the tasks with to make the timestamp of the zip entries reproducible? I'm not sure this is sufficient, there is no guarantee the order of the entries will be the same (this is usually dependent on the filesystem used, I don't think Ant sorts the entries). I have not reviewed the changes, but jar and zip differ in a) placement of Manifest file (jar spec requires it to be the first file in the archive IIRC) b) encoding used for file names (jar uses UTF-8, zip uses platform default) I couldn't find a reference to a requirement regarding the location of MANIFEST. Do you have a reference? I do not see with quick search in current spec [1], but I see it mentioned and discussed here: [2] https://en.wikipedia.org/wiki/JAR_(file_format)#Manifest [3] https://stackoverflow.com/questions/4727637/how-do-i-verify-the-order-of-manifest-mf-within-jar I did a little more digging. There is an assumption in JarInputStream that /META-INF/MANIFEST.MF is either first or only preceded by /META-INF/ I suspect I'm going to need to revert the to changes. I'm currently looking into alternatives. Mark [1] https://docs.oracle.com/javase/8/docs/technotes/guides/jar/jar.html Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix NPE
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new d506092 Fix NPE
d506092 is described below
commit d506092689a714d80d84a9e898433d6b3f961fed
Author: Mark Thomas
AuthorDate: Tue Mar 23 12:51:07 2021 +
Fix NPE
---
java/org/apache/coyote/http2/Stream.java | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index e10fa5c..0fd8cbd 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -643,8 +643,15 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
if (log.isDebugEnabled()) {
log.debug(sm.getString("stream.recycle", getConnectionId(),
getIdAsString()));
}
-handler.replaceStream(
-this, new RecycledStream(getConnectionId(), getIdentifier(),
state, getInputByteBuffer().remaining()));
+int remaining;
+// May be null if stream was closed before any DATA frames were
processed.
+ByteBuffer inputByteBuffer = getInputByteBuffer();
+if (inputByteBuffer == null) {
+remaining = 0;
+} else {
+remaining = inputByteBuffer.remaining();
+}
+handler.replaceStream(this, new RecycledStream(getConnectionId(),
getIdentifier(), state, remaining));
}
-
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 NPE
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 33fefc9 Fix NPE
33fefc9 is described below
commit 33fefc9e935f1967cf6dffcd85abb60dbd5837b6
Author: Mark Thomas
AuthorDate: Tue Mar 23 12:51:07 2021 +
Fix NPE
---
java/org/apache/coyote/http2/Stream.java | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 5b96d99..dc6ef2d 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -680,8 +680,15 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
if (log.isDebugEnabled()) {
log.debug(sm.getString("stream.recycle", getConnectionId(),
getIdAsString()));
}
-handler.replaceStream(
-this, new RecycledStream(getConnectionId(), getIdentifier(),
state, getInputByteBuffer().remaining()));
+int remaining;
+// May be null if stream was closed before any DATA frames were
processed.
+ByteBuffer inputByteBuffer = getInputByteBuffer();
+if (inputByteBuffer == null) {
+remaining = 0;
+} else {
+remaining = inputByteBuffer.remaining();
+}
+handler.replaceStream(this, new RecycledStream(getConnectionId(),
getIdentifier(), state, remaining));
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (c1b85e4 -> 53011ce)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from c1b85e4 Potential fix for failing CI tests at GitHub add 53011ce Fix NPE No new revisions were added by this update. Summary of changes: java/org/apache/coyote/http2/Stream.java | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-9-trunk
The Buildbot has detected a new failure on builder tomcat-9-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9-trunk/builds/697 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' triggered this build Build Source Stamp: [branch 9.0.x] 0e8db34ff6206158fe77806622d19144aa278867 Blamelist: Mark Thomas BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5745 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] c1b85e442581ec2738493cc98ec35183830c0f99 Blamelist: Mark Thomas BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Potential fix for failing CI tests at GitHub
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 50484f0 Potential fix for failing CI tests at GitHub
50484f0 is described below
commit 50484f0b3a44cbe6599d18449c6d8f6454355310
Author: Mark Thomas
AuthorDate: Tue Mar 23 10:42:14 2021 +
Potential fix for failing CI tests at GitHub
---
java/org/apache/coyote/http2/Stream.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 13ea2b5..e10fa5c 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1252,9 +1252,11 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
}
private final void swallowUnread() throws IOException {
+synchronized (this) {
+closed = true;
+}
if (inBuffer != null) {
synchronized (inBuffer) {
-closed = true;
int unreadByteCount = inBuffer.position();
if (log.isDebugEnabled()) {
log.debug(sm.getString("stream.inputBuffer.swallowUnread",
Integer.valueOf(unreadByteCount)));
-
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: Potential fix for failing CI tests at GitHub
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 0e8db34 Potential fix for failing CI tests at GitHub
0e8db34 is described below
commit 0e8db34ff6206158fe77806622d19144aa278867
Author: Mark Thomas
AuthorDate: Tue Mar 23 10:42:14 2021 +
Potential fix for failing CI tests at GitHub
---
java/org/apache/coyote/http2/Stream.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index ad637fa..5b96d99 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1190,9 +1190,11 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
}
private final void swallowUnread() throws IOException {
+synchronized (this) {
+closed = true;
+}
if (inBuffer != null) {
synchronized (inBuffer) {
-closed = true;
int unreadByteCount = inBuffer.position();
if (log.isDebugEnabled()) {
log.debug(sm.getString("stream.inputBuffer.swallowUnread",
Integer.valueOf(unreadByteCount)));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Potential fix for failing CI tests at GitHub
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new c1b85e4 Potential fix for failing CI tests at GitHub
c1b85e4 is described below
commit c1b85e442581ec2738493cc98ec35183830c0f99
Author: Mark Thomas
AuthorDate: Tue Mar 23 10:42:14 2021 +
Potential fix for failing CI tests at GitHub
---
java/org/apache/coyote/http2/Stream.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index b577d6e..ca68514 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -1190,9 +1190,11 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
}
private final void swallowUnread() throws IOException {
+synchronized (this) {
+closed = true;
+}
if (inBuffer != null) {
synchronized (inBuffer) {
-closed = true;
int unreadByteCount = inBuffer.position();
if (log.isDebugEnabled()) {
log.debug(sm.getString("stream.inputBuffer.swallowUnread",
Integer.valueOf(unreadByteCount)));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
