[Bug 60030] Run away CPU with JSSE / OpenSSL with IE8
https://bz.apache.org/bugzilla/show_bug.cgi?id=60030 --- Comment #5 from qiseqeberufe --- Terima kasih sudah menyempatkan diri anda melihat tulisan ini !!! karena di sini anda bisa bermain game judi online indonesia terbaik dan terpercaya di indonesia . Dengan deposit yang murah sekali anda bisa bermain berbagai macam permainan game judi online indonesia. Terima kasih dan segeralah mendaftarkan diri anda disini sekarang juga !!! https://199.192.31.27 https://199.192.31.83 -- 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
[ANN] Apache Tomcat 8.5.68 available
The Apache Tomcat team announces the immediate availability of Apache Tomcat 8.5.68. Apache Tomcat 8 is an open source software implementation of the Java Servlet, JavaServer Pages, Java Unified Expression Language, Java WebSocket and Java Authentication Service Provider Interface for Containers technologies. Apache Tomcat 8.5.68 is a bugfix and feature release. (Please note that 8.5.67 was not released due to a problem with artifact-signing which was corrected in this 8.5.68 release). The notable changes compared to 8.5.66 include: - Improve robustness of HTTP/2 HPACK decoding - Improvements to the handling of the Transfer-Encoding header - Review code used to generate Java source from JSPs and tags and remove code found to be unnecessary. Please refer to the change log for the complete list of changes: http://tomcat.apache.org/tomcat-8.5-doc/changelog.html Downloads: http://tomcat.apache.org/download-80.cgi Migration guides from Apache Tomcat 7.x and 8.0.x: http://tomcat.apache.org/migration.html Enjoy! - The Apache Tomcat team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [ANN] Apache Tomcat 8.5.68 available
All, Apologies for the repeated messages. I'm getting bounces from the cross-posted announce@ mailing lists because I'm not emailing from @apache.org source. I think I just need one last try... -chris On 6/16/21 16:53, Christopher Schultz wrote: The Apache Tomcat team announces the immediate availability of Apache Tomcat 8.5.68. Apache Tomcat 8 is an open source software implementation of the Java Servlet, JavaServer Pages, Java Unified Expression Language, Java WebSocket and Java Authentication Service Provider Interface for Containers technologies. Apache Tomcat 8.5.68 is a bugfix and feature release. (Please note that 8.5.67 was not released due to a problem with artifact-signing which was corrected in this 8.5.68 release). The notable changes compared to 8.5.66 include: - Improve robustness of HTTP/2 HPACK decoding - Improvements to the handling of the Transfer-Encoding header - Review code used to generate Java source from JSPs and tags and remove code found to be unnecessary. Please refer to the change log for the complete list of changes: http://tomcat.apache.org/tomcat-8.5-doc/changelog.html Downloads: http://tomcat.apache.org/download-80.cgi Migration guides from Apache Tomcat 7.x and 8.0.x: http://tomcat.apache.org/migration.html Enjoy! - The Apache Tomcat team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 8.5.68 available
The Apache Tomcat team announces the immediate availability of Apache Tomcat 8.5.68. Apache Tomcat 8 is an open source software implementation of the Java Servlet, JavaServer Pages, Java Unified Expression Language, Java WebSocket and Java Authentication Service Provider Interface for Containers technologies. Apache Tomcat 8.5.68 is a bugfix and feature release. (Please note that 8.5.67 was not released due to a problem with artifact-signing which was corrected in this 8.5.68 release). The notable changes compared to 8.5.66 include: - Improve robustness of HTTP/2 HPACK decoding - Improvements to the handling of the Transfer-Encoding header - Review code used to generate Java source from JSPs and tags and remove code found to be unnecessary. Please refer to the change log for the complete list of changes: http://tomcat.apache.org/tomcat-8.5-doc/changelog.html Downloads: http://tomcat.apache.org/download-80.cgi Migration guides from Apache Tomcat 7.x and 8.0.x: http://tomcat.apache.org/migration.html Enjoy! - The Apache Tomcat team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65385] Link to Maven Central is not valid
https://bz.apache.org/bugzilla/show_bug.cgi?id=65385 Michael Osipov changed: What|Removed |Added OS||All --- Comment #1 from Michael Osipov --- It should also read: Maven Central repository. -- 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.0.x
The Buildbot has detected a restored build on builder tomcat-9.0.x while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9.0.x/builds/36 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9.0-commit' triggered this build Build Source Stamp: [branch 9.0.x] 1df5699aa2f22c67083d26ec672534f3be543512 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 65385] New: Link to Maven Central is not valid
https://bz.apache.org/bugzilla/show_bug.cgi?id=65385 Bug ID: 65385 Summary: Link to Maven Central is not valid Product: Tomcat 10 Version: unspecified Hardware: PC Status: NEW Severity: minor Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: lu...@hastatus.com.br Target Milestone: -- Created attachment 37901 --> https://bz.apache.org/bugzilla/attachment.cgi?id=37901=edit Screenshot Acess: https://tomcat.apache.org/tomcat-10.0-doc/maven-jars.html Section "Tomcat Releases": The link provided is not valid: https://repo2.maven.org/maven2/org/apache/tomcat/ This one works fine: https://repo1.maven.org/maven2/org/apache/tomcat/ -- 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-10.0.x
The Buildbot has detected a restored build on builder tomcat-10.0.x while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-10.0.x/builds/52 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-10.0-commit' triggered this build Build Source Stamp: [branch 10.0.x] c0bd6ed31e315df8d0a9a0169a01f52636544a14 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 65384] org.apache.coyote.http2.TestFlowControl test depends on user's language
https://bz.apache.org/bugzilla/show_bug.cgi?id=65384 Christopher Schultz changed: What|Removed |Added OS||All --- Comment #1 from Christopher Schultz --- $god help us if we run it in Turkish locale[1]. :) [1] https://mattryall.net/blog/the-infamous-turkish-locale-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
[Bug 65384] New: org.apache.coyote.http2.TestFlowControl test depends on user's language
https://bz.apache.org/bugzilla/show_bug.cgi?id=65384 Bug ID: 65384 Summary: org.apache.coyote.http2.TestFlowControl test depends on user's language Product: Tomcat 9 Version: 9.0.48 Hardware: PC Status: NEW Severity: minor Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: knst.koli...@gmail.com Target Milestone: - Running the unit tests for Tomcat 9.0.48, the following test fails: Testsuite: org.apache.coyote.http2.TestFlowControl Tests run: 1, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 1,589 sec [...] - --- Testcase: testNotFound[0] took 1,399 sec FAILED expected:<...[content-language]-[[en]] 3-Header-[content-...> but was:<...[content-language]-[[ru]] 3-Header-[content-...> junit.framework.AssertionFailedError: expected:<...[content-language]-[[en]] 3-Header-[content-...> but was:<...[content-language]-[[ru]] 3-Header-[content-...> at org.apache.coyote.http2.TestFlowControl.testNotFound(TestFlowControl.java:97) Apparently it expects content-language to be English, but for some reason it differs. -- 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
[ANN] Apache Tomcat 8.5.68 available
The Apache Tomcat team announces the immediate availability of Apache Tomcat 8.5.68. Apache Tomcat 8 is an open source software implementation of the Java Servlet, JavaServer Pages, Java Unified Expression Language, Java WebSocket and Java Authentication Service Provider Interface for Containers technologies. Apache Tomcat 8.5.68 is a bugfix and feature release. (Please note that 8.5.67 was not released due to a problem with artifact-signing which was corrected in this 8.5.68 release). The notable changes compared to 8.5.66 include: - Improve robustness of HTTP/2 HPACK decoding - Improvements to the handling of the Transfer-Encoding header - Review code used to generate Java source from JSPs and tags and remove code found to be unnecessary. Please refer to the change log for the complete list of changes: http://tomcat.apache.org/tomcat-8.5-doc/changelog.html Downloads: http://tomcat.apache.org/download-80.cgi Migration guides from Apache Tomcat 7.x and 8.0.x: http://tomcat.apache.org/migration.html Enjoy! - The Apache Tomcat team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65369] Windows Service not open modules for Java 16
https://bz.apache.org/bugzilla/show_bug.cgi?id=65369 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- Fixed in: - 10.1.x for 10.1.0-M2 onwards - 10.0.x for 10.0.8 onwards - 9.0.x for 9.0.49 onwards - 8.5.x for 8.5.69 onwards -- 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
[tomcat] branch 8.5.x updated: Fix BZ 6539. Closes #422. Add Java 16+ options to service.bat
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 df0f798 Fix BZ 6539. Closes #422. Add Java 16+ options to service.bat df0f798 is described below commit df0f798ae51554b56d6d5985d1fb1c351b47107b Author: Mark Thomas AuthorDate: Wed Jun 16 15:00:35 2021 +0100 Fix BZ 6539. Closes #422. Add Java 16+ options to service.bat https://bz.apache.org/bugzilla/show_bug.cgi?id=65369 --- bin/service.bat| 2 +- webapps/docs/changelog.xml | 6 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/service.bat b/bin/service.bat index b6a2d86..a1ab56d 100755 --- a/bin/service.bat +++ b/bin/service.bat @@ -226,7 +226,7 @@ if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" ( --StartParams start ^ --StopParams stop ^ --JvmOptions "-Dcatalina.home=%CATALINA_HOME%;-Dcatalina.base=%CATALINA_BASE%;-D%ENDORSED_PROP%=%CATALINA_HOME%\endorsed;-Djava.io.tmpdir=%CATALINA_BASE%\temp;-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager;-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties;%JvmArgs%" ^ ---JvmOptions9 "--add-opens=java.base/java.lang=ALL-UNNAMED#--add-opens=java.base/java.io=ALL-UNNAMED#--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" ^ +--JvmOptions9 "--add-opens=java.base/java.lang=ALL-UNNAMED#--add-opens=java.base/java.io=ALL-UNNAMED#--add-opens=java.base/java.util=ALL-UNNAMED#--add-opens=java.base/java.util.concurrent=ALL-UNNAMED#--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" ^ --Startup "%SERVICE_STARTUP_MODE%" ^ --JvmMs "%JvmMs%" ^ --JvmMx "%JvmMx%" diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 8233e4b..0d0070e 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -180,6 +180,12 @@ Update to the Java 7 compatible build of JSign 3.1 to pick up a fix for SHA-512 signatures. (markt) + +65369 / 422: Add the additional +--add-opens=... options required for running Tomcat on Java +16 onwards to the service.bat script to align it with the +other start-up scripts. PR provided by MCMicS. (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 BZ 6539. Closes #422. Add Java 16+ options to service.bat
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 1df5699 Fix BZ 6539. Closes #422. Add Java 16+ options to service.bat 1df5699 is described below commit 1df5699aa2f22c67083d26ec672534f3be543512 Author: Mark Thomas AuthorDate: Wed Jun 16 15:00:35 2021 +0100 Fix BZ 6539. Closes #422. Add Java 16+ options to service.bat https://bz.apache.org/bugzilla/show_bug.cgi?id=65369 --- bin/service.bat| 2 +- webapps/docs/changelog.xml | 6 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/service.bat b/bin/service.bat index b6a2d86..a1ab56d 100755 --- a/bin/service.bat +++ b/bin/service.bat @@ -226,7 +226,7 @@ if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" ( --StartParams start ^ --StopParams stop ^ --JvmOptions "-Dcatalina.home=%CATALINA_HOME%;-Dcatalina.base=%CATALINA_BASE%;-D%ENDORSED_PROP%=%CATALINA_HOME%\endorsed;-Djava.io.tmpdir=%CATALINA_BASE%\temp;-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager;-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties;%JvmArgs%" ^ ---JvmOptions9 "--add-opens=java.base/java.lang=ALL-UNNAMED#--add-opens=java.base/java.io=ALL-UNNAMED#--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" ^ +--JvmOptions9 "--add-opens=java.base/java.lang=ALL-UNNAMED#--add-opens=java.base/java.io=ALL-UNNAMED#--add-opens=java.base/java.util=ALL-UNNAMED#--add-opens=java.base/java.util.concurrent=ALL-UNNAMED#--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" ^ --Startup "%SERVICE_STARTUP_MODE%" ^ --JvmMs "%JvmMs%" ^ --JvmMx "%JvmMx%" diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 54b01a3..9e06206 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -180,6 +180,12 @@ Update the CXF module to Apache CXF 3.4.4. (remm) + +65369 / 422: Add the additional +--add-opens=... options required for running Tomcat on Java +16 onwards to the service.bat script to align it with the +other start-up scripts. PR provided by MCMicS. (markt) + - 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 BZ 6539. Closes #422. Add Java 16+ options to service.bat
This is an automated email from the ASF dual-hosted git repository. markt 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 c0bd6ed Fix BZ 6539. Closes #422. Add Java 16+ options to service.bat c0bd6ed is described below commit c0bd6ed31e315df8d0a9a0169a01f52636544a14 Author: Mark Thomas AuthorDate: Wed Jun 16 15:00:35 2021 +0100 Fix BZ 6539. Closes #422. Add Java 16+ options to service.bat https://bz.apache.org/bugzilla/show_bug.cgi?id=65369 --- bin/service.bat| 2 +- webapps/docs/changelog.xml | 6 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/service.bat b/bin/service.bat index b6a2d86..a1ab56d 100755 --- a/bin/service.bat +++ b/bin/service.bat @@ -226,7 +226,7 @@ if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" ( --StartParams start ^ --StopParams stop ^ --JvmOptions "-Dcatalina.home=%CATALINA_HOME%;-Dcatalina.base=%CATALINA_BASE%;-D%ENDORSED_PROP%=%CATALINA_HOME%\endorsed;-Djava.io.tmpdir=%CATALINA_BASE%\temp;-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager;-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties;%JvmArgs%" ^ ---JvmOptions9 "--add-opens=java.base/java.lang=ALL-UNNAMED#--add-opens=java.base/java.io=ALL-UNNAMED#--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" ^ +--JvmOptions9 "--add-opens=java.base/java.lang=ALL-UNNAMED#--add-opens=java.base/java.io=ALL-UNNAMED#--add-opens=java.base/java.util=ALL-UNNAMED#--add-opens=java.base/java.util.concurrent=ALL-UNNAMED#--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" ^ --Startup "%SERVICE_STARTUP_MODE%" ^ --JvmMs "%JvmMs%" ^ --JvmMx "%JvmMx%" diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index efd8c66..a18fe7d 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -184,6 +184,12 @@ Update the CXF module to Apache CXF 3.4.4. (remm) + +65369 / 422: Add the additional +--add-opens=... options required for running Tomcat on Java +16 onwards to the service.bat script to align it with the +other start-up scripts. PR provided by MCMicS. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix BZ 6539. Closes #422. Add Java 16+ options to service.bat
This is an automated email from the ASF dual-hosted git repository. markt 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 8e15d4e Fix BZ 6539. Closes #422. Add Java 16+ options to service.bat 8e15d4e is described below commit 8e15d4e69acf85897b078be2448e7149dfe86a6c Author: Mark Thomas AuthorDate: Wed Jun 16 15:00:35 2021 +0100 Fix BZ 6539. Closes #422. Add Java 16+ options to service.bat https://bz.apache.org/bugzilla/show_bug.cgi?id=65369 --- bin/service.bat| 2 +- webapps/docs/changelog.xml | 6 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/service.bat b/bin/service.bat index b6a2d86..a1ab56d 100755 --- a/bin/service.bat +++ b/bin/service.bat @@ -226,7 +226,7 @@ if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" ( --StartParams start ^ --StopParams stop ^ --JvmOptions "-Dcatalina.home=%CATALINA_HOME%;-Dcatalina.base=%CATALINA_BASE%;-D%ENDORSED_PROP%=%CATALINA_HOME%\endorsed;-Djava.io.tmpdir=%CATALINA_BASE%\temp;-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager;-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties;%JvmArgs%" ^ ---JvmOptions9 "--add-opens=java.base/java.lang=ALL-UNNAMED#--add-opens=java.base/java.io=ALL-UNNAMED#--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" ^ +--JvmOptions9 "--add-opens=java.base/java.lang=ALL-UNNAMED#--add-opens=java.base/java.io=ALL-UNNAMED#--add-opens=java.base/java.util=ALL-UNNAMED#--add-opens=java.base/java.util.concurrent=ALL-UNNAMED#--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" ^ --Startup "%SERVICE_STARTUP_MODE%" ^ --JvmMs "%JvmMs%" ^ --JvmMx "%JvmMx%" diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ce0a60c..32f8e59 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -184,6 +184,12 @@ Update the CXF module to Apache CXF 3.4.4. (remm) + +65369 / 422: Add the additional +--add-opens=... options required for running Tomcat on Java +16 onwards to the service.bat script to align it with the +other start-up scripts. PR provided by MCMicS. (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: Remove trailing space
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 24e8598 Remove trailing space 24e8598 is described below commit 24e85983b7411f99713e78ce35392c207a4475be Author: Mark Thomas AuthorDate: Wed Jun 16 14:51:08 2021 +0100 Remove trailing space --- 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 238e94ba..8233e4b 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -168,7 +168,7 @@ was one byte smaller than the configured size. The buffer was flushed (and the response committed if required) when the buffer was full. The buffer is now flushed (and the response committed if required) if the -buffer is full and there is more data to write. (markt) +buffer is full and there is more data to write. (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: Remove trailing space
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 f7bed9a Remove trailing space f7bed9a is described below commit f7bed9aa9276efe62ce705ccf42919f72f2caa55 Author: Mark Thomas AuthorDate: Wed Jun 16 14:51:08 2021 +0100 Remove trailing space --- 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 eed8ced..54b01a3 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -168,7 +168,7 @@ was one byte smaller than the configured size. The buffer was flushed (and the response committed if required) when the buffer was full. The buffer is now flushed (and the response committed if required) if the -buffer is full and there is more data to write. (markt) +buffer is full and there is more data to write. (markt) - 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: Remove trailing space
This is an automated email from the ASF dual-hosted git repository. markt 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 6be453a Remove trailing space 6be453a is described below commit 6be453ab3038e253c8b5ac49d6ea7b6c4ab624ff Author: Mark Thomas AuthorDate: Wed Jun 16 14:51:08 2021 +0100 Remove trailing space --- 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 45c1b8e..efd8c66 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -168,7 +168,7 @@ was one byte smaller than the configured size. The buffer was flushed (and the response committed if required) when the buffer was full. The buffer is now flushed (and the response committed if required) if the -buffer is full and there is more data to write. (markt) +buffer is full and there is more data to write. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Remove trailing space
This is an automated email from the ASF dual-hosted git repository. markt 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 c6483dc Remove trailing space c6483dc is described below commit c6483dc73d9c21120e9139a421d5111869a4d31d Author: Mark Thomas AuthorDate: Wed Jun 16 14:51:08 2021 +0100 Remove trailing space --- 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 2defc71..ce0a60c 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -168,7 +168,7 @@ was one byte smaller than the configured size. The buffer was flushed (and the response committed if required) when the buffer was full. The buffer is now flushed (and the response committed if required) if the -buffer is full and there is more data to write. (markt) +buffer is full and there is more data to write. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65302] Add support for setting com.sun.jndi.ldap.tls.cbtype
https://bz.apache.org/bugzilla/show_bug.cgi?id=65302 Michael Osipov changed: What|Removed |Added CC||micha...@apache.org -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65382] Silent installation fails
https://bz.apache.org/bugzilla/show_bug.cgi?id=65382 Remy Maucherat changed: What|Removed |Added Resolution|--- |WORKSFORME Status|REOPENED|RESOLVED --- Comment #3 from Remy Maucherat --- Please do not reopen the report without giving useful new information and try the mailing list as suggested. There has been no change to the install script since 10.0.4, and no NSIS update so no possible regression. This also works fine for me on my test system: fails without a JVM, works with it. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65382] Silent installation fails
https://bz.apache.org/bugzilla/show_bug.cgi?id=65382 Jake Shackelford changed: What|Removed |Added Resolution|WORKSFORME |--- Status|RESOLVED|REOPENED --- Comment #2 from Jake Shackelford --- Installing it manually works fine and doesn't error out. In this case Java was not installed however /S worked on the 10.0.4 version. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-9.0.x
The Buildbot has detected a new failure on builder tomcat-9.0.x while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9.0.x/builds/35 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9.0-commit' triggered this build Build Source Stamp: [branch 9.0.x] fa0e607705f45e7dc980fedeefcb880098073736 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
[Bug 63191] RemoteEndpoint.Async#sendText(String, SendHandler) never calls the callback
https://bz.apache.org/bugzilla/show_bug.cgi?id=63191 --- Comment #18 from Boris Petrov --- Still happening on Tomcat 9.0.48 and CometD 6.0.3. Here is a blocked thread's stack: java.lang.Thread.State: WAITING (parking) at jdk.internal.misc.Unsafe.park(java.base@16.0.1/Native Method) - parking to wait for <0x0006168051e0> (a java.util.concurrent.CompletableFuture$Signaller) at java.util.concurrent.locks.LockSupport.park(java.base@16.0.1/LockSupport.java:211) at java.util.concurrent.CompletableFuture$Signaller.block(java.base@16.0.1/CompletableFuture.java:1860) at java.util.concurrent.ForkJoinPool.managedBlock(java.base@16.0.1/ForkJoinPool.java:3137) at java.util.concurrent.CompletableFuture.waitingGet(java.base@16.0.1/CompletableFuture.java:1894) at java.util.concurrent.CompletableFuture.get(java.base@16.0.1/CompletableFuture.java:2068) at org.cometd.server.websocket.javax.WebSocketEndPoint.onMessage(WebSocketEndPoint.java:62) at org.cometd.server.websocket.javax.WebSocketEndPoint.onMessage(WebSocketEndPoint.java:35) at org.apache.tomcat.websocket.WsFrameBase.sendMessageText(WsFrameBase.java:415) at org.apache.tomcat.websocket.server.WsFrameServer.sendMessageText(WsFrameServer.java:129) at org.apache.tomcat.websocket.WsFrameBase.processDataText(WsFrameBase.java:515) at org.apache.tomcat.websocket.WsFrameBase.processData(WsFrameBase.java:301) at org.apache.tomcat.websocket.WsFrameBase.processInputBuffer(WsFrameBase.java:133) at org.apache.tomcat.websocket.server.WsFrameServer.onDataAvailable(WsFrameServer.java:85) at org.apache.tomcat.websocket.server.WsFrameServer.doOnDataAvailable(WsFrameServer.java:183) at org.apache.tomcat.websocket.server.WsFrameServer.notifyDataAvailable(WsFrameServer.java:162) at org.apache.tomcat.websocket.server.WsHttpUpgradeHandler.upgradeDispatch(WsHttpUpgradeHandler.java:156) at org.apache.coyote.http11.upgrade.UpgradeProcessorInternal.dispatch(UpgradeProcessorInternal.java:60) at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:59) at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:893) at org.apache.tomcat.util.net.AprEndpoint$SocketProcessor.doRun(AprEndpoint.java:2049) at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49) - locked <0x000616804fa0> (a org.apache.tomcat.util.net.AprEndpoint$AprSocketWrapper) at java.util.concurrent.ThreadPoolExecutor.runWorker(java.base@16.0.1/ThreadPoolExecutor.java:1130) at java.util.concurrent.ThreadPoolExecutor$Worker.run(java.base@16.0.1/ThreadPoolExecutor.java:630) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.lang.Thread.run(java.base@16.0.1/Thread.java:831) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Add expanded unit tests for HEAD and fix bugs identified in buffering
On Wed, Jun 16, 2021 at 11:15 AM Mark Thomas wrote: > On 16/06/2021 10:11, ma...@apache.org wrote: > > This is an automated email from the ASF dual-hosted git repository. > > > > markt 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 e98409e Add expanded unit tests for HEAD and fix bugs > identified in buffering > > e98409e is described below > > > > commit e98409e3bb9ae1e29e607ca511eb99dfcf3014a0 > > Author: Mark Thomas > > AuthorDate: Thu Jun 3 16:44:41 2021 +0100 > > > > Add expanded unit tests for HEAD and fix bugs identified in > buffering > > Please try and break this. I checked and re-checked this and I think it > is correct but there is an opportunity here for an off-by-one error > triggering response corruption and that would be really bad. > This looks good to me, as demonstrated by your test failure, you should now get a more "perfect" buffering behavior. Rémy > > Thanks, > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[tomcat] branch 8.5.x updated: Fix test broken by response buffer fixes
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 4d08ac6 Fix test broken by response buffer fixes
4d08ac6 is described below
commit 4d08ac6b5f490223adc4ea37930116852cc9fadd
Author: Mark Thomas
AuthorDate: Wed Jun 16 11:45:42 2021 +0100
Fix test broken by response buffer fixes
The 8192 byte response body fills the response buffer but does not (now)
trigger a commit so Tomcat is able to set the content-length header in
post-processing.
---
test/org/apache/coyote/http2/TestHttp2Section_6_9.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
b/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
index dd77220..6fecb93 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
@@ -193,6 +193,7 @@ public class TestHttp2Section_6_9 extends Http2TestBase {
Assert.assertEquals(
"3-HeadersStart\n" +
"3-Header-[:status]-[200]\n" +
+"3-Header-[content-length]-[8192]\n" +
"3-Header-[date]-["+ DEFAULT_DATE + "]\n" +
"3-HeadersEnd\n" +
"3-Body-4096\n", output.getTrace());
-
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 test broken by response buffer fixes
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 6d5343a Fix test broken by response buffer fixes
6d5343a is described below
commit 6d5343afe856e28e2aa92d616301e4ce70c81af9
Author: Mark Thomas
AuthorDate: Wed Jun 16 11:45:42 2021 +0100
Fix test broken by response buffer fixes
The 8192 byte response body fills the response buffer but does not (now)
trigger a commit so Tomcat is able to set the content-length header in
post-processing.
---
test/org/apache/coyote/http2/TestHttp2Section_6_9.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
b/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
index dd77220..6fecb93 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
@@ -193,6 +193,7 @@ public class TestHttp2Section_6_9 extends Http2TestBase {
Assert.assertEquals(
"3-HeadersStart\n" +
"3-Header-[:status]-[200]\n" +
+"3-Header-[content-length]-[8192]\n" +
"3-Header-[date]-["+ DEFAULT_DATE + "]\n" +
"3-HeadersEnd\n" +
"3-Body-4096\n", output.getTrace());
-
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 test broken by response buffer fixes
This is an automated email from the ASF dual-hosted git repository.
markt 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 df77232 Fix test broken by response buffer fixes
df77232 is described below
commit df772325c7880d6e690208b23d884e959f28b3f0
Author: Mark Thomas
AuthorDate: Wed Jun 16 11:45:42 2021 +0100
Fix test broken by response buffer fixes
The 8192 byte response body fills the response buffer but does not (now)
trigger a commit so Tomcat is able to set the content-length header in
post-processing.
---
test/org/apache/coyote/http2/TestHttp2Section_6_9.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
b/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
index dd77220..6fecb93 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
@@ -193,6 +193,7 @@ public class TestHttp2Section_6_9 extends Http2TestBase {
Assert.assertEquals(
"3-HeadersStart\n" +
"3-Header-[:status]-[200]\n" +
+"3-Header-[content-length]-[8192]\n" +
"3-Header-[date]-["+ DEFAULT_DATE + "]\n" +
"3-HeadersEnd\n" +
"3-Body-4096\n", output.getTrace());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix test broken by response buffer fixes
This is an automated email from the ASF dual-hosted git repository.
markt 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 fff8193 Fix test broken by response buffer fixes
fff8193 is described below
commit fff81935547a1f839f15b660db2dfd368ae96cf4
Author: Mark Thomas
AuthorDate: Wed Jun 16 11:45:42 2021 +0100
Fix test broken by response buffer fixes
The 8192 byte response body fills the response buffer but does not (now)
trigger a commit so Tomcat is able to set the content-length header in
post-processing.
---
test/org/apache/coyote/http2/TestHttp2Section_6_9.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
b/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
index dd77220..6fecb93 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
@@ -193,6 +193,7 @@ public class TestHttp2Section_6_9 extends Http2TestBase {
Assert.assertEquals(
"3-HeadersStart\n" +
"3-Header-[:status]-[200]\n" +
+"3-Header-[content-length]-[8192]\n" +
"3-Header-[date]-["+ DEFAULT_DATE + "]\n" +
"3-HeadersEnd\n" +
"3-Body-4096\n", output.getTrace());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-10.0.x
The Buildbot has detected a new failure on builder tomcat-10.0.x while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-10.0.x/builds/51 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-10.0-commit' triggered this build Build Source Stamp: [branch 10.0.x] 9db8dcff2c301b932773de8d99356dfd50fda28f 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: [tomcat] branch main updated: Add expanded unit tests for HEAD and fix bugs identified in buffering
On 16/06/2021 10:11, ma...@apache.org wrote: This is an automated email from the ASF dual-hosted git repository. markt 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 e98409e Add expanded unit tests for HEAD and fix bugs identified in buffering e98409e is described below commit e98409e3bb9ae1e29e607ca511eb99dfcf3014a0 Author: Mark Thomas AuthorDate: Thu Jun 3 16:44:41 2021 +0100 Add expanded unit tests for HEAD and fix bugs identified in buffering Please try and break this. I checked and re-checked this and I think it is correct but there is an opportunity here for an off-by-one error triggering response corruption and that would be really bad. Thanks, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Add expanded unit tests for HEAD and fix bugs identified in buffering
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 e71fc60 Add expanded unit tests for HEAD and fix bugs identified in
buffering
e71fc60 is described below
commit e71fc60180857a84af9dc6e5c1ba131ae9f50aa2
Author: Mark Thomas
AuthorDate: Thu Jun 3 16:44:41 2021 +0100
Add expanded unit tests for HEAD and fix bugs identified in buffering
---
.../apache/catalina/connector/OutputBuffer.java| 10 +-
test/javax/servlet/http/TestHttpServletDoHead.java | 223 +
webapps/docs/changelog.xml | 8 +
3 files changed, 236 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/connector/OutputBuffer.java
b/java/org/apache/catalina/connector/OutputBuffer.java
index 958a506..2ee976b 100644
--- a/java/org/apache/catalina/connector/OutputBuffer.java
+++ b/java/org/apache/catalina/connector/OutputBuffer.java
@@ -545,7 +545,7 @@ public class OutputBuffer extends Writer {
while (sOff < sEnd) {
int n = transfer(s, sOff, sEnd - sOff, cb);
sOff += n;
-if (isFull(cb)) {
+if (sOff < sEnd && isFull(cb)) {
flushCharBuffer();
}
}
@@ -746,7 +746,7 @@ public class OutputBuffer extends Writer {
int n = transfer(src, off, len, bb);
len = len - n;
off = off + n;
-if (isFull(bb)) {
+if (len > 0 && isFull(bb)) {
flushByteBuffer();
appendByteArray(src, off, len);
}
@@ -798,7 +798,7 @@ public class OutputBuffer extends Writer {
appendByteBuffer(from);
} else {
transfer(from, bb);
-if (isFull(bb)) {
+if (from.hasRemaining() && isFull(bb)) {
flushByteBuffer();
appendByteBuffer(from);
}
@@ -811,7 +811,7 @@ public class OutputBuffer extends Writer {
}
int limit = bb.capacity();
-while (len >= limit) {
+while (len > limit) {
realWriteBytes(ByteBuffer.wrap(src, off, limit));
len = len - limit;
off = off + limit;
@@ -829,7 +829,7 @@ public class OutputBuffer extends Writer {
int limit = bb.capacity();
int fromLimit = from.limit();
-while (from.remaining() >= limit) {
+while (from.remaining() > limit) {
from.limit(from.position() + limit);
realWriteBytes(from.slice());
from.position(from.limit());
diff --git a/test/javax/servlet/http/TestHttpServletDoHead.java
b/test/javax/servlet/http/TestHttpServletDoHead.java
new file mode 100644
index 000..49105a0
--- /dev/null
+++ b/test/javax/servlet/http/TestHttpServletDoHead.java
@@ -0,0 +1,223 @@
+/*
+ * 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.
+ */
+package javax.servlet.http;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
+
+@RunWith(Parameterized.class)
+public class TestHttpServletDoHead extends TomcatBaseTest {
+
+// Tomcat has a minimum output buffer size of 8 * 1024.
+// (8 * 1024) /16 = 512
+
+private static final String VALID = "** valid data **";
+private static final String INVALID = "* invalid data *";
+
+private static final Integer BUFFERS[] = new Integer[] { Integer.valueOf
(16), Integer.valueOf(8 * 1024),
[tomcat] branch 9.0.x updated: Add expanded unit tests for HEAD and fix bugs identified in buffering
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 fa0e607 Add expanded unit tests for HEAD and fix bugs identified in
buffering
fa0e607 is described below
commit fa0e607705f45e7dc980fedeefcb880098073736
Author: Mark Thomas
AuthorDate: Thu Jun 3 16:44:41 2021 +0100
Add expanded unit tests for HEAD and fix bugs identified in buffering
---
.../apache/catalina/connector/OutputBuffer.java| 10 +-
test/javax/servlet/http/TestHttpServletDoHead.java | 223 +
webapps/docs/changelog.xml | 8 +
3 files changed, 236 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/connector/OutputBuffer.java
b/java/org/apache/catalina/connector/OutputBuffer.java
index f6168a7..8f7d90d 100644
--- a/java/org/apache/catalina/connector/OutputBuffer.java
+++ b/java/org/apache/catalina/connector/OutputBuffer.java
@@ -527,7 +527,7 @@ public class OutputBuffer extends Writer {
while (sOff < sEnd) {
int n = transfer(s, sOff, sEnd - sOff, cb);
sOff += n;
-if (isFull(cb)) {
+if (sOff < sEnd && isFull(cb)) {
flushCharBuffer();
}
}
@@ -684,7 +684,7 @@ public class OutputBuffer extends Writer {
int n = transfer(src, off, len, bb);
len = len - n;
off = off + n;
-if (isFull(bb)) {
+if (len > 0 && isFull(bb)) {
flushByteBuffer();
appendByteArray(src, off, len);
}
@@ -736,7 +736,7 @@ public class OutputBuffer extends Writer {
appendByteBuffer(from);
} else {
transfer(from, bb);
-if (isFull(bb)) {
+if (from.hasRemaining() && isFull(bb)) {
flushByteBuffer();
appendByteBuffer(from);
}
@@ -749,7 +749,7 @@ public class OutputBuffer extends Writer {
}
int limit = bb.capacity();
-while (len >= limit) {
+while (len > limit) {
realWriteBytes(ByteBuffer.wrap(src, off, limit));
len = len - limit;
off = off + limit;
@@ -767,7 +767,7 @@ public class OutputBuffer extends Writer {
int limit = bb.capacity();
int fromLimit = from.limit();
-while (from.remaining() >= limit) {
+while (from.remaining() > limit) {
from.limit(from.position() + limit);
realWriteBytes(from.slice());
from.position(from.limit());
diff --git a/test/javax/servlet/http/TestHttpServletDoHead.java
b/test/javax/servlet/http/TestHttpServletDoHead.java
new file mode 100644
index 000..49105a0
--- /dev/null
+++ b/test/javax/servlet/http/TestHttpServletDoHead.java
@@ -0,0 +1,223 @@
+/*
+ * 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.
+ */
+package javax.servlet.http;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
+
+@RunWith(Parameterized.class)
+public class TestHttpServletDoHead extends TomcatBaseTest {
+
+// Tomcat has a minimum output buffer size of 8 * 1024.
+// (8 * 1024) /16 = 512
+
+private static final String VALID = "** valid data **";
+private static final String INVALID = "* invalid data *";
+
+private static final Integer BUFFERS[] = new Integer[] { Integer.valueOf
(16), Integer.valueOf(8 * 1024),
[tomcat] branch 10.0.x updated: Add expanded unit tests for HEAD and fix bugs identified in buffering
This is an automated email from the ASF dual-hosted git repository.
markt 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 9db8dcf Add expanded unit tests for HEAD and fix bugs identified in
buffering
9db8dcf is described below
commit 9db8dcff2c301b932773de8d99356dfd50fda28f
Author: Mark Thomas
AuthorDate: Thu Jun 3 16:44:41 2021 +0100
Add expanded unit tests for HEAD and fix bugs identified in buffering
---
.../apache/catalina/connector/OutputBuffer.java| 10 +-
.../servlet/http/TestHttpServletDoHead.java| 223 +
webapps/docs/changelog.xml | 8 +
3 files changed, 236 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/connector/OutputBuffer.java
b/java/org/apache/catalina/connector/OutputBuffer.java
index 0ea4dbd..d7a6783 100644
--- a/java/org/apache/catalina/connector/OutputBuffer.java
+++ b/java/org/apache/catalina/connector/OutputBuffer.java
@@ -527,7 +527,7 @@ public class OutputBuffer extends Writer {
while (sOff < sEnd) {
int n = transfer(s, sOff, sEnd - sOff, cb);
sOff += n;
-if (isFull(cb)) {
+if (sOff < sEnd && isFull(cb)) {
flushCharBuffer();
}
}
@@ -684,7 +684,7 @@ public class OutputBuffer extends Writer {
int n = transfer(src, off, len, bb);
len = len - n;
off = off + n;
-if (isFull(bb)) {
+if (len > 0 && isFull(bb)) {
flushByteBuffer();
appendByteArray(src, off, len);
}
@@ -736,7 +736,7 @@ public class OutputBuffer extends Writer {
appendByteBuffer(from);
} else {
transfer(from, bb);
-if (isFull(bb)) {
+if (from.hasRemaining() && isFull(bb)) {
flushByteBuffer();
appendByteBuffer(from);
}
@@ -749,7 +749,7 @@ public class OutputBuffer extends Writer {
}
int limit = bb.capacity();
-while (len >= limit) {
+while (len > limit) {
realWriteBytes(ByteBuffer.wrap(src, off, limit));
len = len - limit;
off = off + limit;
@@ -767,7 +767,7 @@ public class OutputBuffer extends Writer {
int limit = bb.capacity();
int fromLimit = from.limit();
-while (from.remaining() >= limit) {
+while (from.remaining() > limit) {
from.limit(from.position() + limit);
realWriteBytes(from.slice());
from.position(from.limit());
diff --git a/test/jakarta/servlet/http/TestHttpServletDoHead.java
b/test/jakarta/servlet/http/TestHttpServletDoHead.java
new file mode 100644
index 000..006c560
--- /dev/null
+++ b/test/jakarta/servlet/http/TestHttpServletDoHead.java
@@ -0,0 +1,223 @@
+/*
+ * 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.
+ */
+package jakarta.servlet.http;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import jakarta.servlet.ServletException;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
+
+@RunWith(Parameterized.class)
+public class TestHttpServletDoHead extends TomcatBaseTest {
+
+// Tomcat has a minimum output buffer size of 8 * 1024.
+// (8 * 1024) /16 = 512
+
+private static final String VALID = "** valid data **";
+private static final String INVALID = "* invalid data *";
+
+private static final Integer BUFFERS[] = new Integer[] { Integer.valueOf
(16), Integer.valueOf(8 *
[tomcat] branch main updated: Add expanded unit tests for HEAD and fix bugs identified in buffering
This is an automated email from the ASF dual-hosted git repository.
markt 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 e98409e Add expanded unit tests for HEAD and fix bugs identified in
buffering
e98409e is described below
commit e98409e3bb9ae1e29e607ca511eb99dfcf3014a0
Author: Mark Thomas
AuthorDate: Thu Jun 3 16:44:41 2021 +0100
Add expanded unit tests for HEAD and fix bugs identified in buffering
---
.../apache/catalina/connector/OutputBuffer.java| 10 +-
.../servlet/http/TestHttpServletDoHead.java| 223 +
webapps/docs/changelog.xml | 8 +
3 files changed, 236 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/connector/OutputBuffer.java
b/java/org/apache/catalina/connector/OutputBuffer.java
index 0ea4dbd..d7a6783 100644
--- a/java/org/apache/catalina/connector/OutputBuffer.java
+++ b/java/org/apache/catalina/connector/OutputBuffer.java
@@ -527,7 +527,7 @@ public class OutputBuffer extends Writer {
while (sOff < sEnd) {
int n = transfer(s, sOff, sEnd - sOff, cb);
sOff += n;
-if (isFull(cb)) {
+if (sOff < sEnd && isFull(cb)) {
flushCharBuffer();
}
}
@@ -684,7 +684,7 @@ public class OutputBuffer extends Writer {
int n = transfer(src, off, len, bb);
len = len - n;
off = off + n;
-if (isFull(bb)) {
+if (len > 0 && isFull(bb)) {
flushByteBuffer();
appendByteArray(src, off, len);
}
@@ -736,7 +736,7 @@ public class OutputBuffer extends Writer {
appendByteBuffer(from);
} else {
transfer(from, bb);
-if (isFull(bb)) {
+if (from.hasRemaining() && isFull(bb)) {
flushByteBuffer();
appendByteBuffer(from);
}
@@ -749,7 +749,7 @@ public class OutputBuffer extends Writer {
}
int limit = bb.capacity();
-while (len >= limit) {
+while (len > limit) {
realWriteBytes(ByteBuffer.wrap(src, off, limit));
len = len - limit;
off = off + limit;
@@ -767,7 +767,7 @@ public class OutputBuffer extends Writer {
int limit = bb.capacity();
int fromLimit = from.limit();
-while (from.remaining() >= limit) {
+while (from.remaining() > limit) {
from.limit(from.position() + limit);
realWriteBytes(from.slice());
from.position(from.limit());
diff --git a/test/jakarta/servlet/http/TestHttpServletDoHead.java
b/test/jakarta/servlet/http/TestHttpServletDoHead.java
new file mode 100644
index 000..006c560
--- /dev/null
+++ b/test/jakarta/servlet/http/TestHttpServletDoHead.java
@@ -0,0 +1,223 @@
+/*
+ * 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.
+ */
+package jakarta.servlet.http;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import jakarta.servlet.ServletException;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
+
+@RunWith(Parameterized.class)
+public class TestHttpServletDoHead extends TomcatBaseTest {
+
+// Tomcat has a minimum output buffer size of 8 * 1024.
+// (8 * 1024) /16 = 512
+
+private static final String VALID = "** valid data **";
+private static final String INVALID = "* invalid data *";
+
+private static final Integer BUFFERS[] = new Integer[] { Integer.valueOf
(16), Integer.valueOf(8 * 1024),
[tomcat] branch 8.5.x updated: Extend the time allowed for tests to complete
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 3276fb5 Extend the time allowed for tests to complete 3276fb5 is described below commit 3276fb532540d6563423302a7ff67c656c8db78d Author: Mark Thomas AuthorDate: Wed Jun 16 09:54:15 2021 +0100 Extend the time allowed for tests to complete --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1156345..0549d63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ install: script: - ant -q clean -- travis_wait 60 "./.travis/antTest.sh" +- travis_wait 120 "./.travis/antTest.sh" after_failure: - tail -n 5000 ant-test.log - 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: Extend the time allowed for tests to complete
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 04a5f8a Extend the time allowed for tests to complete 04a5f8a is described below commit 04a5f8a349625c2d57238135f4f0738df0cf7445 Author: Mark Thomas AuthorDate: Wed Jun 16 09:54:15 2021 +0100 Extend the time allowed for tests to complete --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1156345..0549d63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ install: script: - ant -q clean -- travis_wait 60 "./.travis/antTest.sh" +- travis_wait 120 "./.travis/antTest.sh" after_failure: - tail -n 5000 ant-test.log - 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: Extend the time allowed for tests to complete
This is an automated email from the ASF dual-hosted git repository. markt 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 3d8f94d Extend the time allowed for tests to complete 3d8f94d is described below commit 3d8f94da636f0e9bf70e7487889b2fae5080b130 Author: Mark Thomas AuthorDate: Wed Jun 16 09:54:15 2021 +0100 Extend the time allowed for tests to complete --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8556c36..75b0b24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,7 +80,7 @@ install: script: - ant -q clean -- travis_wait 60 "./.travis/antTest.sh" +- travis_wait 120 "./.travis/antTest.sh" after_failure: - tail -n 5000 ant-test.log - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Extend the time allowed for tests to complete
This is an automated email from the ASF dual-hosted git repository. markt 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 56e439a Extend the time allowed for tests to complete 56e439a is described below commit 56e439ada85c7c99cf3fa2d1b44bfdeb9a9d43eb Author: Mark Thomas AuthorDate: Wed Jun 16 09:54:15 2021 +0100 Extend the time allowed for tests to complete --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8556c36..75b0b24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,7 +80,7 @@ install: script: - ant -q clean -- travis_wait 60 "./.travis/antTest.sh" +- travis_wait 120 "./.travis/antTest.sh" after_failure: - tail -n 5000 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: Relax parsing of 1#token to align with RFC 7230 section 7
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 c484474 Relax parsing of 1#token to align with RFC 7230 section 7
c484474 is described below
commit c484474dc7a4fb6bc7fd7b2c6a797a1861e3122e
Author: Mark Thomas
AuthorDate: Wed Jun 16 09:45:31 2021 +0100
Relax parsing of 1#token to align with RFC 7230 section 7
---
.../apache/tomcat/util/http/parser/TokenList.java | 41 --
.../tomcat/util/http/parser/TestTokenList.java | 6 ++--
webapps/docs/changelog.xml | 5 +++
3 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/parser/TokenList.java
b/java/org/apache/tomcat/util/http/parser/TokenList.java
index 01ac449..ec69d3c 100644
--- a/java/org/apache/tomcat/util/http/parser/TokenList.java
+++ b/java/org/apache/tomcat/util/http/parser/TokenList.java
@@ -35,11 +35,12 @@ public class TokenList {
* parsed values to lower case.
*
* @param inputs The headers to parse
- * @param collection The Collection (usually a list of a set) to which the
+ * @param collection The Collection (usually a list or a set) to which the
* parsed tokens should be added
*
- * @return {@code} true if the header values were parsed cleanly, otherwise
- * {@code false} (e.g. if a non-token value was encountered)
+ * @return {@code} true if the header values were parsed cleanly and at
+ * least one token was found, otherwise {@code false} (e.g. if a
+ * non-token value was encountered)
*
* @throws IOException If an I/O error occurs reading the header
*/
@@ -59,14 +60,15 @@ public class TokenList {
/**
* Parses a header of the form 1#token, forcing all parsed values to lower
- * case. This is typically used when header values are case-insensitive.
+ * case.
*
* @param input The header to parse
- * @param collection The Collection (usually a list of a set) to which the
+ * @param collection The Collection (usually a list or a set) to which the
* parsed tokens should be added
*
- * @return {@code} true if the header was parsed cleanly, otherwise
- * {@code false} (e.g. if a non-token value was encountered)
+ * @return {@code} true if the header values were parsed cleanly and at
+ * least one token was found, otherwise {@code false} (e.g. if a
+ * non-token value was encountered)
*
* @throws IOException If an I/O error occurs reading the header
*/
@@ -75,17 +77,20 @@ public class TokenList {
boolean valid = false;
do {
-String fieldName = HttpParser.readToken(input);
-if (fieldName == null) {
-// Invalid field-name, skip to the next one
-invalid = true;
-HttpParser.skipUntil(input, 0, ',');
+String element = HttpParser.readToken(input);
+if (element == null) {
+// No token found. Could be empty element (which is OK for
+// 1#token - see RFC 7230 section 7) or a non-token.
+if (HttpParser.skipConstant(input, ",") != SkipResult.FOUND) {
+// Non-token element, skip to the next one
+invalid = true;
+HttpParser.skipUntil(input, 0, ',');
+}
continue;
}
-if (fieldName.length() == 0) {
-// Unexpected EOF. Should have been a token.
-invalid = true;
+if (element.length() == 0) {
+// EOF after empty element
break;
}
@@ -93,11 +98,11 @@ public class TokenList {
if (skipResult == SkipResult.EOF) {
// EOF
valid = true;
-collection.add(fieldName.toLowerCase(Locale.ENGLISH));
+collection.add(element.toLowerCase(Locale.ENGLISH));
break;
} else if (skipResult == SkipResult.FOUND) {
valid = true;
-collection.add(fieldName.toLowerCase(Locale.ENGLISH));
+collection.add(element.toLowerCase(Locale.ENGLISH));
continue;
} else {
// Not a token - ignore it
@@ -108,7 +113,7 @@ public class TokenList {
} while (true);
// Only return true if at least one valid token was read and no invalid
-// entries were found
+// elements were found
return valid && !invalid;
}
}
diff --git a/test/org/apache/tomcat/util/http/parser/TestTokenList.java
b/test/org/apache/tomcat/util/http/parser/TestTokenList.java
[tomcat] branch 9.0.x updated: Relax parsing of 1#token to align with RFC 7230 section 7
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 3bbaf48 Relax parsing of 1#token to align with RFC 7230 section 7
3bbaf48 is described below
commit 3bbaf488268deb5ab4db4d197e9da0c73207a60f
Author: Mark Thomas
AuthorDate: Wed Jun 16 09:45:31 2021 +0100
Relax parsing of 1#token to align with RFC 7230 section 7
---
.../apache/tomcat/util/http/parser/TokenList.java | 41 --
.../tomcat/util/http/parser/TestTokenList.java | 6 ++--
webapps/docs/changelog.xml | 5 +++
3 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/parser/TokenList.java
b/java/org/apache/tomcat/util/http/parser/TokenList.java
index 01ac449..ec69d3c 100644
--- a/java/org/apache/tomcat/util/http/parser/TokenList.java
+++ b/java/org/apache/tomcat/util/http/parser/TokenList.java
@@ -35,11 +35,12 @@ public class TokenList {
* parsed values to lower case.
*
* @param inputs The headers to parse
- * @param collection The Collection (usually a list of a set) to which the
+ * @param collection The Collection (usually a list or a set) to which the
* parsed tokens should be added
*
- * @return {@code} true if the header values were parsed cleanly, otherwise
- * {@code false} (e.g. if a non-token value was encountered)
+ * @return {@code} true if the header values were parsed cleanly and at
+ * least one token was found, otherwise {@code false} (e.g. if a
+ * non-token value was encountered)
*
* @throws IOException If an I/O error occurs reading the header
*/
@@ -59,14 +60,15 @@ public class TokenList {
/**
* Parses a header of the form 1#token, forcing all parsed values to lower
- * case. This is typically used when header values are case-insensitive.
+ * case.
*
* @param input The header to parse
- * @param collection The Collection (usually a list of a set) to which the
+ * @param collection The Collection (usually a list or a set) to which the
* parsed tokens should be added
*
- * @return {@code} true if the header was parsed cleanly, otherwise
- * {@code false} (e.g. if a non-token value was encountered)
+ * @return {@code} true if the header values were parsed cleanly and at
+ * least one token was found, otherwise {@code false} (e.g. if a
+ * non-token value was encountered)
*
* @throws IOException If an I/O error occurs reading the header
*/
@@ -75,17 +77,20 @@ public class TokenList {
boolean valid = false;
do {
-String fieldName = HttpParser.readToken(input);
-if (fieldName == null) {
-// Invalid field-name, skip to the next one
-invalid = true;
-HttpParser.skipUntil(input, 0, ',');
+String element = HttpParser.readToken(input);
+if (element == null) {
+// No token found. Could be empty element (which is OK for
+// 1#token - see RFC 7230 section 7) or a non-token.
+if (HttpParser.skipConstant(input, ",") != SkipResult.FOUND) {
+// Non-token element, skip to the next one
+invalid = true;
+HttpParser.skipUntil(input, 0, ',');
+}
continue;
}
-if (fieldName.length() == 0) {
-// Unexpected EOF. Should have been a token.
-invalid = true;
+if (element.length() == 0) {
+// EOF after empty element
break;
}
@@ -93,11 +98,11 @@ public class TokenList {
if (skipResult == SkipResult.EOF) {
// EOF
valid = true;
-collection.add(fieldName.toLowerCase(Locale.ENGLISH));
+collection.add(element.toLowerCase(Locale.ENGLISH));
break;
} else if (skipResult == SkipResult.FOUND) {
valid = true;
-collection.add(fieldName.toLowerCase(Locale.ENGLISH));
+collection.add(element.toLowerCase(Locale.ENGLISH));
continue;
} else {
// Not a token - ignore it
@@ -108,7 +113,7 @@ public class TokenList {
} while (true);
// Only return true if at least one valid token was read and no invalid
-// entries were found
+// elements were found
return valid && !invalid;
}
}
diff --git a/test/org/apache/tomcat/util/http/parser/TestTokenList.java
b/test/org/apache/tomcat/util/http/parser/TestTokenList.java
[tomcat] branch 10.0.x updated: Relax parsing of 1#token to align with RFC 7230 section 7
This is an automated email from the ASF dual-hosted git repository.
markt 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 4b254d5 Relax parsing of 1#token to align with RFC 7230 section 7
4b254d5 is described below
commit 4b254d5ae8f7bdb8b19553ae5fb47c2721d44a8d
Author: Mark Thomas
AuthorDate: Wed Jun 16 09:45:31 2021 +0100
Relax parsing of 1#token to align with RFC 7230 section 7
---
.../apache/tomcat/util/http/parser/TokenList.java | 41 --
.../tomcat/util/http/parser/TestTokenList.java | 6 ++--
webapps/docs/changelog.xml | 5 +++
3 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/parser/TokenList.java
b/java/org/apache/tomcat/util/http/parser/TokenList.java
index 01ac449..ec69d3c 100644
--- a/java/org/apache/tomcat/util/http/parser/TokenList.java
+++ b/java/org/apache/tomcat/util/http/parser/TokenList.java
@@ -35,11 +35,12 @@ public class TokenList {
* parsed values to lower case.
*
* @param inputs The headers to parse
- * @param collection The Collection (usually a list of a set) to which the
+ * @param collection The Collection (usually a list or a set) to which the
* parsed tokens should be added
*
- * @return {@code} true if the header values were parsed cleanly, otherwise
- * {@code false} (e.g. if a non-token value was encountered)
+ * @return {@code} true if the header values were parsed cleanly and at
+ * least one token was found, otherwise {@code false} (e.g. if a
+ * non-token value was encountered)
*
* @throws IOException If an I/O error occurs reading the header
*/
@@ -59,14 +60,15 @@ public class TokenList {
/**
* Parses a header of the form 1#token, forcing all parsed values to lower
- * case. This is typically used when header values are case-insensitive.
+ * case.
*
* @param input The header to parse
- * @param collection The Collection (usually a list of a set) to which the
+ * @param collection The Collection (usually a list or a set) to which the
* parsed tokens should be added
*
- * @return {@code} true if the header was parsed cleanly, otherwise
- * {@code false} (e.g. if a non-token value was encountered)
+ * @return {@code} true if the header values were parsed cleanly and at
+ * least one token was found, otherwise {@code false} (e.g. if a
+ * non-token value was encountered)
*
* @throws IOException If an I/O error occurs reading the header
*/
@@ -75,17 +77,20 @@ public class TokenList {
boolean valid = false;
do {
-String fieldName = HttpParser.readToken(input);
-if (fieldName == null) {
-// Invalid field-name, skip to the next one
-invalid = true;
-HttpParser.skipUntil(input, 0, ',');
+String element = HttpParser.readToken(input);
+if (element == null) {
+// No token found. Could be empty element (which is OK for
+// 1#token - see RFC 7230 section 7) or a non-token.
+if (HttpParser.skipConstant(input, ",") != SkipResult.FOUND) {
+// Non-token element, skip to the next one
+invalid = true;
+HttpParser.skipUntil(input, 0, ',');
+}
continue;
}
-if (fieldName.length() == 0) {
-// Unexpected EOF. Should have been a token.
-invalid = true;
+if (element.length() == 0) {
+// EOF after empty element
break;
}
@@ -93,11 +98,11 @@ public class TokenList {
if (skipResult == SkipResult.EOF) {
// EOF
valid = true;
-collection.add(fieldName.toLowerCase(Locale.ENGLISH));
+collection.add(element.toLowerCase(Locale.ENGLISH));
break;
} else if (skipResult == SkipResult.FOUND) {
valid = true;
-collection.add(fieldName.toLowerCase(Locale.ENGLISH));
+collection.add(element.toLowerCase(Locale.ENGLISH));
continue;
} else {
// Not a token - ignore it
@@ -108,7 +113,7 @@ public class TokenList {
} while (true);
// Only return true if at least one valid token was read and no invalid
-// entries were found
+// elements were found
return valid && !invalid;
}
}
diff --git a/test/org/apache/tomcat/util/http/parser/TestTokenList.java
[tomcat] branch main updated: Relax parsing of 1#token to align with RFC 7230 section 7
This is an automated email from the ASF dual-hosted git repository.
markt 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 878387b Relax parsing of 1#token to align with RFC 7230 section 7
878387b is described below
commit 878387ba5c732d5c3dd924d96d0c2511e156311d
Author: Mark Thomas
AuthorDate: Wed Jun 16 09:45:31 2021 +0100
Relax parsing of 1#token to align with RFC 7230 section 7
---
.../apache/tomcat/util/http/parser/TokenList.java | 41 --
.../tomcat/util/http/parser/TestTokenList.java | 6 ++--
webapps/docs/changelog.xml | 5 +++
3 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/parser/TokenList.java
b/java/org/apache/tomcat/util/http/parser/TokenList.java
index 01ac449..ec69d3c 100644
--- a/java/org/apache/tomcat/util/http/parser/TokenList.java
+++ b/java/org/apache/tomcat/util/http/parser/TokenList.java
@@ -35,11 +35,12 @@ public class TokenList {
* parsed values to lower case.
*
* @param inputs The headers to parse
- * @param collection The Collection (usually a list of a set) to which the
+ * @param collection The Collection (usually a list or a set) to which the
* parsed tokens should be added
*
- * @return {@code} true if the header values were parsed cleanly, otherwise
- * {@code false} (e.g. if a non-token value was encountered)
+ * @return {@code} true if the header values were parsed cleanly and at
+ * least one token was found, otherwise {@code false} (e.g. if a
+ * non-token value was encountered)
*
* @throws IOException If an I/O error occurs reading the header
*/
@@ -59,14 +60,15 @@ public class TokenList {
/**
* Parses a header of the form 1#token, forcing all parsed values to lower
- * case. This is typically used when header values are case-insensitive.
+ * case.
*
* @param input The header to parse
- * @param collection The Collection (usually a list of a set) to which the
+ * @param collection The Collection (usually a list or a set) to which the
* parsed tokens should be added
*
- * @return {@code} true if the header was parsed cleanly, otherwise
- * {@code false} (e.g. if a non-token value was encountered)
+ * @return {@code} true if the header values were parsed cleanly and at
+ * least one token was found, otherwise {@code false} (e.g. if a
+ * non-token value was encountered)
*
* @throws IOException If an I/O error occurs reading the header
*/
@@ -75,17 +77,20 @@ public class TokenList {
boolean valid = false;
do {
-String fieldName = HttpParser.readToken(input);
-if (fieldName == null) {
-// Invalid field-name, skip to the next one
-invalid = true;
-HttpParser.skipUntil(input, 0, ',');
+String element = HttpParser.readToken(input);
+if (element == null) {
+// No token found. Could be empty element (which is OK for
+// 1#token - see RFC 7230 section 7) or a non-token.
+if (HttpParser.skipConstant(input, ",") != SkipResult.FOUND) {
+// Non-token element, skip to the next one
+invalid = true;
+HttpParser.skipUntil(input, 0, ',');
+}
continue;
}
-if (fieldName.length() == 0) {
-// Unexpected EOF. Should have been a token.
-invalid = true;
+if (element.length() == 0) {
+// EOF after empty element
break;
}
@@ -93,11 +98,11 @@ public class TokenList {
if (skipResult == SkipResult.EOF) {
// EOF
valid = true;
-collection.add(fieldName.toLowerCase(Locale.ENGLISH));
+collection.add(element.toLowerCase(Locale.ENGLISH));
break;
} else if (skipResult == SkipResult.FOUND) {
valid = true;
-collection.add(fieldName.toLowerCase(Locale.ENGLISH));
+collection.add(element.toLowerCase(Locale.ENGLISH));
continue;
} else {
// Not a token - ignore it
@@ -108,7 +113,7 @@ public class TokenList {
} while (true);
// Only return true if at least one valid token was read and no invalid
-// entries were found
+// elements were found
return valid && !invalid;
}
}
diff --git a/test/org/apache/tomcat/util/http/parser/TestTokenList.java
b/test/org/apache/tomcat/util/http/parser/TestTokenList.java
[Bug 65382] Silent installation fails
https://bz.apache.org/bugzilla/show_bug.cgi?id=65382 Mark Thomas changed: What|Removed |Added Resolution|--- |WORKSFORME Status|NEW |RESOLVED OS||All --- Comment #1 from Mark Thomas --- My guess would be that the installer can't find a Java installation. To find out why the install fails, run the installer without the /S option and use the defaults all the way through. Further assistance is available from the us...@tomcat.apache.org mailing list -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r48380 - /dev/tomcat/tomcat-10/v10.0.7/ /release/tomcat/tomcat-10/v10.0.7/
Author: markt Date: Wed Jun 16 06:11:29 2021 New Revision: 48380 Log: Release 10.0.7 Added: release/tomcat/tomcat-10/v10.0.7/ - copied from r48379, dev/tomcat/tomcat-10/v10.0.7/ Removed: dev/tomcat/tomcat-10/v10.0.7/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r48379 - /dev/tomcat/tomcat-10/v10.1.0-M1/ /release/tomcat/tomcat-10/v10.1.0-M1/
Author: markt Date: Wed Jun 16 06:10:59 2021 New Revision: 48379 Log: Release 10.1.0-M1 Added: release/tomcat/tomcat-10/v10.1.0-M1/ - copied from r48378, dev/tomcat/tomcat-10/v10.1.0-M1/ Removed: dev/tomcat/tomcat-10/v10.1.0-M1/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
