[tomcat-jakartaee-migration] branch master updated: Add Maven wrapper so that it is easier for non-Maven users to build the tool

[mgrigorov]

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

mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 198e510  Add Maven wrapper so that it is easier for non-Maven users to 
build the tool
198e510 is described below

commit 198e510a67cec569e91cc2cc87e4f4adb181f753
Author: Martin Tzvetanov Grigorov 
AuthorDate: Thu Mar 5 09:40:32 2020 +0200

Add Maven wrapper so that it is easier for non-Maven users to build the tool

As mentioned at 
https://lists.apache.org/thread.html/rc9e4d40c939bcc5d79e4f2a8fa0ff96853940aa20362b58b59af5973%40%3Cusers.tomcat.apache.org%3E
 some Tomcat users are not huge fans of Maven and they hesitate to install 
Maven just to build the migration tool. By having the Maven wrapper scripts one 
can easily build the migration tool with: ./mvnw clean package
---
 .mvn/wrapper/MavenWrapperDownloader.java | 117 
 .mvn/wrapper/maven-wrapper.jar   | Bin 0 -> 50710 bytes
 .mvn/wrapper/maven-wrapper.properties|   2 +
 README.md|   2 +-
 mvnw | 310 +++
 mvnw.cmd | 182 ++
 6 files changed, 612 insertions(+), 1 deletion(-)

diff --git a/.mvn/wrapper/MavenWrapperDownloader.java 
b/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 000..e76d1f3
--- /dev/null
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed 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
+ *
+ *  https://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.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+private static final String WRAPPER_VERSION = "0.5.6";
+/**
+ * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' 
is provided.
+ */
+private static final String DEFAULT_DOWNLOAD_URL = 
"https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/;
++ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+/**
+ * Path to the maven-wrapper.properties file, which might contain a 
downloadUrl property to
+ * use instead of the default one.
+ */
+private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+".mvn/wrapper/maven-wrapper.properties";
+
+/**
+ * Path where the maven-wrapper.jar will be saved to.
+ */
+private static final String MAVEN_WRAPPER_JAR_PATH =
+".mvn/wrapper/maven-wrapper.jar";
+
+/**
+ * Name of the property which should be used to override the default 
download url for the wrapper.
+ */
+private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+public static void main(String args[]) {
+System.out.println("- Downloader started");
+File baseDirectory = new File(args[0]);
+System.out.println("- Using base directory: " + 
baseDirectory.getAbsolutePath());
+
+// If the maven-wrapper.properties exists, read it and check if it 
contains a custom
+// wrapperUrl parameter.
+File mavenWrapperPropertyFile = new File(baseDirectory, 
MAVEN_WRAPPER_PROPERTIES_PATH);
+String url = DEFAULT_DOWNLOAD_URL;
+if(mavenWrapperPropertyFile.exists()) {
+FileInputStream mavenWrapperPropertyFileInputStream = null;
+try {
+mavenWrapperPropertyFileInputStream = new 
FileInputStream(mavenWrapperPropertyFile);
+Properties mavenWrapperProperties = new Properties();
+
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+url = 
mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+} catch (IOException e) {
+System.out.println("- ERROR loading '" + 
MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+} finally {
+try {
+if(mavenWrapperPropertyFileInputStream != null) {
+mavenWrapperPropertyFileInputStream.close();
+}
+} catch (IOException e) {
+// Ignore ...
+}
+}
+}
+System.out.println("- Downloading from: " + url);
+
+File outputFile = new 

[Bug 64192] Bug in Tomcat HTTP2 POST - with big payload

[bugzilla]

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

--- Comment #10 from Lukasz Z  ---
Thanks for quick fix.
This error has caused many strange problems for my application since we use
http2.

-- 
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] YYTVicky opened a new pull request #253: add warning to upgrade

[GitBox]

YYTVicky opened a new pull request #253: add warning to upgrade
URL: https://github.com/apache/tomcat/pull/253
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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

[GUMP@gump-vm]: Project taglibs-parent (in module tomcat-taglibs) failed

[Gump]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project taglibs-parent has an issue affecting its community integration,
 and has been outstanding for 70 runs.
The current state of this project is 'Failed', with reason 'Update Failed'.

Full details are available at:
http://gump-vm.apache.org/tomcat-taglibs/taglibs-parent/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Sole pom output [pom.xml] identifier set to project name
 -INFO- Failed with reason update failed
 -DEBUG- Extracted fallback artifacts from Gump Repository

To subscribe to this information via syndicated feeds:
- RSS: http://gump-vm.apache.org/tomcat-taglibs/taglibs-parent/rss.xml
- Atom: http://gump-vm.apache.org/tomcat-taglibs/taglibs-parent/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 2020030504, gump-vm.apache.org:vmgump:2020030504
Gump E-mail Identifier (unique within run) #5.

--
Apache Gump
http://gump.apache.org/ [Instance: gump-vm.apache.org]

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

[GUMP@gump-vm]: Project tomcat-tc9-test-nio2 (in module tomcat-tc9) success, but with warnings.

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc9-test-nio2 contains errors.
The current state of this project is 'Success'.

Full details are available at:
http://gump-vm.apache.org/tomcat-tc9/tomcat-tc9-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -ERROR- Output with id openssl was not found in project 
openssl-1.1.1-make-install 
 -ERROR- Unhandled Property: test.openssl.path on: Ant on 
Project:tomcat-tc9-test-nio2
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-tc9/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-tc9/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-tc9/output/test-tmp-NIO2/logs]



The following work was performed:
http://gump-vm.apache.org/tomcat-tc9/tomcat-tc9-test-nio2/gump_work/build_tomcat-tc9_tomcat-tc9-test-nio2.html
Work Name: build_tomcat-tc9_tomcat-tc9-test-nio2 (Type: Build)
Work ended in a state of : Success
Elapsed: 44 mins 15 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-tc9/tomcat-build-libs 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar 
-Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar 
-Dtest.temp=output/test-tmp-NIO2 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.14-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-tc9/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.2-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/commons-daemon/target/commons-daemon-1.2.3-SNAPSHOT.jar
 -Dtest.openssl.path=*Unset* -Dexecute.test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-cor
 e-1.3.jar 
-Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dexecute.test.apr=false 
-Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar 
-Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.13-201909161045/ecj-4.13.jar 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.3-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-tc9]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-tc9/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/servlet-api.jar:/srv/gump/
 
public/workspace/tomcat-tc9/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-ssi.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/tomcat-api.jar:/srv/gump/publi
 

[GUMP@gump-vm]: Project tomcat-tc9-test-nio2 (in module tomcat-tc9) success, but with warnings.

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc9-test-nio2 contains errors.
The current state of this project is 'Success'.

Full details are available at:
http://gump-vm.apache.org/tomcat-tc9/tomcat-tc9-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -ERROR- Output with id openssl was not found in project 
openssl-1.1.1-make-install 
 -ERROR- Unhandled Property: test.openssl.path on: Ant on 
Project:tomcat-tc9-test-nio2
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-tc9/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-tc9/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-tc9/output/test-tmp-NIO2/logs]



The following work was performed:
http://gump-vm.apache.org/tomcat-tc9/tomcat-tc9-test-nio2/gump_work/build_tomcat-tc9_tomcat-tc9-test-nio2.html
Work Name: build_tomcat-tc9_tomcat-tc9-test-nio2 (Type: Build)
Work ended in a state of : Success
Elapsed: 44 mins 24 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-tc9/tomcat-build-libs 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar 
-Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar 
-Dtest.temp=output/test-tmp-NIO2 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.14-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-tc9/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.2-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/commons-daemon/target/commons-daemon-1.2.3-SNAPSHOT.jar
 -Dtest.openssl.path=*Unset* -Dexecute.test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-cor
 e-1.3.jar 
-Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dexecute.test.apr=false 
-Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar 
-Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.13-201909161045/ecj-4.13.jar 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.3-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-tc9]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-tc9/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/servlet-api.jar:/srv/gump/
 
public/workspace/tomcat-tc9/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-ssi.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/tomcat-api.jar:/srv/gump/publi
 

[GUMP@gump-vm]: Project tomcat-tc9-test-nio (in module tomcat-tc9) success, but with warnings.

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc9-test-nio contains errors.
The current state of this project is 'Success'.

Full details are available at:
http://gump-vm.apache.org/tomcat-tc9/tomcat-tc9-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -ERROR- Output with id openssl was not found in project 
openssl-1.1.1-make-install 
 -ERROR- Unhandled Property: test.openssl.path on: Ant on 
Project:tomcat-tc9-test-nio
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-tc9/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-tc9/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-tc9/output/test-tmp-NIO/logs]



The following work was performed:
http://gump-vm.apache.org/tomcat-tc9/tomcat-tc9-test-nio/gump_work/build_tomcat-tc9_tomcat-tc9-test-nio.html
Work Name: build_tomcat-tc9_tomcat-tc9-test-nio (Type: Build)
Work ended in a state of : Success
Elapsed: 44 mins 11 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-tc9/tomcat-build-libs 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar 
-Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar 
-Dtest.temp=output/test-tmp-NIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.14-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-tc9/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.2-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/commons-daemon/target/commons-daemon-1.2.3-SNAPSHOT.jar
 -Dtest.openssl.path=*Unset* -Dexecute.test.nio=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-
 1.3.jar 
-Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dexecute.test.apr=false 
-Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar 
-Dtest.reports=output/logs-NIO -Dexecute.test.nio2=false 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.13-201909161045/ecj-4.13.jar 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.3-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-tc9]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-tc9/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/servlet-api.jar:/srv/gump/
 
public/workspace/tomcat-tc9/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-ssi.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/tomcat-api.jar:/srv/gump/publi
 

[GUMP@gump-vm]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-apr has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-apr :  Tomcat 10.x, a web server implementing the 
Jakarta Servlet 5...


Full details are available at:
http://gump-vm.apache.org/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]



The following work was performed:
http://gump-vm.apache.org/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 46 mins 27 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar 
-Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.14-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.2-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/commons-daemon/target/commons-daemon-1.2.3-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20200304/bin/openssl
 -Dexecute.test.ni
 o=false -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dexecute.test.apr=true 
-Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar 
-Dtest.reports=output/logs-APR -Dexecute.test.nio2=false 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.13-201909161045/ecj-4.13.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20200304/lib 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.3-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ssi.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public

[GUMP@gump-vm]: Project tomcat-tc9-test-nio (in module tomcat-tc9) success, but with warnings.

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc9-test-nio contains errors.
The current state of this project is 'Success'.

Full details are available at:
http://gump-vm.apache.org/tomcat-tc9/tomcat-tc9-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -ERROR- Output with id openssl was not found in project 
openssl-1.1.1-make-install 
 -ERROR- Unhandled Property: test.openssl.path on: Ant on 
Project:tomcat-tc9-test-nio
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-tc9/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-tc9/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-tc9/output/test-tmp-NIO/logs]



The following work was performed:
http://gump-vm.apache.org/tomcat-tc9/tomcat-tc9-test-nio/gump_work/build_tomcat-tc9_tomcat-tc9-test-nio.html
Work Name: build_tomcat-tc9_tomcat-tc9-test-nio (Type: Build)
Work ended in a state of : Success
Elapsed: 42 mins 51 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-tc9/tomcat-build-libs 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar 
-Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar 
-Dtest.temp=output/test-tmp-NIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.14-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-tc9/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.2-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/commons-daemon/target/commons-daemon-1.2.3-SNAPSHOT.jar
 -Dtest.openssl.path=*Unset* -Dexecute.test.nio=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-
 1.3.jar 
-Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dexecute.test.apr=false 
-Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar 
-Dtest.reports=output/logs-NIO -Dexecute.test.nio2=false 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.13-201909161045/ecj-4.13.jar 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.3-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-tc9]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-tc9/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/servlet-api.jar:/srv/gump/
 
public/workspace/tomcat-tc9/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-ssi.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/tomcat-api.jar:/srv/gump/publi
 

[GUMP@gump-vm]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-apr has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 9 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-apr :  Tomcat 10.x, a web server implementing the 
Jakarta Servlet 5...


Full details are available at:
http://gump-vm.apache.org/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]



The following work was performed:
http://gump-vm.apache.org/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 49 mins 17 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar 
-Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.14-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.2-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/commons-daemon/target/commons-daemon-1.2.3-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20200301/bin/openssl
 -Dexecute.test.ni
 o=false -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dexecute.test.apr=true 
-Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar 
-Dtest.reports=output/logs-APR -Dexecute.test.nio2=false 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.13-201909161045/ecj-4.13.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20200301/lib 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.3-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 

[GUMP@gump-vm]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-nio has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-nio :  Tomcat 10.x, a web server implementing the 
Jakarta Servlet 5...


Full details are available at:
http://gump-vm.apache.org/tomcat-trunk/tomcat-trunk-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs]



The following work was performed:
http://gump-vm.apache.org/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 43 mins 54 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar 
-Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar 
-Dtest.temp=output/test-tmp-NIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.14-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.2-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/commons-daemon/target/commons-daemon-1.2.3-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20200229/bin/openssl
 -Dexecute.test.ni
 o=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dexecute.test.apr=false 
-Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar 
-Dtest.reports=output/logs-NIO -Dexecute.test.nio2=false 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.13-201909161045/ecj-4.13.jar 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.3-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 

[GUMP@gump-vm]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-apr has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 12 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-apr :  Tomcat 10.x, a web server implementing the 
Jakarta Servlet 5...


Full details are available at:
http://gump-vm.apache.org/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]



The following work was performed:
http://gump-vm.apache.org/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 47 mins 59 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar 
-Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.14-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.2-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/commons-daemon/target/commons-daemon-1.2.3-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20200303/bin/openssl
 -Dexecute.test.ni
 o=false -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dexecute.test.apr=true 
-Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar 
-Dtest.reports=output/logs-APR -Dexecute.test.nio2=false 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.13-201909161045/ecj-4.13.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20200303/lib 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.3-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 

[GUMP@gump-vm]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-nio2 has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-nio2 :  Tomcat 10.x, a web server implementing the 
Jakarta Servlet 5...


Full details are available at:
http://gump-vm.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs]



The following work was performed:
http://gump-vm.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 43 mins 16 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar 
-Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar 
-Dtest.temp=output/test-tmp-NIO2 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.14-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.2-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/commons-daemon/target/commons-daemon-1.2.3-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20200228/bin/openssl
 -Dexecute.test.n
 io=false -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dexecute.test.apr=false 
-Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar 
-Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.13-201909161045/ecj-4.13.jar 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.3-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 

[tomcat] branch 7.0.x updated: Update gpg call for gpg2 (so there is no pop-up prompt for passphrase)

[markt]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 9d83b7e  Update gpg call for gpg2 (so there is no pop-up prompt for 
passphrase)
9d83b7e is described below

commit 9d83b7e30b9e778c4d8d6d260f8a34ef0fdd9301
Author: Mark Thomas 
AuthorDate: Wed Mar 4 22:18:58 2020 +

Update gpg call for gpg2 (so there is no pop-up prompt for passphrase)
---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 847d295..ed987f1 100644
--- a/build.xml
+++ b/build.xml
@@ -3385,8 +3385,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 8.5.x updated: Update gpg call for gpg2 (so there is no pop-up prompt for passphrase)

[markt]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 41e1b31  Update gpg call for gpg2 (so there is no pop-up prompt for 
passphrase)
41e1b31 is described below

commit 41e1b31f5d04b3e510511f8c1cbdbfe664f7a2e8
Author: Mark Thomas 
AuthorDate: Wed Mar 4 22:18:58 2020 +

Update gpg call for gpg2 (so there is no pop-up prompt for passphrase)
---
 build.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 2121d0b..021fd9e 100644
--- a/build.xml
+++ b/build.xml
@@ -3325,9 +3325,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 9.0.x updated: Update gpg call for gpg2 (so there is no pop-up prompt for passphrase)

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 50f1a39  Update gpg call for gpg2 (so there is no pop-up prompt for 
passphrase)
50f1a39 is described below

commit 50f1a39752bdfdf95c19cb02467f788cccfbd900
Author: Mark Thomas 
AuthorDate: Wed Mar 4 22:18:58 2020 +

Update gpg call for gpg2 (so there is no pop-up prompt for passphrase)
---
 build.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 6a17859..c7845ff 100644
--- a/build.xml
+++ b/build.xml
@@ -3395,9 +3395,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: Update gpg call for gpg2 (so there is no pop-up prompt for passphrase)

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new d52f5d7  Update gpg call for gpg2 (so there is no pop-up prompt for 
passphrase)
d52f5d7 is described below

commit d52f5d7bcaf6e59b6cf124628ef9f60eb4aee64e
Author: Mark Thomas 
AuthorDate: Wed Mar 4 22:18:58 2020 +

Update gpg call for gpg2 (so there is no pop-up prompt for passphrase)
---
 build.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 434861b..1bd17d9 100644
--- a/build.xml
+++ b/build.xml
@@ -3412,9 +3412,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/02: Add test for BZ64195

[remm]

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

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

commit 489d07c6150746f8e30cc680d0a8128fb964905e
Author: remm 
AuthorDate: Wed Mar 4 19:07:39 2020 +0100

Add test for BZ64195

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

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


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

[tomcat] 02/02: Jakarta to javax

[remm]

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

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

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

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

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


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

[tomcat] branch 9.0.x updated (6e0ae64 -> b896830)

[remm]

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

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


from 6e0ae64  Provide an accessor for inProgressAsyncCount. Helps embedded 
scenarios.
 new 489d07c  Add test for BZ64195
 new b896830  Jakarta to javax

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


Summary of changes:
 test/org/apache/tomcat/util/net/TestSsl.java | 78 
 1 file changed, 78 insertions(+)


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

[tomcat] branch 7.0.x updated: Provide an accessor for inProgressAsyncCount. Helps embedded scenarios.

[markt]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 134f962  Provide an accessor for inProgressAsyncCount. Helps embedded 
scenarios.
134f962 is described below

commit 134f962be6f377c7b5cbdbb9d96ddd960ab69738
Author: Mark Thomas 
AuthorDate: Wed Mar 4 19:11:14 2020 +

Provide an accessor for inProgressAsyncCount. Helps embedded scenarios.

Implementing clean shutdown in embedded scenarios is aided by easier
access to this value.
---
 java/org/apache/catalina/core/StandardContext.java | 5 +
 1 file changed, 5 insertions(+)

diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index b40f36e..0b18027 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -976,6 +976,11 @@ public class StandardContext extends ContainerBase
 }
 
 
+public long getInProgressAsyncCount() {
+return inProgressAsyncCount.get();
+}
+
+
 @Override
 public void setAllowMultipleLeadingForwardSlashInPath(
 boolean allowMultipleLeadingForwardSlashInPath) {


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

[tomcat] branch master updated: Provide an accessor for inProgressAsyncCount. Helps embedded scenarios.

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 07d1a0e  Provide an accessor for inProgressAsyncCount. Helps embedded 
scenarios.
07d1a0e is described below

commit 07d1a0ee90b8cdb0ea573d056aa5185943fdd8e0
Author: Mark Thomas 
AuthorDate: Wed Mar 4 19:11:14 2020 +

Provide an accessor for inProgressAsyncCount. Helps embedded scenarios.

Implementing clean shutdown in embedded scenarios is aided by easier
access to this value.
---
 java/org/apache/catalina/core/StandardContext.java | 5 +
 1 file changed, 5 insertions(+)

diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index 2bcd59d..0617ba5 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -854,6 +854,11 @@ public class StandardContext extends ContainerBase
 }
 
 
+public long getInProgressAsyncCount() {
+return inProgressAsyncCount.get();
+}
+
+
 @Override
 public void setAllowMultipleLeadingForwardSlashInPath(
 boolean allowMultipleLeadingForwardSlashInPath) {


-
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: Provide an accessor for inProgressAsyncCount. Helps embedded scenarios.

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 6e0ae64  Provide an accessor for inProgressAsyncCount. Helps embedded 
scenarios.
6e0ae64 is described below

commit 6e0ae64989d9f71176503f48382c736eee76f7f6
Author: Mark Thomas 
AuthorDate: Wed Mar 4 19:11:14 2020 +

Provide an accessor for inProgressAsyncCount. Helps embedded scenarios.

Implementing clean shutdown in embedded scenarios is aided by easier
access to this value.
---
 java/org/apache/catalina/core/StandardContext.java | 5 +
 1 file changed, 5 insertions(+)

diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index e60eda8..31920c9 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -854,6 +854,11 @@ public class StandardContext extends ContainerBase
 }
 
 
+public long getInProgressAsyncCount() {
+return inProgressAsyncCount.get();
+}
+
+
 @Override
 public void setAllowMultipleLeadingForwardSlashInPath(
 boolean allowMultipleLeadingForwardSlashInPath) {


-
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: Provide an accessor for inProgressAsyncCount. Helps embedded scenarios.

[markt]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 98d59b4  Provide an accessor for inProgressAsyncCount. Helps embedded 
scenarios.
98d59b4 is described below

commit 98d59b44db511dc9a0c0a046a93c42a2f343eefa
Author: Mark Thomas 
AuthorDate: Wed Mar 4 19:11:14 2020 +

Provide an accessor for inProgressAsyncCount. Helps embedded scenarios.

Implementing clean shutdown in embedded scenarios is aided by easier
access to this value.
---
 java/org/apache/catalina/core/StandardContext.java | 5 +
 1 file changed, 5 insertions(+)

diff --git a/java/org/apache/catalina/core/StandardContext.java 
b/java/org/apache/catalina/core/StandardContext.java
index 2abdac1..fcf3463 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -849,6 +849,11 @@ public class StandardContext extends ContainerBase
 }
 
 
+public long getInProgressAsyncCount() {
+return inProgressAsyncCount.get();
+}
+
+
 @Override
 public void setAllowMultipleLeadingForwardSlashInPath(
 boolean allowMultipleLeadingForwardSlashInPath) {


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

[tomcat] branch 7.0.x updated: Make the ms pattern constant public and use it

[markt]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new e1d3469  Make the ms pattern constant public and use it
e1d3469 is described below

commit e1d34696dfc0ee71a37041a96cede811983e3155
Author: Mark Thomas 
AuthorDate: Wed Mar 4 19:04:12 2020 +

Make the ms pattern constant public and use it
---
 java/org/apache/juli/DateFormatCache.java  | 4 ++--
 java/org/apache/juli/OneLineFormatter.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/juli/DateFormatCache.java 
b/java/org/apache/juli/DateFormatCache.java
index a311472..5b93e6e 100644
--- a/java/org/apache/juli/DateFormatCache.java
+++ b/java/org/apache/juli/DateFormatCache.java
@@ -43,7 +43,7 @@ import java.util.TimeZone;
  */
 public class DateFormatCache {
 
-private static final String msecPattern = "#";
+public static final char MSEC_PATTERN = '#';
 
 /* Timestamp format */
 private final String format;
@@ -70,7 +70,7 @@ public class DateFormatCache {
 if (escape || x != 'S') {
 result.append(x);
 } else {
-result.append(msecPattern);
+result.append(MSEC_PATTERN);
 }
 if (x == '\'') {
 escape = !escape;
diff --git a/java/org/apache/juli/OneLineFormatter.java 
b/java/org/apache/juli/OneLineFormatter.java
index 3daf126..44a74f4 100644
--- a/java/org/apache/juli/OneLineFormatter.java
+++ b/java/org/apache/juli/OneLineFormatter.java
@@ -198,7 +198,7 @@ public class OneLineFormatter extends Formatter {
 // Some version of replace
 long frac = timestamp % 1000;
 // Formatted string may vary in length so the insert point may vary
-int insertStart = cachedTimeStamp.indexOf('#');
+int insertStart = 
cachedTimeStamp.indexOf(DateFormatCache.MSEC_PATTERN);
 buf.append(cachedTimeStamp.subSequence(0, insertStart));
 if (frac < 100 && millisHandling == MillisHandling.REPLACE_SSS) {
 buf.append('0');


-
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: Make the ms pattern constant public and use it

[markt]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 4a439ee  Make the ms pattern constant public and use it
4a439ee is described below

commit 4a439ee7ea4fe12fba15c520e5f80aa1e7a45a77
Author: Mark Thomas 
AuthorDate: Wed Mar 4 19:04:12 2020 +

Make the ms pattern constant public and use it
---
 java/org/apache/juli/DateFormatCache.java  | 4 ++--
 java/org/apache/juli/OneLineFormatter.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/juli/DateFormatCache.java 
b/java/org/apache/juli/DateFormatCache.java
index a311472..5b93e6e 100644
--- a/java/org/apache/juli/DateFormatCache.java
+++ b/java/org/apache/juli/DateFormatCache.java
@@ -43,7 +43,7 @@ import java.util.TimeZone;
  */
 public class DateFormatCache {
 
-private static final String msecPattern = "#";
+public static final char MSEC_PATTERN = '#';
 
 /* Timestamp format */
 private final String format;
@@ -70,7 +70,7 @@ public class DateFormatCache {
 if (escape || x != 'S') {
 result.append(x);
 } else {
-result.append(msecPattern);
+result.append(MSEC_PATTERN);
 }
 if (x == '\'') {
 escape = !escape;
diff --git a/java/org/apache/juli/OneLineFormatter.java 
b/java/org/apache/juli/OneLineFormatter.java
index fad37b0..968a692 100644
--- a/java/org/apache/juli/OneLineFormatter.java
+++ b/java/org/apache/juli/OneLineFormatter.java
@@ -197,7 +197,7 @@ public class OneLineFormatter extends Formatter {
 // Some version of replace
 long frac = timestamp % 1000;
 // Formatted string may vary in length so the insert point may vary
-int insertStart = cachedTimeStamp.indexOf('#');
+int insertStart = 
cachedTimeStamp.indexOf(DateFormatCache.MSEC_PATTERN);
 buf.append(cachedTimeStamp.subSequence(0, insertStart));
 if (frac < 100 && millisHandling == MillisHandling.REPLACE_SSS) {
 buf.append('0');


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

[tomcat] branch master updated: Make the ms pattern constant public and use it

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 8598549  Make the ms pattern constant public and use it
8598549 is described below

commit 8598549f1fa4fbdc4cf2eebb664428f5dbac9b34
Author: Mark Thomas 
AuthorDate: Wed Mar 4 19:04:12 2020 +

Make the ms pattern constant public and use it
---
 java/org/apache/juli/DateFormatCache.java  | 4 ++--
 java/org/apache/juli/OneLineFormatter.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/juli/DateFormatCache.java 
b/java/org/apache/juli/DateFormatCache.java
index a311472..5b93e6e 100644
--- a/java/org/apache/juli/DateFormatCache.java
+++ b/java/org/apache/juli/DateFormatCache.java
@@ -43,7 +43,7 @@ import java.util.TimeZone;
  */
 public class DateFormatCache {
 
-private static final String msecPattern = "#";
+public static final char MSEC_PATTERN = '#';
 
 /* Timestamp format */
 private final String format;
@@ -70,7 +70,7 @@ public class DateFormatCache {
 if (escape || x != 'S') {
 result.append(x);
 } else {
-result.append(msecPattern);
+result.append(MSEC_PATTERN);
 }
 if (x == '\'') {
 escape = !escape;
diff --git a/java/org/apache/juli/OneLineFormatter.java 
b/java/org/apache/juli/OneLineFormatter.java
index fad37b0..968a692 100644
--- a/java/org/apache/juli/OneLineFormatter.java
+++ b/java/org/apache/juli/OneLineFormatter.java
@@ -197,7 +197,7 @@ public class OneLineFormatter extends Formatter {
 // Some version of replace
 long frac = timestamp % 1000;
 // Formatted string may vary in length so the insert point may vary
-int insertStart = cachedTimeStamp.indexOf('#');
+int insertStart = 
cachedTimeStamp.indexOf(DateFormatCache.MSEC_PATTERN);
 buf.append(cachedTimeStamp.subSequence(0, insertStart));
 if (frac < 100 && millisHandling == MillisHandling.REPLACE_SSS) {
 buf.append('0');


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

[tomcat] branch 9.0.x updated: Make the ms pattern constant public and use it

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 52c1f8c  Make the ms pattern constant public and use it
52c1f8c is described below

commit 52c1f8cdfbc620a22f1b0cd91435e7eac391783f
Author: Mark Thomas 
AuthorDate: Wed Mar 4 19:04:12 2020 +

Make the ms pattern constant public and use it
---
 java/org/apache/juli/DateFormatCache.java  | 4 ++--
 java/org/apache/juli/OneLineFormatter.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/juli/DateFormatCache.java 
b/java/org/apache/juli/DateFormatCache.java
index a311472..5b93e6e 100644
--- a/java/org/apache/juli/DateFormatCache.java
+++ b/java/org/apache/juli/DateFormatCache.java
@@ -43,7 +43,7 @@ import java.util.TimeZone;
  */
 public class DateFormatCache {
 
-private static final String msecPattern = "#";
+public static final char MSEC_PATTERN = '#';
 
 /* Timestamp format */
 private final String format;
@@ -70,7 +70,7 @@ public class DateFormatCache {
 if (escape || x != 'S') {
 result.append(x);
 } else {
-result.append(msecPattern);
+result.append(MSEC_PATTERN);
 }
 if (x == '\'') {
 escape = !escape;
diff --git a/java/org/apache/juli/OneLineFormatter.java 
b/java/org/apache/juli/OneLineFormatter.java
index fad37b0..968a692 100644
--- a/java/org/apache/juli/OneLineFormatter.java
+++ b/java/org/apache/juli/OneLineFormatter.java
@@ -197,7 +197,7 @@ public class OneLineFormatter extends Formatter {
 // Some version of replace
 long frac = timestamp % 1000;
 // Formatted string may vary in length so the insert point may vary
-int insertStart = cachedTimeStamp.indexOf('#');
+int insertStart = 
cachedTimeStamp.indexOf(DateFormatCache.MSEC_PATTERN);
 buf.append(cachedTimeStamp.subSequence(0, insertStart));
 if (frac < 100 && millisHandling == MillisHandling.REPLACE_SSS) {
 buf.append('0');


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

[tomcat] branch 7.0.x updated: Fix typo. Patch by Michael Schieder.

[markt]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 08415fd  Fix typo. Patch by Michael Schieder.
08415fd is described below

commit 08415fdaafd2657f0843dd8f6092c77022c03418
Author: Mark Thomas 
AuthorDate: Wed Mar 4 18:48:18 2020 +

Fix typo. Patch by Michael Schieder.
---
 java/org/apache/catalina/valves/LocalStrings_de.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/valves/LocalStrings_de.properties 
b/java/org/apache/catalina/valves/LocalStrings_de.properties
index 87f3816..c0fde3f 100644
--- a/java/org/apache/catalina/valves/LocalStrings_de.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_de.properties
@@ -24,7 +24,7 @@ errorReportValve.unknownReason=Unbekannter Grund
 
 http.401.reason=Unautorisiert
 http.402.desc=Dieser Status-Code ist für eine zukünftige Nutzung reserviert
-http.403.desc=Der Server hat die Anfrage verstanden, verbietet aber eine 
Autoriesierung.
+http.403.desc=Der Server hat die Anfrage verstanden, verbietet aber eine 
Autorisierung.
 http.404.reason=nicht gefunden
 http.406.reason=Nicht annehmbar
 http.407.reason=Authentisierung für Proxy benötigt


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

[tomcat] branch 8.5.x updated: Fix typo. Patch by Michael Schieder.

[markt]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 403f8ce  Fix typo. Patch by Michael Schieder.
403f8ce is described below

commit 403f8ce4c1d46119584e7dc5795efab22629a8a3
Author: Mark Thomas 
AuthorDate: Wed Mar 4 18:48:18 2020 +

Fix typo. Patch by Michael Schieder.
---
 java/org/apache/catalina/valves/LocalStrings_de.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/valves/LocalStrings_de.properties 
b/java/org/apache/catalina/valves/LocalStrings_de.properties
index 87f3816..c0fde3f 100644
--- a/java/org/apache/catalina/valves/LocalStrings_de.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_de.properties
@@ -24,7 +24,7 @@ errorReportValve.unknownReason=Unbekannter Grund
 
 http.401.reason=Unautorisiert
 http.402.desc=Dieser Status-Code ist für eine zukünftige Nutzung reserviert
-http.403.desc=Der Server hat die Anfrage verstanden, verbietet aber eine 
Autoriesierung.
+http.403.desc=Der Server hat die Anfrage verstanden, verbietet aber eine 
Autorisierung.
 http.404.reason=nicht gefunden
 http.406.reason=Nicht annehmbar
 http.407.reason=Authentisierung für Proxy benötigt


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

[tomcat] branch 9.0.x updated: Fix typo. Patch by Michael Schieder.

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 4c20650  Fix typo. Patch by Michael Schieder.
4c20650 is described below

commit 4c206509a85b027b811d941d457707ac62bf55a0
Author: Mark Thomas 
AuthorDate: Wed Mar 4 18:46:15 2020 +

Fix typo. Patch by Michael Schieder.
---
 java/org/apache/catalina/valves/LocalStrings_de.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/valves/LocalStrings_de.properties 
b/java/org/apache/catalina/valves/LocalStrings_de.properties
index 87f3816..c0fde3f 100644
--- a/java/org/apache/catalina/valves/LocalStrings_de.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_de.properties
@@ -24,7 +24,7 @@ errorReportValve.unknownReason=Unbekannter Grund
 
 http.401.reason=Unautorisiert
 http.402.desc=Dieser Status-Code ist für eine zukünftige Nutzung reserviert
-http.403.desc=Der Server hat die Anfrage verstanden, verbietet aber eine 
Autoriesierung.
+http.403.desc=Der Server hat die Anfrage verstanden, verbietet aber eine 
Autorisierung.
 http.404.reason=nicht gefunden
 http.406.reason=Nicht annehmbar
 http.407.reason=Authentisierung für Proxy benötigt


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

[tomcat] branch master updated: Fix typo. Patch by Michael Schieder.

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new a36301b  Fix typo. Patch by Michael Schieder.
a36301b is described below

commit a36301b68fc0d860b0107e53b65f9339673a0d83
Author: Mark Thomas 
AuthorDate: Wed Mar 4 18:45:03 2020 +

Fix typo. Patch by Michael Schieder.
---
 java/org/apache/catalina/valves/LocalStrings_de.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/valves/LocalStrings_de.properties 
b/java/org/apache/catalina/valves/LocalStrings_de.properties
index 87f3816..c0fde3f 100644
--- a/java/org/apache/catalina/valves/LocalStrings_de.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_de.properties
@@ -24,7 +24,7 @@ errorReportValve.unknownReason=Unbekannter Grund
 
 http.401.reason=Unautorisiert
 http.402.desc=Dieser Status-Code ist für eine zukünftige Nutzung reserviert
-http.403.desc=Der Server hat die Anfrage verstanden, verbietet aber eine 
Autoriesierung.
+http.403.desc=Der Server hat die Anfrage verstanden, verbietet aber eine 
Autorisierung.
 http.404.reason=nicht gefunden
 http.406.reason=Nicht annehmbar
 http.407.reason=Authentisierung für Proxy benötigt


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

[Bug 64195] Tomcat NIO SSL Connector broken under Linux in Tomcat 9.0.31

[bugzilla]

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

--- Comment #7 from Mark Thomas  ---
I have a similar test case that also works.

I have also replicated the test servlet and client provided in Tomcat's unit
tests and that works as expected as well.

-- 
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: Trouble building and running Tomcat 10 unit tests

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Martin,

On 3/4/20 04:22, Martin Grigorov wrote:
> Hi Chris,
>
> Travis CI (ARM64 tests) uses Ant 1.10.7 and OpenJDK 8 b232 and the
> build passes fine:
> https://travis-ci.org/apache/tomcat/jobs/65889/config On my VM
> I use Ant 1.9.14 and OpenJDK 8 b242 and again everything is
green.
> BuildBot is also stable:
> https://ci.apache.org/builders/tomcat-trunk

Looks like a completely clean build got things working again: both the
normal and the test build.

- -chris

> On Tue, Mar 3, 2020 at 10:31 PM Christopher Schultz
>  >
wrote:
>
> All,
>
> I'm up-to-date with git master, using ant 1.9.13, JDK 13.
>
> $ ant test
>
> [...]
>
> test-compile: [javac] Compiling 1 source file to
> /Users/christopherschultz/git/tomcat-trunk/output/testclasses
> [javac] Ignoring source, target and bootclasspath as release has
> been set [javac]
> /Users/christopherschultz/git/tomcat-trunk/test/org/apache/catalina/an
t/
>
>
TestDeployTask.java:37:
> error: cannot access BuildException [javac] public void
> execute(String command, InputStream istream, String contentType,
> long contentLength) [javac] ^ [javac]
> class file for BuildException not found [javac] 1 error
>
> Ant has this class. Not sure why it can't access it. Okay, fine,
> I'll just delete the file and move on:
>
> $ rm test/org/apache/catalina/ant/TestDeployTask.java $ ant test
>
> [...]
>
> add-osgi: [echo] add-osgi
> /Users/christopherschultz/git/tomcat-trunk/output/build/lib/catalina.j
ar
>
>
true
> [bndwrap] 1 ERRORS [bndwrap]  The default package '.' is not
> permitted by the Import-Package syntax. [bndwrap]  This can be
> caused by compile errors in Eclipse because Eclipse creates
> [bndwrap] valid class files regardless of compile errors. [bndwrap]
> The following package(s) import from the default package
> [org.apache.naming.factory.webservices,
> org.apache.catalina.startup]
>
> BUILD FAILED
> /Users/christopherschultz/git/tomcat-trunk/build.xml:852: The
> following error occurred while executing this line:
> /Users/christopherschultz/git/tomcat-trunk/build.xml:3372: The
> following error occurred while executing this line:
> /Users/christopherschultz/git/tomcat-trunk/build.xml:3381: Failed
> to wrap jar file
>
> Downgrading to Java 8 (as per Tomcat 10 build instructions) yields
> the same result.
>
> What am I missing?
>
> Thanks, -chris
>
>
- -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>  For additional commands,
> e-mail: dev-h...@tomcat.apache.org
> 
>
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl5f9G8ACgkQHPApP6U8
pFh5VBAAs/Trxz0ML8C5R37QVwzAJwrF7s/Xqfe5eNuzABkzE0TpotPk9UEa1k/F
5nV62lCAah2lYpqWlPLwNx5GLrVG90PXn9Ta3p7bmK70dJLI4WsfMO4WRq5UmSy3
lrV3LmxZdygE6T/EjHxpfKDv0otjSVs34GP7W3WWdqKsSbSi4AOz844INo7k03Hx
pnoZ2m1DevZjqUt2y/3TVbVX2Yz54N7D7C6Vr6OMewM7FGWQkRuJUjqNM9ux4u73
zZYtwqDzcHJv62EYDGK7N1IF53gEAtk6fqZSkQZYedqzeuzpQ1eKNUm7+uhEiWr2
7qi1h0ZV1MLBHM/FDoMo0uco5+gwHcOD8B9nXSXdS/OCDUbSjoD0xRtjjva2S94G
/4HGUTaSDEkcofvxldNp90NxgZLvpSIokHwE+KOaOftdf17e7WdC5iqgeeo0Bz6G
qt/+dW8k0Qp1XYKVREeBDeMb9yIulzUYiYTJc7u6jtDEBCyHt/XH3+vhcNV2fe6c
XjRrqxiCRdcR5ice+FrzcUlRqiaqjrA0s7Y2nnPy5XdsaZE5etOOncVEpAmHPhm9
5WfNh4gfr87ji8i6+EjYPbsCubV+AUsZELmKdgXdO+JT7s9qyWPf/YaMWnRaEJVk
RZC4R0+GHMITPZ5gXD8O0qQoty6oqMrnwfyron+mIEbXt5FZhog=
=soEZ
-END PGP SIGNATURE-

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

Re: [tomcat] branch master updated: Add test for BZ64195

[Mark Thomas]

On 04/03/2020 18:07, r...@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
> 
> remm pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> 
> 
> The following commit(s) were added to refs/heads/master by this push:
>  new 5c57e66  Add test for BZ64195
> 5c57e66 is described below
> 
> commit 5c57e66930faac43bdddc00c921627a752de3c88
> Author: remm 
> AuthorDate: Wed Mar 4 19:07:39 2020 +0100
> 
> Add test for BZ64195
> 
> It works for me, will see on CI.

I have a very similar test locally that works for me as well.

I suspect the key difference is the use of HttpClient in the OP's test
case. I'll experiment with that.

Mark

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

[Bug 64195] Tomcat NIO SSL Connector broken under Linux in Tomcat 9.0.31

[bugzilla]

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

--- Comment #6 from Remy Maucherat  ---
This will stay in NEEDINFO. I added a simple test to the testsuite, which works
for me. I will monitor the CI results for failures.

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

[tomcat] branch master updated: Add test for BZ64195

[remm]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 5c57e66  Add test for BZ64195
5c57e66 is described below

commit 5c57e66930faac43bdddc00c921627a752de3c88
Author: remm 
AuthorDate: Wed Mar 4 19:07:39 2020 +0100

Add test for BZ64195

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

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


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

Re: [tomcat] branch master updated: BZ 64190 Add 'proper' ms support to OneLineFormatter.

[Mark Thomas]

On 04/03/2020 17:27, Christopher Schultz wrote:
> Mark,
> 
> On 3/3/20 09:36, ma...@apache.org wrote:
>> 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 4ad0a71  BZ 64190 Add 'proper' ms support to
>> OneLineFormatter. 4ad0a71 is described below
> 
>> commit 4ad0a71bc11de50e0fe23fc38e6e67f134aa0589 Author: Mark Thomas
>>  AuthorDate: Tue Mar 3 14:36:08 2020 +
> 
>> BZ 64190 Add 'proper' ms support to OneLineFormatter.



>> int insertStart = cachedTimeStamp.indexOf('#');
> 
> Should the literal '#' be the DateFormatCache.msecPattern constant
> instead? It's unlikely to change, but it's slightly less "magic
> character"-ish if you reference the constant.

Yes, that would be better.

Mark

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

Re: [tomcat] branch master updated: BZ 64190 Add 'proper' ms support to OneLineFormatter.

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 3/3/20 09:36, ma...@apache.org wrote:
> 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 4ad0a71  BZ 64190 Add 'proper' ms support to
> OneLineFormatter. 4ad0a71 is described below
>
> commit 4ad0a71bc11de50e0fe23fc38e6e67f134aa0589 Author: Mark Thomas
>  AuthorDate: Tue Mar 3 14:36:08 2020 +
>
> BZ 64190 Add 'proper' ms support to OneLineFormatter.
>
> S SS or SSS can now be used (once) anywhere in the format String.
> Format strings without S SS or SSS are now ~30% faster The current
> default (effectively "dd-MMM- HH:mm:ss.SSS") is within less
> than 1% of the old implementation. Using S SS or SSS anywhere but
> the very end doubles the time taken to generate the timestamp. ---
> java/org/apache/juli/OneLineFormatter.java | 77
> +++---
> .../TestOneLineFormatterMillisPerformance.java | 70
>  webapps/docs/changelog.xml
> |  5 ++ 3 files changed, 142 insertions(+), 10 deletions(-)
>
> diff --git a/java/org/apache/juli/OneLineFormatter.java
> b/java/org/apache/juli/OneLineFormatter.java index 75845cf..fad37b0
> 100644 --- a/java/org/apache/juli/OneLineFormatter.java +++
> b/java/org/apache/juli/OneLineFormatter.java @@ -51,7 +51,7 @@
> public class OneLineFormatter extends Formatter { };
>
> /* Timestamp format */ -private static final String
> DEFAULT_TIME_FORMAT = "dd-MMM- HH:mm:ss"; +private static
> final String DEFAULT_TIME_FORMAT = "dd-MMM- HH:mm:ss.SSS"; /**
> * The size of our global date format cache @@ -68,6 +68,8 @@ public
> class OneLineFormatter extends Formatter { */ private
> ThreadLocal localDateCache;
>
> +private volatile MillisHandling millisHandling =
> MillisHandling.APPEND; +
>
> public OneLineFormatter() { String timeFormat =
> LogManager.getLogManager().getProperty( @@ -86,12 +88,31 @@ public
> class OneLineFormatter extends Formatter { *
> {@link java.text.SimpleDateFormat} syntax */ public void
> setTimeFormat(final String timeFormat) { +final String
> cachedTimeFormat; + +if (timeFormat.endsWith(".SSS")) { +
> cachedTimeFormat = timeFormat.substring(0,  timeFormat.length() -
> 4); +millisHandling = MillisHandling.APPEND; +}
> else if (timeFormat.contains("SSS")) { +millisHandling
> = MillisHandling.REPLACE_SSS; +cachedTimeFormat =
> timeFormat; +} else if (timeFormat.contains("SS")) { +
> millisHandling = MillisHandling.REPLACE_SS; +
> cachedTimeFormat = timeFormat; +} else if
> (timeFormat.contains("S")) { +millisHandling =
> MillisHandling.REPLACE_S; +cachedTimeFormat =
> timeFormat; +} else { +millisHandling =
> MillisHandling.NONE; +cachedTimeFormat = timeFormat; +
> } + final DateFormatCache globalDateCache = -new
> DateFormatCache(globalCacheSize, timeFormat, null); +
> new DateFormatCache(globalCacheSize, cachedTimeFormat, null);
> localDateCache = new ThreadLocal() { @Override
> protected DateFormatCache initialValue() { -return
> new DateFormatCache(localCacheSize, timeFormat, globalDateCache); +
> return new DateFormatCache(localCacheSize, cachedTimeFormat,
> globalDateCache); } }; } @@ -156,18 +177,45 @@ public class
> OneLineFormatter extends Formatter { }
>
> protected void addTimestamp(StringBuilder buf, long timestamp) { -
> buf.append(localDateCache.get().getFormat(timestamp)); -
> long frac = timestamp % 1000; -buf.append('.'); -if
> (frac < 100) { -if (frac < 10) { +String
> cachedTimeStamp = localDateCache.get().getFormat(timestamp); +
> if (millisHandling == MillisHandling.NONE) { +
> buf.append(cachedTimeStamp); +} else if (millisHandling ==
> MillisHandling.APPEND) { +buf.append(cachedTimeStamp);
> +long frac = timestamp % 1000; +
> buf.append('.'); +if (frac < 100) { +if
> (frac < 10) { +buf.append('0'); +
> buf.append('0'); +} else { +
> buf.append('0'); +} +} +
> buf.append(frac); +} else { +// Some version of
> replace +long frac = timestamp % 1000; +//
> Formatted string may vary in length so the insert point may vary +
> int insertStart = cachedTimeStamp.indexOf('#');

Should the literal '#' be the DateFormatCache.msecPattern constant
instead? It's unlikely to change, but it's slightly less "magic
character"-ish if you reference the constant.

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

iQIyBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl5f5RQACgkQHPApP6U8

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

[markt]

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

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


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

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

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

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


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

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

[markt]

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

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


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

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

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

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


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

[Bug 64192] Bug in Tomcat HTTP2 POST - with big payload

[bugzilla]

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

--- Comment #9 from Mark Thomas  ---
The test fails for me if I remove the fixes I made for this issue so I think
all is well. I just made a minor tweak to prevent the test hanging on failure.

-- 
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 64192] Bug in Tomcat HTTP2 POST - with big payload

[bugzilla]

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

--- Comment #8 from Remy Maucherat  ---
Perfect, I did not get anywhere with my test case [I really don't like working
with SB on Tomcat dev, so ...], I still don't understand why it failed to
reproduce the issue so feel free to improve it as needed. Heaving a heavy
HTTP/2 POST test with TLS cannot hurt apparently, that's the kind of issue that
will keep coming back otherwise.

-- 
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] 02/04: Use a BAOS

[remm]

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

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

commit 70919554d2eae18bdc147a5ed949d68cb1bb7de0
Author: remm 
AuthorDate: Wed Mar 4 14:31:05 2020 +0100

Use a BAOS

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

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


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

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

[remm]

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

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

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

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

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


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

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

[remm]

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

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

commit 71b049e5ccd4e3e36a0c632a2a6a58a92f5b8214
Author: remm 
AuthorDate: Wed Mar 4 12:02:27 2020 +0100

Hack in TLS support for HTTP/2 tests

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

diff --git a/test/org/apache/coyote/http2/Http2TestBase.java 
b/test/org/apache/coyote/http2/Http2TestBase.java
index dc0eabf..215b410 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -53,6 +53,7 @@ import org.apache.tomcat.util.codec.binary.Base64;
 import org.apache.tomcat.util.compat.JrePlatform;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
 import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.net.TesterSupport;
 
 /**
  * Tests for compliance with the https://tools.ietf.org/html/rfc7540;>
@@ -110,9 +111,13 @@ public abstract class Http2TestBase extends TomcatBaseTest 
{
  * that the first response is correctly received.
  */
 protected void http2Connect() throws Exception {
-enableHttp2();
+http2Connect(false);
+}
+
+protected void http2Connect(boolean tls) throws Exception {
+enableHttp2(tls);
 configureAndStartWebApplication();
-openClientConnection();
+openClientConnection(tls);
 doHttpUpgrade();
 sendClientPreface();
 validateHttp2InitialResponse();
@@ -545,8 +550,17 @@ public abstract class Http2TestBase extends TomcatBaseTest 
{
 }
 
 protected void enableHttp2(long maxConcurrentStreams) {
-Connector connector = getTomcatInstance().getConnector();
-http2Protocol = new Http2Protocol();
+enableHttp2(maxConcurrentStreams, false);
+}
+
+protected void enableHttp2(boolean tls) {
+enableHttp2(200, tls);
+}
+
+protected void enableHttp2(long maxConcurrentStreams, boolean tls) {
+Tomcat tomcat = getTomcatInstance();
+Connector connector = tomcat.getConnector();
+http2Protocol = new UpgradableHttp2Protocol();
 // Short timeouts for now. May need to increase these for CI systems.
 http2Protocol.setReadTimeout(6000);
 http2Protocol.setWriteTimeout(6000);
@@ -555,8 +569,18 @@ public abstract class Http2TestBase extends TomcatBaseTest 
{
 http2Protocol.setStreamWriteTimeout(3000);
 http2Protocol.setMaxConcurrentStreams(maxConcurrentStreams);
 connector.addUpgradeProtocol(http2Protocol);
+if (tls) {
+// Enable TLS
+TesterSupport.initSsl(tomcat);
+}
 }
 
+private class UpgradableHttp2Protocol extends Http2Protocol {
+@Override
+public String getHttpUpgradeName(boolean isSSLEnabled) {
+return "h2c";
+}
+}
 
 protected void configureAndStartWebApplication() throws LifecycleException 
{
 Tomcat tomcat = getTomcatInstance();
@@ -578,8 +602,13 @@ public abstract class Http2TestBase extends TomcatBaseTest 
{
 
 
 protected void openClientConnection() throws IOException {
+openClientConnection(false);
+}
+
+protected void openClientConnection(boolean tls) throws IOException {
+SocketFactory socketFactory = tls ? TesterSupport.configureClientSsl() 
: SocketFactory.getDefault();
 // Open a connection
-s = SocketFactory.getDefault().createSocket("localhost", getPort());
+s = socketFactory.createSocket("localhost", getPort());
 s.setSoTimeout(3);
 
 os = s.getOutputStream();
@@ -616,6 +645,9 @@ public abstract class Http2TestBase extends TomcatBaseTest {
 
 boolean readHttpUpgradeResponse() throws IOException {
 String[] responseHeaders = readHttpResponseHeaders();
+for (String header : responseHeaders) {
+System.out.println("HEADER: " + header);
+}
 
 if (responseHeaders.length < 3) {
 return false;
diff --git a/test/org/apache/coyote/http2/TestLargeUpload.java 
b/test/org/apache/coyote/http2/TestLargeUpload.java
new file mode 100644
index 000..1e657af
--- /dev/null
+++ b/test/org/apache/coyote/http2/TestLargeUpload.java
@@ -0,0 +1,112 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file 

[tomcat] 04/04: Jakarta to javax

[remm]

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

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

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

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

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


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

[tomcat] branch 9.0.x updated (0a2642d -> 313b592)

[remm]

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

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


from 0a2642d  Additional fix for BZ 64192.
 new 71b049e  Hack in TLS support for HTTP/2 tests
 new 7091955  Use a BAOS
 new e1a2042  Compromise with the window update
 new 313b592  Jakarta to javax

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


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

[tomcat] branch master updated: Compromise with the window update

[remm]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 40b5ce0  Compromise with the window update
40b5ce0 is described below

commit 40b5ce0f3ddc9441eba455b461fd22d36466e0b8
Author: remm 
AuthorDate: Wed Mar 4 17:08:09 2020 +0100

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

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


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

[GitHub] [tomcat] markt-asf closed pull request #251: fixed misspelling

[GitBox]

markt-asf closed pull request #251: fixed misspelling
URL: https://github.com/apache/tomcat/pull/251
 
 
   


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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

[GitHub] [tomcat] markt-asf commented on issue #251: fixed misspelling

[GitBox]

markt-asf commented on issue #251: fixed misspelling
URL: https://github.com/apache/tomcat/pull/251#issuecomment-594597762
 
 
   Thanks for the PR.
   The Apache Tomcat project manages translations via POEditor. Anyone is free 
to create an account an contribute there:
   https://poeditor.com/projects/view?id=221603
   
   I have applied this fix to the German translations at poeditor.com and will 
import it shortly.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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

[tomcat] branch 7.0.x updated: Add bug reference and re-order as necessary.

[markt]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new ebc2ee7  Add bug reference and re-order as necessary.
ebc2ee7 is described below

commit ebc2ee74f99f0dc96ee5f7f82116e642798b2996
Author: Mark Thomas 
AuthorDate: Wed Mar 4 15:14:07 2020 +

Add bug reference and re-order as necessary.
---
 webapps/docs/changelog.xml | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f616f20..edd80b1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -80,9 +80,14 @@
 64166: Ensure that the names returned by
 HttpServletResponse.getHeaderNames() are unique. (markt)
   
+  
+64189: Expose the web application version String as a
+ServletContext attribute named
+org.apache.catalina.webappVersion. (markt)
+  
   
-Fix SCI support regression that was caused by a JAR path lookup error
-in the classloader findResources. (remm)
+64191: Fix an SCI support regression that was caused by a 
JAR
+path lookup error in the classloader findResources. (remm)
   
   
 Rename 
org.apache.tomcat.util.digester.Digester$EnvironmentPropertySource
@@ -97,11 +102,6 @@
 support authentication persistence. Patch provided by Carsten Klein.
 (markt)
   
-  
-64189: Expose the web application version String as a
-ServletContext attribute named
-org.apache.catalina.webappVersion. (markt)
-  
 
   
   


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

[Bug 64191] Applications not working with 7.0.100

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #7 from Mark Thomas  ---
Thanks for confirming the fix.

The monthly release cycle is close to starting so a 7.0.101 release should not
be too far away.

-- 
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 64192] Bug in Tomcat HTTP2 POST - with big payload

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #7 from Mark Thomas  ---
Thanks for the test case. Being able to recreate the issue in an environment I
can debug was a huge help.

Fixed in:
- master for 10.0.0-M2 onwards
- 9.0.x for 9.0.32 onwards

8.5.x and earlier are not affected.

I made the following changes:
a) fixed the case of returning data to the read buffer when it was non-empty
b) stopped TLS reads once they started to overflow into the readBuffer
c) corrected the value returned (bytes read) by the gathering TLS read

Fixing either a) or b) was sufficient for the test case to pass because the
additional TLS reads from b) were what was causing the read buffer to be
non-empty.

It may be the case that either a) or b) is sufficient to fix all potential
issues but I opted to fix both.

-- 
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] 01/02: Fix BZ 64192. Data corruption with HTTP/2 + asyncIO + TLS

[markt]

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

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

commit b557e7adaf4362c8de70e7e30e0daeac3afe64f4
Author: Mark Thomas 
AuthorDate: Wed Mar 4 14:28:34 2020 +

Fix BZ 64192. Data corruption with HTTP/2 + asyncIO + TLS

https://bz.apache.org/bugzilla/show_bug.cgi?id=64192
Correctly handle the case when data needs to be returned to the read
buffer when the read buffer is non-empty.
---
 .../tomcat/util/net/SocketBufferHandler.java   |  50 
 .../apache/tomcat/util/net/SocketWrapperBase.java  |   3 +-
 .../tomcat/util/net/TestSocketBufferHandler.java   | 139 +
 webapps/docs/changelog.xml |   4 +
 4 files changed, 194 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/SocketBufferHandler.java 
b/java/org/apache/tomcat/util/net/SocketBufferHandler.java
index 89fa86e..d066240 100644
--- a/java/org/apache/tomcat/util/net/SocketBufferHandler.java
+++ b/java/org/apache/tomcat/util/net/SocketBufferHandler.java
@@ -16,6 +16,7 @@
  */
 package org.apache.tomcat.util.net;
 
+import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
 import org.apache.tomcat.util.buf.ByteBufferUtils;
@@ -93,6 +94,55 @@ public class SocketBufferHandler {
 }
 
 
+public void unReadReadBuffer(ByteBuffer returnedData) {
+if (isReadBufferEmpty()) {
+configureReadBufferForWrite();
+readBuffer.put(returnedData);
+} else {
+int bytesReturned = returnedData.remaining();
+if (readBufferConfiguredForWrite) {
+// Writes always start at position zero
+if ((readBuffer.position() + bytesReturned) > 
readBuffer.capacity()) {
+throw new BufferOverflowException();
+} else {
+// Move the bytes up to make space for the returned data
+for (int i = 0; i < readBuffer.position(); i++) {
+readBuffer.put(i + bytesReturned, readBuffer.get(i));
+}
+// Insert the bytes returned
+for (int i = 0; i < bytesReturned; i++) {
+readBuffer.put(i, returnedData.get());
+}
+// Update the position
+readBuffer.position(readBuffer.position() + bytesReturned);
+}
+} else {
+// Reads will start at zero but may have progressed
+int shiftRequired = bytesReturned - readBuffer.position();
+if (shiftRequired > 0) {
+if ((readBuffer.capacity() - readBuffer.limit()) < 
shiftRequired) {
+throw new BufferOverflowException();
+}
+// Move the bytes up to make space for the returned data
+int oldLimit = readBuffer.limit();
+readBuffer.limit(oldLimit + shiftRequired);
+for (int i = readBuffer.position(); i < oldLimit; i++) {
+readBuffer.put(i + shiftRequired, readBuffer.get(i));
+}
+} else {
+shiftRequired = 0;
+}
+// Insert the returned bytes
+int insertOffset = readBuffer.position() + shiftRequired - 
bytesReturned;
+for (int i = insertOffset; i < bytesReturned + insertOffset; 
i++) {
+readBuffer.put(i, returnedData.get());
+}
+readBuffer.position(insertOffset);
+}
+}
+}
+
+
 public void configureWriteBufferForWrite() {
 setWriteBufferConfiguredForWrite(true);
 }
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index 0658ea6..a5c69c2 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -374,8 +374,7 @@ public abstract class SocketWrapperBase {
  */
 public void unRead(ByteBuffer returnedInput) {
 if (returnedInput != null) {
-socketBufferHandler.configureReadBufferForWrite();
-socketBufferHandler.getReadBuffer().put(returnedInput);
+socketBufferHandler.unReadReadBuffer(returnedInput);
 }
 }
 
diff --git a/test/org/apache/tomcat/util/net/TestSocketBufferHandler.java 
b/test/org/apache/tomcat/util/net/TestSocketBufferHandler.java
new file mode 100644
index 000..5e979a8
--- /dev/null
+++ b/test/org/apache/tomcat/util/net/TestSocketBufferHandler.java
@@ -0,0 +1,139 @@
+/*
+ * 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 

[tomcat] 02/02: Additional fix for BZ 64192.

[markt]

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

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

commit 997f99a0a96a0c3c09a86bd8a5595d6c1f62cbfc
Author: Mark Thomas 
AuthorDate: Wed Mar 4 15:05:00 2020 +

Additional fix for BZ 64192.

https://bz.apache.org/bugzilla/show_bug.cgi?id=64192
It was noted during investigation of BZ 64192 that inconsistent values
were being returned for the number of bytes read.
---
 .../apache/tomcat/util/net/SecureNio2Channel.java  | 22 ++
 .../apache/tomcat/util/net/SecureNioChannel.java   | 22 ++
 webapps/docs/changelog.xml |  4 +++-
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
index 54d9e03..d3a0b73 100644
--- a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
+++ b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
@@ -1011,13 +1011,11 @@ public class SecureNio2Channel extends Nio2Channel  {
 SSLEngineResult unwrap;
 ByteBuffer[] dsts2 = dsts;
 int length2 = length;
-boolean processOverflow = false;
+OverflowState overflowState = OverflowState.NONE;
 do {
-boolean useOverflow = false;
-if (processOverflow) {
-useOverflow = true;
+if (overflowState == OverflowState.PROCESSING) {
+overflowState = OverflowState.DONE;
 }
-processOverflow = false;
 //prepare the buffer
 netInBuffer.flip();
 //unwrap the data
@@ -1027,7 +1025,7 @@ public class SecureNio2Channel extends Nio2Channel  {
 if (unwrap.getStatus() == Status.OK || 
unwrap.getStatus() == Status.BUFFER_UNDERFLOW) {
 //we did receive some data, add it to our total
 read += unwrap.bytesProduced();
-if (useOverflow) {
+if (overflowState == OverflowState.DONE) {
 // Remove the data read into the overflow 
buffer
 read -= 
getBufHandler().getReadBuffer().position();
 }
@@ -1091,14 +1089,15 @@ public class SecureNio2Channel extends Nio2Channel  {
 }
 length2 = length + 1;
 
getBufHandler().configureReadBufferForWrite();
-processOverflow = true;
+overflowState = OverflowState.PROCESSING;
 }
 } else if (unwrap.getStatus() == Status.CLOSED) {
 break;
 } else {
 throw new 
IOException(sm.getString("channel.nio.ssl.unwrapFail", unwrap.getStatus()));
 }
-} while ((netInBuffer.position() != 0) || 
processOverflow); //continue to unwrapping as long as the input buffer has stuff
+} while ((netInBuffer.position() != 0 || overflowState 
== OverflowState.PROCESSING) &&
+overflowState != OverflowState.DONE);
 int capacity = 0;
 final int endOffset = offset + length;
 for (int i = offset; i < endOffset; i++) {
@@ -1248,4 +1247,11 @@ public class SecureNio2Channel extends Nio2Channel  {
 public ByteBuffer getEmptyBuf() {
 return emptyBuf;
 }
+
+
+private enum OverflowState {
+NONE,
+PROCESSING,
+DONE;
+}
 }
\ No newline at end of file
diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java 
b/java/org/apache/tomcat/util/net/SecureNioChannel.java
index c2eb73a..6cf10fb 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -657,13 +657,11 @@ public class SecureNioChannel extends NioChannel {
 int read = 0;
 //the SSL engine result
 SSLEngineResult unwrap;
-boolean processOverflow = false;
+OverflowState overflowState = OverflowState.NONE;
 do {
-boolean useOverflow = false;
-if (processOverflow) {
-useOverflow = true;
+if (overflowState == OverflowState.PROCESSING) {
+overflowState = OverflowState.DONE;
 }

[tomcat] branch master updated (fe924f1 -> 997f99a)

[markt]

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

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


from fe924f1  Use a BAOS
 new b557e7a  Fix BZ 64192. Data corruption with HTTP/2 + asyncIO + TLS
 new 997f99a  Additional fix for BZ 64192.

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


Summary of changes:
 .../apache/tomcat/util/net/SecureNio2Channel.java  |  22 ++--
 .../apache/tomcat/util/net/SecureNioChannel.java   |  22 ++--
 .../tomcat/util/net/SocketBufferHandler.java   |  50 
 .../apache/tomcat/util/net/SocketWrapperBase.java  |   3 +-
 .../tomcat/util/net/TestSocketBufferHandler.java   | 139 +
 webapps/docs/changelog.xml |   6 +
 6 files changed, 224 insertions(+), 18 deletions(-)
 create mode 100644 test/org/apache/tomcat/util/net/TestSocketBufferHandler.java


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

[tomcat] 02/02: Additional fix for BZ 64192.

[markt]

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

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

commit 0a2642d0ea785ae31a76d74e4b09d1c992b66ead
Author: Mark Thomas 
AuthorDate: Wed Mar 4 15:05:00 2020 +

Additional fix for BZ 64192.

https://bz.apache.org/bugzilla/show_bug.cgi?id=64192
It was noted during investigation of BZ 64192 that inconsistent values
were being returned for the number of bytes read.
---
 .../apache/tomcat/util/net/SecureNio2Channel.java  | 22 ++
 .../apache/tomcat/util/net/SecureNioChannel.java   | 22 ++
 webapps/docs/changelog.xml |  4 +++-
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
index 54d9e03..d3a0b73 100644
--- a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
+++ b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
@@ -1011,13 +1011,11 @@ public class SecureNio2Channel extends Nio2Channel  {
 SSLEngineResult unwrap;
 ByteBuffer[] dsts2 = dsts;
 int length2 = length;
-boolean processOverflow = false;
+OverflowState overflowState = OverflowState.NONE;
 do {
-boolean useOverflow = false;
-if (processOverflow) {
-useOverflow = true;
+if (overflowState == OverflowState.PROCESSING) {
+overflowState = OverflowState.DONE;
 }
-processOverflow = false;
 //prepare the buffer
 netInBuffer.flip();
 //unwrap the data
@@ -1027,7 +1025,7 @@ public class SecureNio2Channel extends Nio2Channel  {
 if (unwrap.getStatus() == Status.OK || 
unwrap.getStatus() == Status.BUFFER_UNDERFLOW) {
 //we did receive some data, add it to our total
 read += unwrap.bytesProduced();
-if (useOverflow) {
+if (overflowState == OverflowState.DONE) {
 // Remove the data read into the overflow 
buffer
 read -= 
getBufHandler().getReadBuffer().position();
 }
@@ -1091,14 +1089,15 @@ public class SecureNio2Channel extends Nio2Channel  {
 }
 length2 = length + 1;
 
getBufHandler().configureReadBufferForWrite();
-processOverflow = true;
+overflowState = OverflowState.PROCESSING;
 }
 } else if (unwrap.getStatus() == Status.CLOSED) {
 break;
 } else {
 throw new 
IOException(sm.getString("channel.nio.ssl.unwrapFail", unwrap.getStatus()));
 }
-} while ((netInBuffer.position() != 0) || 
processOverflow); //continue to unwrapping as long as the input buffer has stuff
+} while ((netInBuffer.position() != 0 || overflowState 
== OverflowState.PROCESSING) &&
+overflowState != OverflowState.DONE);
 int capacity = 0;
 final int endOffset = offset + length;
 for (int i = offset; i < endOffset; i++) {
@@ -1248,4 +1247,11 @@ public class SecureNio2Channel extends Nio2Channel  {
 public ByteBuffer getEmptyBuf() {
 return emptyBuf;
 }
+
+
+private enum OverflowState {
+NONE,
+PROCESSING,
+DONE;
+}
 }
\ No newline at end of file
diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java 
b/java/org/apache/tomcat/util/net/SecureNioChannel.java
index 7d128fb..1bd143f 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -683,13 +683,11 @@ public class SecureNioChannel extends NioChannel {
 int read = 0;
 //the SSL engine result
 SSLEngineResult unwrap;
-boolean processOverflow = false;
+OverflowState overflowState = OverflowState.NONE;
 do {
-boolean useOverflow = false;
-if (processOverflow) {
-useOverflow = true;
+if (overflowState == OverflowState.PROCESSING) {
+overflowState = OverflowState.DONE;
 }
- 

[tomcat] 01/02: Fix BZ 64192. Data corruption with HTTP/2 + asyncIO + TLS

[markt]

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

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

commit e13c11bc16d2dba522b0d30dfe4cf6327f329042
Author: Mark Thomas 
AuthorDate: Wed Mar 4 14:28:34 2020 +

Fix BZ 64192. Data corruption with HTTP/2 + asyncIO + TLS

https://bz.apache.org/bugzilla/show_bug.cgi?id=64192
Correctly handle the case when data needs to be returned to the read
buffer when the read buffer is non-empty.
---
 .../tomcat/util/net/SocketBufferHandler.java   |  50 
 .../apache/tomcat/util/net/SocketWrapperBase.java  |   3 +-
 .../tomcat/util/net/TestSocketBufferHandler.java   | 139 +
 webapps/docs/changelog.xml |   4 +
 4 files changed, 194 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/SocketBufferHandler.java 
b/java/org/apache/tomcat/util/net/SocketBufferHandler.java
index 89fa86e..d066240 100644
--- a/java/org/apache/tomcat/util/net/SocketBufferHandler.java
+++ b/java/org/apache/tomcat/util/net/SocketBufferHandler.java
@@ -16,6 +16,7 @@
  */
 package org.apache.tomcat.util.net;
 
+import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
 import org.apache.tomcat.util.buf.ByteBufferUtils;
@@ -93,6 +94,55 @@ public class SocketBufferHandler {
 }
 
 
+public void unReadReadBuffer(ByteBuffer returnedData) {
+if (isReadBufferEmpty()) {
+configureReadBufferForWrite();
+readBuffer.put(returnedData);
+} else {
+int bytesReturned = returnedData.remaining();
+if (readBufferConfiguredForWrite) {
+// Writes always start at position zero
+if ((readBuffer.position() + bytesReturned) > 
readBuffer.capacity()) {
+throw new BufferOverflowException();
+} else {
+// Move the bytes up to make space for the returned data
+for (int i = 0; i < readBuffer.position(); i++) {
+readBuffer.put(i + bytesReturned, readBuffer.get(i));
+}
+// Insert the bytes returned
+for (int i = 0; i < bytesReturned; i++) {
+readBuffer.put(i, returnedData.get());
+}
+// Update the position
+readBuffer.position(readBuffer.position() + bytesReturned);
+}
+} else {
+// Reads will start at zero but may have progressed
+int shiftRequired = bytesReturned - readBuffer.position();
+if (shiftRequired > 0) {
+if ((readBuffer.capacity() - readBuffer.limit()) < 
shiftRequired) {
+throw new BufferOverflowException();
+}
+// Move the bytes up to make space for the returned data
+int oldLimit = readBuffer.limit();
+readBuffer.limit(oldLimit + shiftRequired);
+for (int i = readBuffer.position(); i < oldLimit; i++) {
+readBuffer.put(i + shiftRequired, readBuffer.get(i));
+}
+} else {
+shiftRequired = 0;
+}
+// Insert the returned bytes
+int insertOffset = readBuffer.position() + shiftRequired - 
bytesReturned;
+for (int i = insertOffset; i < bytesReturned + insertOffset; 
i++) {
+readBuffer.put(i, returnedData.get());
+}
+readBuffer.position(insertOffset);
+}
+}
+}
+
+
 public void configureWriteBufferForWrite() {
 setWriteBufferConfiguredForWrite(true);
 }
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index 91e245e..1e3ffb1 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -374,8 +374,7 @@ public abstract class SocketWrapperBase {
  */
 public void unRead(ByteBuffer returnedInput) {
 if (returnedInput != null) {
-socketBufferHandler.configureReadBufferForWrite();
-socketBufferHandler.getReadBuffer().put(returnedInput);
+socketBufferHandler.unReadReadBuffer(returnedInput);
 }
 }
 
diff --git a/test/org/apache/tomcat/util/net/TestSocketBufferHandler.java 
b/test/org/apache/tomcat/util/net/TestSocketBufferHandler.java
new file mode 100644
index 000..5e979a8
--- /dev/null
+++ b/test/org/apache/tomcat/util/net/TestSocketBufferHandler.java
@@ -0,0 +1,139 @@
+/*
+ * 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 

[tomcat] branch 9.0.x updated (6e60713 -> 0a2642d)

[markt]

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

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


from 6e60713  64195: Revert simplification of NIO block read and write
 new e13c11b  Fix BZ 64192. Data corruption with HTTP/2 + asyncIO + TLS
 new 0a2642d  Additional fix for BZ 64192.

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


Summary of changes:
 .../apache/tomcat/util/net/SecureNio2Channel.java  |  22 ++--
 .../apache/tomcat/util/net/SecureNioChannel.java   |  22 ++--
 .../tomcat/util/net/SocketBufferHandler.java   |  50 
 .../apache/tomcat/util/net/SocketWrapperBase.java  |   3 +-
 .../tomcat/util/net/TestSocketBufferHandler.java   | 139 +
 webapps/docs/changelog.xml |   6 +
 6 files changed, 224 insertions(+), 18 deletions(-)
 create mode 100644 test/org/apache/tomcat/util/net/TestSocketBufferHandler.java


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

Re: Tagging 10.0.x, 9.0.x, 8.5.x

[Martin Grigorov]

On Wed, Mar 4, 2020 at 2:27 PM Violeta Georgieva 
wrote:

>
>
> На ср, 4.03.2020 г. в 14:25 Martin Tzvetanov Grigorov <
> mgrigo...@apache.org> написа:
> >
> > The SCI regression seems to affect some users of 7.0.x. And staying with
> 7.0.99 is not a good option because of CVE-2020-1938.
> >
> > @Violeta: will you have time to cut 7.0.101 after the new releases of
> 10.0.x, 9.0.x and 8.5.x ?
>
> Yep I can do that
>

Cool!
Thanks!


>
> Regards,
> Violeta
>
> > Martin
> >
> > On 2020/02/28 20:30:50, Mark Thomas  wrote:
> > > Just a heads up that I'm aiming to do this early next week.
> > >
> > > Mark
> > >
> > > -
> > > 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 master updated: Use a BAOS

[remm]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new fe924f1  Use a BAOS
fe924f1 is described below

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

Use a BAOS

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

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


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

[Bug 64195] Tomcat NIO SSL Connector broken under Linux in Tomcat 9.0.31

[bugzilla]

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

--- Comment #5 from Michael Seele  ---
(In reply to Remy Maucherat from comment #4)
> I have reverted the change in Tomcat 9.0.31 that probably caused this (the
> fix will be in 9.0.32), since I cannot immediately investigate. Given the
> plan for the Tomcat 9 branch, it is best to permanently defer this change to
> Tomcat 10 and 9.10.
> 
> I will work on integrating your testcase into the Tomcat testsuite and will
> see how well the problem can be reproduced.
> The stacktraces provided are not useful, same as with 64195.

Hi Remy, thank you. Please see the referenced docker images (where a full
tomcat installation takes place and is fully setup to reproduce this bug). Just
need to run the docker image and execute the client against:
- import it via docker load
(https://docs.docker.com/engine/reference/commandline/load/)
- run it via e.g. docker run --detach -it -p :8443 -p 8889:8444 --rm --name
tomcat 
- run DemoClient (e.g. java DemoClient https://localhost:/tomcat_nio
and you can reproduce the bug.

I can send you the docker images or an export of the tomcat also via email if
you want?

-- 
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 64194] POST requests with large bodies fail sporadically since change to read and write for NIO

[bugzilla]

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

Remy Maucherat  changed:

   What|Removed |Added

 CC|r...@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 64195] Tomcat NIO SSL Connector broken under Linux in Tomcat 9.0.31

[bugzilla]

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

Remy Maucherat  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #4 from Remy Maucherat  ---
I have reverted the change in Tomcat 9.0.31 that probably caused this (the fix
will be in 9.0.32), since I cannot immediately investigate. Given the plan for
the Tomcat 9 branch, it is best to permanently defer this change to Tomcat 10
and 9.10.

I will work on integrating your testcase into the Tomcat testsuite and will see
how well the problem can be reproduced.
The stacktraces provided are not useful, same as with 64195.

-- 
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 64195] Tomcat NIO SSL Connector broken under Linux in Tomcat 9.0.31

[bugzilla]

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

Remy Maucherat  changed:

   What|Removed |Added

  Component|Catalina|Catalina
Product|Tomcat 9|Tomcat 10
   Target Milestone|-   |--
Version|9.0.31  |10.0.0-M1

-- 
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 9.0.x updated: 64195: Revert simplification of NIO block read and write

[remm]

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

remm 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 6e60713  64195: Revert simplification of NIO block read and write
6e60713 is described below

commit 6e60713c75141bc00f03f08f759df993a6416c71
Author: remm 
AuthorDate: Wed Mar 4 14:04:36 2020 +0100

64195: Revert simplification of NIO block read and write

Deferred to Tomcat 10.
---
 java/org/apache/tomcat/util/net/NioEndpoint.java | 105 +++
 webapps/docs/changelog.xml   |   4 +
 2 files changed, 34 insertions(+), 75 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 66f941c..1a9f9de 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -135,7 +135,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 public boolean getUseInheritedChannel() { return useInheritedChannel; }
 
 /**
- * Priority of the poller thread.
+ * Priority of the poller threads.
  */
 private int pollerThreadPriority = Thread.NORM_PRIORITY;
 public void setPollerThreadPriority(int pollerThreadPriority) { 
this.pollerThreadPriority = pollerThreadPriority; }
@@ -771,11 +771,6 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 if 
(!socketWrapper.readOperation.process()) {
 closeSocket = true;
 }
-} else if (socketWrapper.readBlocking) {
-synchronized (socketWrapper.readLock) {
-socketWrapper.readBlocking = false;
-socketWrapper.readLock.notify();
-}
 } else if (!processSocket(socketWrapper, 
SocketEvent.OPEN_READ, true)) {
 closeSocket = true;
 }
@@ -785,11 +780,6 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 if 
(!socketWrapper.writeOperation.process()) {
 closeSocket = true;
 }
-} else if (socketWrapper.writeBlocking) {
-synchronized (socketWrapper.writeLock) {
-socketWrapper.writeBlocking = false;
-socketWrapper.writeLock.notify();
-}
 } else if (!processSocket(socketWrapper, 
SocketEvent.OPEN_WRITE, true)) {
 closeSocket = true;
 }
@@ -1033,19 +1023,12 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 private volatile long lastRead = System.currentTimeMillis();
 private volatile long lastWrite = lastRead;
 
-private final Object readLock;
-private volatile boolean readBlocking = false;
-private final Object writeLock;
-private volatile boolean writeBlocking = false;
-
 public NioSocketWrapper(NioChannel channel, NioEndpoint endpoint) {
 super(channel, endpoint);
 pool = endpoint.getSelectorPool();
 nioChannels = endpoint.getNioChannels();
 poller = endpoint.getPoller();
 socketBufferHandler = channel.getBufHandler();
-readLock = (readPending == null) ? new Object() : readPending;
-writeLock = (writePending == null) ? new Object() : writePending;
 }
 
 public Poller getPoller() { return poller; }
@@ -1228,37 +1211,24 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 if (socket instanceof ClosedNioChannel) {
 throw new ClosedChannelException();
 }
-nRead = socket.read(to);
-if (nRead == -1) {
-throw new EOFException();
-}
-if (block && nRead == 0) {
-long timeout = getReadTimeout();
+if (block) {
+Selector selector = null;
 try {
-readBlocking = true;
-registerReadInterest();
-synchronized (readLock) {
-if (readBlocking) {
-try {
-if (timeout > 0) {
-readLock.wait(timeout);
-} else {
-readLock.wait();
-}
-} catch 

svn commit: r1874785 [4/7] - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

[mgrigorov]

Modified: tomcat/site/trunk/docs/oldnews-2012.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2012.html?rev=1874785=1874784=1874785=diff
==
--- tomcat/site/trunk/docs/oldnews-2012.html (original)
+++ tomcat/site/trunk/docs/oldnews-2012.html Wed Mar  4 13:02:04 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Old news! - 2012http://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">http://www
 .apache.org/" target="_blank" class="pull-left">https://www.google.com/search; method="get">GOhttps://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-70.cgi;>Tomcat 7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 
 10.0Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource code
 Buildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentOther news
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(alpha)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.0 (alpha)Tomcat 
 >9.0Tomcat 
 >8.5Tomcat 
 >7.0Tomcat Connectorshref="./native-doc/">Tomcat Nativehref="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">PresentationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug 
 >DatabaseIRCGet 
 >InvolvedOverviewhref="./source.html">Source c
 odeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorship<
 /li>http://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentOther news
 Announcements from other years can be found here:
 
   year 2019

Modified: tomcat/site/trunk/docs/oldnews-2013.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2013.html?rev=1874785=1874784=1874785=diff
==
--- tomcat/site/trunk/docs/oldnews-2013.html (original)
+++ tomcat/site/trunk/docs/oldnews-2013.html Wed Mar  4 13:02:04 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Old news!http://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">http://www.apache
 .org/" target="_blank" class="pull-left">https://www.google.com/search; method="get">GOhttps://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
   Save the date!
-Apache 

svn commit: r1874785 [6/7] - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

[mgrigorov]

Modified: tomcat/site/trunk/docs/security-impact.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-impact.html?rev=1874785=1874784=1874785=diff
==
--- tomcat/site/trunk/docs/security-impact.html (original)
+++ tomcat/site/trunk/docs/security-impact.html Wed Mar  4 13:02:04 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Security Impact Levelshttp://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">https://www.google.com/search; method="get">GOhttps://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-70.cgi;>Tomcat 7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 
 10.0Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource code
 Buildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentSummary of security 
impact levels for Apache Tomcat
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(alpha)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.0 (alpha)Tomcat 
 >9.0Tomcat 
 >8.5Tomcat 
 >7.0Tomcat Connectorshref="./native-doc/">Tomcat Nativehref="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">PresentationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug 
 >DatabaseIRCGet 
 >InvolvedOverviewhref="./source.html">Source c
 odeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorship<
 /li>http://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentSummary of security 
impact levels for Apache Tomcat
 The Apache Tomcat Security Team rates the impact of each security flaw
that affects Tomcat. We've chosen a rating scale quite similar to those
used by other major vendors in order to be consistent. Basically the 
goal

Modified: tomcat/site/trunk/docs/security-jk.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-jk.html?rev=1874785=1874784=1874785=diff
==
--- tomcat/site/trunk/docs/security-jk.html (original)
+++ tomcat/site/trunk/docs/security-jk.html Wed Mar  4 13:02:04 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Apache Tomcat JK Connectors 
vulnerabilitieshttp://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apac
 he">http://www.apache.org/; target="_blank" 

svn commit: r1874785 [7/7] - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

[mgrigorov]

Modified: tomcat/site/trunk/docs/tomcat-70-eol.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-70-eol.html?rev=1874785=1874784=1874785=diff
==
--- tomcat/site/trunk/docs/tomcat-70-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-70-eol.html Wed Mar  4 13:02:04 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - End of life for Apache Tomcat 
7.0.xhttp://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">
 http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOhttps://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-70.cgi;>Tomcat 7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 
 10.0Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource code
 Buildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContent2020-03-02 End of life for Apache Tomcat 
7.0.x
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(alpha)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.0 (alpha)Tomcat 
 >9.0Tomcat 
 >8.5Tomcat 
 >7.0Tomcat Connectorshref="./native-doc/">Tomcat Nativehref="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">PresentationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug 
 >DatabaseIRCGet 
 >InvolvedOverviewhref="./source.html">Source c
 odeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorship<
 /li>http://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContent2020-03-02 End of life for Apache Tomcat 
7.0.x
 The Apache Tomcat team announces that support for Apache Tomcat 7.0.x
 will end on 31 March 2021.
 

Modified: tomcat/site/trunk/docs/tomcat-80-eol.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-80-eol.html?rev=1874785=1874784=1874785=diff
==
--- tomcat/site/trunk/docs/tomcat-80-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-80-eol.html Wed Mar  4 13:02:04 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - End of life for Apache Tomcat 
8.0.xhttp://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">
 http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; 

svn commit: r1874785 [5/7] - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

[mgrigorov]

Modified: tomcat/site/trunk/docs/security-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-10.html?rev=1874785=1874784=1874785=diff
==
--- tomcat/site/trunk/docs/security-10.html (original)
+++ tomcat/site/trunk/docs/security-10.html Wed Mar  4 13:02:04 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Apache Tomcat 10 
vulnerabilitieshttp://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOhttps://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-70.cgi;>Tomcat 7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 
 10.0Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource code
 Buildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentTable of Contents
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(alpha)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.0 (alpha)Tomcat 
 >9.0Tomcat 
 >8.5Tomcat 
 >7.0Tomcat Connectorshref="./native-doc/">Tomcat Nativehref="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">PresentationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug 
 >DatabaseIRCGet 
 >InvolvedOverviewhref="./source.html">Source c
 odeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorship<
 /li>http://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentTable of Contents
 Apache Tomcat 10.x 
vulnerabilitiesFixed in 
Apache Tomcat 10.0.x
 Apache Tomcat 10.x 
vulnerabilities
 This page lists all security vulnerabilities fixed in released versions
@@ -18,7 +18,7 @@
 
 Please note that binary patches are never provided. If you need to
apply a source code patch, use the building instructions for the
-   Apache Tomcat version that you are using. For Tomcat 10.0 those are
+   Apache Tomcat version that you are using. For Tomcat 10.0.x 
alpha those are
building.html 
and
BUILDING.txt.
Both files can be found in the webapps/docs subdirectory
@@ -41,7 +41,7 @@
 
   Fixed in Apache Tomcat 
10.0.x
 
-There are currently no known vulnerabilities for Apache Tomcat 
10.0.x
+There are currently no known vulnerabilities for Apache Tomcat 10.0.x 
alpha
 
   
 Copyright  1999-2020, The Apache Software Foundation

Modified: tomcat/site/trunk/docs/security-3.html
URL: 

svn commit: r1874785 [1/7] - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

[mgrigorov]

Author: mgrigorov
Date: Wed Mar  4 13:02:04 2020
New Revision: 1874785

URL: http://svn.apache.org/viewvc?rev=1874785=rev
Log:
Emphasize that Tomcat 10.0.x is an alpha release

Fix the link to its download page.

https://lists.apache.org/thread.html/r67d1a20ce152d60be79d14b2261a7bf63083710fe3ed474152dae431%40%3Cusers.tomcat.apache.org%3E


Modified:
tomcat/site/trunk/docs/bugreport.html
tomcat/site/trunk/docs/ci.html
tomcat/site/trunk/docs/conference.html
tomcat/site/trunk/docs/contact.html
tomcat/site/trunk/docs/download-10.html
tomcat/site/trunk/docs/download-70.html
tomcat/site/trunk/docs/download-80.html
tomcat/site/trunk/docs/download-90.html
tomcat/site/trunk/docs/download-connectors.html
tomcat/site/trunk/docs/download-native.html
tomcat/site/trunk/docs/download-taglibs.html
tomcat/site/trunk/docs/findhelp.html
tomcat/site/trunk/docs/getinvolved.html
tomcat/site/trunk/docs/heritage.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/irc.html
tomcat/site/trunk/docs/legal.html
tomcat/site/trunk/docs/lists.html
tomcat/site/trunk/docs/maven-plugin.html
tomcat/site/trunk/docs/migration-10.html
tomcat/site/trunk/docs/migration-6.html
tomcat/site/trunk/docs/migration-7.html
tomcat/site/trunk/docs/migration-8.html
tomcat/site/trunk/docs/migration-85.html
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/docs/migration.html
tomcat/site/trunk/docs/oldnews-2010.html
tomcat/site/trunk/docs/oldnews-2011.html
tomcat/site/trunk/docs/oldnews-2012.html
tomcat/site/trunk/docs/oldnews-2013.html
tomcat/site/trunk/docs/oldnews-2014.html
tomcat/site/trunk/docs/oldnews-2015.html
tomcat/site/trunk/docs/oldnews-2016.html
tomcat/site/trunk/docs/oldnews-2017.html
tomcat/site/trunk/docs/oldnews-2018.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/presentations.html
tomcat/site/trunk/docs/resources.html
tomcat/site/trunk/docs/security-10.html
tomcat/site/trunk/docs/security-3.html
tomcat/site/trunk/docs/security-4.html
tomcat/site/trunk/docs/security-5.html
tomcat/site/trunk/docs/security-6.html
tomcat/site/trunk/docs/security-7.html
tomcat/site/trunk/docs/security-8.html
tomcat/site/trunk/docs/security-9.html
tomcat/site/trunk/docs/security-impact.html
tomcat/site/trunk/docs/security-jk.html
tomcat/site/trunk/docs/security-native.html
tomcat/site/trunk/docs/security-taglibs.html
tomcat/site/trunk/docs/security.html
tomcat/site/trunk/docs/source.html
tomcat/site/trunk/docs/taglibs.html
tomcat/site/trunk/docs/tomcat-55-eol.html
tomcat/site/trunk/docs/tomcat-60-eol.html
tomcat/site/trunk/docs/tomcat-70-eol.html
tomcat/site/trunk/docs/tomcat-80-eol.html
tomcat/site/trunk/docs/tools.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/docs/whoweare.html
tomcat/site/trunk/xdocs/bugreport.xml
tomcat/site/trunk/xdocs/ci.xml
tomcat/site/trunk/xdocs/download-10.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-10.xml
tomcat/site/trunk/xdocs/migration.xml
tomcat/site/trunk/xdocs/security-10.xml
tomcat/site/trunk/xdocs/source.xml
tomcat/site/trunk/xdocs/stylesheets/project.xml

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1874785=1874784=1874785=diff
==
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Wed Mar  4 13:02:04 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Reporting Bugshttp://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">http://www.apache
 .org/" target="_blank" class="pull-left">https://www.google.com/search; method="get">GOhttps://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-70.cgi;>Tomcat 7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 
 10.0Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationsProblems?Security ReportsFind 

svn commit: r1874785 [3/7] - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

[mgrigorov]

Modified: tomcat/site/trunk/docs/migration-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-10.html?rev=1874785=1874784=1874785=diff
==
--- tomcat/site/trunk/docs/migration-10.html (original)
+++ tomcat/site/trunk/docs/migration-10.html Wed Mar  4 13:02:04 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Migration Guide - Tomcat 
10.0.xhttp://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOhttps://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-70.cgi;>Tomcat 7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 
 10.0Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource code
 Buildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentTable of Contents
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(alpha)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.0 (alpha)Tomcat 
 >9.0Tomcat 
 >8.5Tomcat 
 >7.0Tomcat Connectorshref="./native-doc/">Tomcat Nativehref="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">PresentationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug 
 >DatabaseIRCGet 
 >InvolvedOverviewhref="./source.html">Source c
 odeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorship<
 /li>http://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentTable of Contents
 GeneralMigrating from 9.0.x to 
10.0.xJava 8 requiredSpecification APIsServlet 5.0 APIServer Pages 3.0Expression Language 4.0WebSocket 2.0Authentication 4.0Internal APIsweb.xml defaultsSession managementHTTP/2LoggingUpgrading 10.0.xTomcat 10.0.x noteable 
changesTom
 cat 10.0.x configuration file differences
 General
 
@@ -11,7 +11,7 @@ of Apache Tomcat.
 
 Migrating from 9.0.x to 
10.0.x
 
-  This section lists all the known changes between 9.0.x and 10.0.x
+  This section lists all the known changes between 9.0.x and 10.0.x 
alpha
   which may cause backwards compatibility problems when upgrading.
 
   Until Tomcat 10 is declared stable, there may be additional changes made
@@ -19,7 +19,7 @@ of Apache Tomcat.
 
   Java 8 required
 
-Apache Tomcat 10.0.x requires Java 8 or later. This is unchanged from
+Apache Tomcat 10.0.x alpha requires Java 8 
or later. This is unchanged from
 Tomcat 9.0.x.
 
   

Modified: 

svn commit: r1874785 [2/7] - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

[mgrigorov]

Modified: tomcat/site/trunk/docs/download-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1874785=1874784=1874785=diff
==
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Wed Mar  4 13:02:04 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Tomcat Native 
Downloadshttp://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">http://www.apache.org/; target="_blank" 
class="pull-lef
 t">https://www.google.com/search; method="get">GOhttps://www.apache.org/events/current-event.html;>https://www.apache.org/events/current-event-234x60.png; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/download-70.cgi;>Tomcat 7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 
 10.0Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource code
 Buildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentTomcat Native Downloads
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10 
(alpha)https://tomcat.apache.org/download-90.cgi;>Tomcat 
9https://tomcat.apache.org/download-80.cgi;>Tomcat 
8https://tomcat.apache.org/download-70.cgi;>Tomcat 
7https://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.0 (alpha)Tomcat 
 >9.0Tomcat 
 >8.5Tomcat 
 >7.0Tomcat Connectorshref="./native-doc/">Tomcat Nativehref="https://cwiki.apache.org/confluence/display/TOMCAT;>Wikihref="./migration.html">Migration Guidehref="./presentations.html">PresentationsProblems? href="./security.html">Security Reportshref="./findhelp.html">Find helphref="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQ href="./lists.html">Mailing ListsBug 
 >DatabaseIRCGet 
 >InvolvedOverviewhref="./source.html">Source c
 odeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tomcat/;>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorship<
 /li>http://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentTomcat Native Downloads
 
   Use the links below to download the Apache Tomcat 
Native software
   from one of our mirrors. You must

Modified: tomcat/site/trunk/docs/download-taglibs.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-taglibs.html?rev=1874785=1874784=1874785=diff
==
--- tomcat/site/trunk/docs/download-taglibs.html (original)
+++ tomcat/site/trunk/docs/download-taglibs.html Wed Mar  4 13:02:04 2020
@@ -1,7 +1,7 @@
 
 Apache Tomcat - Apache Taglibs 
Downloadshttp://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">http://www.apache.org/; target="_blank" 
class="pull-le
 ft">https://www.google.com/search; 

[Bug 64194] POST requests with large bodies fail sporadically since change to read and write for NIO

[bugzilla]

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

Remy Maucherat  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |DUPLICATE

--- Comment #4 from Remy Maucherat  ---
Likely duplicate, and no useful information here, better on the other one.

*** This bug has been marked as a duplicate of bug 64195 ***

-- 
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 64195] Tomcat NIO SSL Connector broken under Linux in Tomcat 9.0.31

[bugzilla]

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

Remy Maucherat  changed:

   What|Removed |Added

 CC||sebastian.r...@sap.com

--- Comment #3 from Remy Maucherat  ---
*** Bug 64194 has been marked as a duplicate of this 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 64194] POST requests with large bodies fail sporadically since change to read and write for NIO

[bugzilla]

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

Remy Maucherat  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #3 from Remy Maucherat  ---
There is nothing here that can be worked on [special JDK, large application
posting unknown data in an unknown way, etc].

I will probably revert the change, it could be too risky for 9, and apparently
you seem to like the previous mess better.

-- 
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 64195] Tomcat NIO SSL Connector broken under Linux in Tomcat 9.0.31

[bugzilla]

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

--- Comment #2 from mse...@guh-software.de ---
Created attachment 37059
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=37059=edit
DemoClient

-- 
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 64195] Tomcat NIO SSL Connector broken under Linux in Tomcat 9.0.31

[bugzilla]

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

--- Comment #1 from mse...@guh-software.de ---
Created attachment 37058
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=37058=edit
SendBackServlet

-- 
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 64195] New: Tomcat NIO SSL Connector broken under Linux in Tomcat 9.0.31

[bugzilla]

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

Bug ID: 64195
   Summary: Tomcat NIO SSL Connector broken under Linux in Tomcat
9.0.31
   Product: Tomcat 9
   Version: 9.0.31
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: mse...@guh-software.de
  Target Milestone: -

Since Tomcat 9.0.31 we got multiple issues transfering files with
org.apache.coyote.http11.Http11NioProtocol having SSL enabled.

The issues are completely gone when we switch to
org.apache.coyote.http11.Http11Nio2Protocol or go back to Tomcat 9.0.30.

I've created a demo servlet that just read the incomming bytes and write it
back to the output stream.
I've also implemented a demo client who sends requests to that servlet, reads
the response and checks it.

Here you can find a tomcat docker image where everything is included:

- https://drive.google.com/open?id=1lLLt8y4hY2PCV-K81RBsT_2kPxYXOCv2 (used
"docker save" command)
- https://drive.google.com/open?id=1vQ4Cwr7__Skx7YsJBk8oLo_-XXih_OLJ (used
"docker export" command)

I've used the tag 9.0.31-jdk11-adoptopenjdk-hotspot from
https://hub.docker.com/_/tomcat

You just need to run the client against that docker image.
I've added two SSL connectors:
Http11NioProtocol on port 8443 and Http11Nio2Protocol on port 8444

Running against Http11Nio2Protocol workes fine, running against
Http11NioProtocol fails most of the time.

Here are a few of the different exceptions we got in our live applications
using tomcat 9.0.31 & Http11NioProtocol:

Broken pipe (Write failed)
org.apache.http.client.ClientProtocolException
at
org.apache.http.impl.client.InternalHttpClient.doExecute(InternalHttpClient.java:187)
at
org.apache.http.impl.client.CloseableHttpClient.execute(CloseableHttpClient.java:83)
at
org.apache.http.impl.client.CloseableHttpClient.execute(CloseableHttpClient.java:108)
at
de.guhsoft.guhsync.client.shared.ServerConnection.execute(ServerConnection.java:183)
at
de.guhsoft.guhsync.client.shared.calls.ServerCall.execute(ServerCall.java:30)
at
de.guhsoft.guhsync.client.shared.SyncService.run(SyncService.java:80)
at
com.google.common.util.concurrent.AbstractExecutionThreadService$1$2.run(AbstractExecutionThreadService.java:66)
at
com.google.common.util.concurrent.Callables$4.run(Callables.java:122)
at java.base/java.lang.Thread.run(Thread.java:834)
Caused by: org.apache.http.client.NonRepeatableRequestException: Cannot retry
request with a non-repeatable request entity
at org.apache.http.impl.execchain.RetryExec.execute(RetryExec.java:108)
at
org.apache.http.impl.execchain.RedirectExec.execute(RedirectExec.java:111)
at
org.apache.http.impl.client.InternalHttpClient.doExecute(InternalHttpClient.java:185)
... 8 more
Caused by: javax.net.ssl.SSLException: Broken pipe (Write failed)
at java.base/sun.security.ssl.Alert.createSSLException(Alert.java:127)
at
java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:320)
at
java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:263)
at
java.base/sun.security.ssl.TransportContext.fatal(TransportContext.java:258)
at
java.base/sun.security.ssl.SSLSocketImpl$AppOutputStream.write(SSLSocketImpl.java:987)
at
org.apache.http.impl.io.SessionOutputBufferImpl.streamWrite(SessionOutputBufferImpl.java:124)
at
org.apache.http.impl.io.SessionOutputBufferImpl.flushBuffer(SessionOutputBufferImpl.java:136)
at
org.apache.http.impl.io.SessionOutputBufferImpl.write(SessionOutputBufferImpl.java:167)
at
org.apache.http.impl.io.ContentLengthOutputStream.write(ContentLengthOutputStream.java:113)
at
org.apache.http.entity.InputStreamEntity.writeTo(InputStreamEntity.java:144)
at
org.apache.http.impl.execchain.RequestEntityProxy.writeTo(RequestEntityProxy.java:121)
at
org.apache.http.impl.DefaultBHttpClientConnection.sendRequestEntity(DefaultBHttpClientConnection.java:156)
at
org.apache.http.protocol.HttpRequestExecutor.doSendRequest(HttpRequestExecutor.java:238)
at
org.apache.http.protocol.HttpRequestExecutor.execute(HttpRequestExecutor.java:123)
at
org.apache.http.impl.execchain.MainClientExec.execute(MainClientExec.java:272)
at
org.apache.http.impl.execchain.ProtocolExec.execute(ProtocolExec.java:185)
at org.apache.http.impl.execchain.RetryExec.execute(RetryExec.java:89)
... 10 more
Suppressed: java.net.SocketException: Broken pipe (Write failed)
at java.base/java.net.SocketOutputStream.socketWrite0(Native
Method)
at
java.base/java.net.SocketOutputStream.socketWrite(SocketOutputStream.java:110)
at

Re: Tagging 10.0.x, 9.0.x, 8.5.x

[Violeta Georgieva]

На ср, 4.03.2020 г. в 14:25 Martin Tzvetanov Grigorov 
написа:
>
> The SCI regression seems to affect some users of 7.0.x. And staying with
7.0.99 is not a good option because of CVE-2020-1938.
>
> @Violeta: will you have time to cut 7.0.101 after the new releases of
10.0.x, 9.0.x and 8.5.x ?

Yep I can do that

Regards,
Violeta

> Martin
>
> On 2020/02/28 20:30:50, Mark Thomas  wrote:
> > Just a heads up that I'm aiming to do this early next week.
> >
> > Mark
> >
> > -
> > 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

Re: Tagging 10.0.x, 9.0.x, 8.5.x

[Martin Tzvetanov Grigorov]

The SCI regression seems to affect some users of 7.0.x. And staying with 7.0.99 
is not a good option because of CVE-2020-1938.

@Violeta: will you have time to cut 7.0.101 after the new releases of 10.0.x, 
9.0.x and 8.5.x ?

Martin

On 2020/02/28 20:30:50, Mark Thomas  wrote: 
> Just a heads up that I'm aiming to do this early next week.
> 
> Mark
> 
> -
> 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

[Bug 64194] POST requests with large bodies fail sporadically since change to read and write for NIO

[bugzilla]

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

--- Comment #2 from sebastian.r...@sap.com ---
It sounds similar, but according to Chome dev tools our requests are using
HTTP/1.1.

-- 
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 64194] POST requests with large bodies fail sporadically since change to read and write for NIO

[bugzilla]

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

--- Comment #1 from mgrigorov  ---
Related to (duplicate?!) https://bz.apache.org/bugzilla/show_bug.cgi?id=64192 ?

-- 
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 64194] POST requests with large bodies fail sporadically since change to read and write for NIO

[bugzilla]

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

sebastian.r...@sap.com changed:

   What|Removed |Added

 CC||r...@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 64194] New: POST requests with large bodies fail sporadically since change to read and write for NIO

[bugzilla]

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

Bug ID: 64194
   Summary: POST requests with large bodies fail sporadically
since change to read and write for NIO
   Product: Tomcat 9
   Version: 9.0.31
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Util
  Assignee: dev@tomcat.apache.org
  Reporter: sebastian.r...@sap.com
  Target Milestone: -

Created attachment 37057
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=37057=edit
stacktrace

We run our Jenkins (2.204.3) inside tomcat 9.0.x using a more-or-less default
tomcat configuration:







We use Sapmachine 11.0.5 as JDK.


After upgrading from 9.0.30 to 9.0.31, many POST requests with a large request
body fail (see attached stacktrace.txt).


I git-bisected the problem between 9.0.30 and 9.0.31:

5bdd7d4712fac4e1af47421c3600b18fabc22ed6 is the first bad commit
commit 5bdd7d4712fac4e1af47421c3600b18fabc22ed6
Author: remm 
Date:   Mon Dec 9 15:15:00 2019 +0100

Simplify blocking read and write for NIO

This does not remove or cleanup any of the code that is now unused
(NioSelectorPool, NioBlockingSlector, channel flush method, fields,
etc), it will be done after actual review.
I do not see any negative performance impact. Note: for performance
testing, use HTTP/1.1 (avoiding sendfile).

:04 04 aedcc7bbeb0c0c18a989bea5911e71388733d824
423e2f52c347542a402c8c084e18ae84daca1c11 M  java
:04 04 ef36ef5dd46aea9673999788a9178b50e7dceb29
d2ade377eac7f26968bd51c24113051a68bb8875 M  webapps


This also fits the stack trace elements
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1639)
at
org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)

Depending on the network connection I am on (direct, VPN, ...) the problem
occurs more or less often.

-- 
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 64192] Bug in Tomcat HTTP2 POST - with big payload

[bugzilla]

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

--- Comment #6 from Mark Thomas  ---
I think I have got to the bottom of this.

It relates to reading HTTP/2 frames using asyncIO over TLS.

TLS sometimes needs to decrypt more data that the caller requests. This is
because data is decrypted in 'blocks' and the call may only have requested part
of the next block.

This excess data is placed in the read buffer so it is available for the next
read.

HTTP/2 async reads HTTP/2 frames using a gathering read. It uses one ByteBuffer
for the 9 byte header and another for the frame payload. At this point the size
of the frame payload is unknown so a bufter is used that is big enough for the
largest frame.

It is possible that more data is read into the payload buffer than is required.
This excess data is returned to the read buffer so it is available for the next
read.

The problem is that we have two components writing to the read buffer and the
code that returns this data assumes the read buffer is empty.

Consider the following (thinking purely in terms of decrypted data):
- There are 4 TLS "blocks" (A, B, C and D) of data in the socket input buffer
- HTTP/2 async triggers a read
- The payload buffer is big enough to hold all of blocks A and B and half of
block C (C1)
- The other half of C (C2) is placed into the read buffer
- The HTTP/2 parser only needed block A so block B and C1 are returned to the
read buffer
- The order of data in the read buffer is now "C2, B, C1". It should be "B, C1,
C2"

In this instance, "B C1" is a single byte - hence why it looked like an
off-by-one error. But it isn't.

Returning the correct number of bytes for the TLS read is a separate issue.

It is also the case that, if the TLS code puts some data into the read buffer,
it will try and put as much as possible into the read buffer. I think this
needs to change else there is a risk that the amount of data returned by the
HTTP/2 parser will be in excess of the space available in the read buffer.

I'm working on a fix. I need to be careful as fixing one of these issues may be
sufficient to mask the others and I want to try and avoid that.

-- 
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

[buildbot]

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/85

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] b144651beeda3ff7a3debbe2b1d5ba1edc8d4a3a
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 64192] Bug in Tomcat HTTP2 POST - with big payload

[bugzilla]

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

--- Comment #5 from Remy Maucherat  ---
(In reply to Mark Thomas from comment #4)
> There is a bug there (in the number of bytes returned) but not the root
> cause of this issue. I have a quick fix for SecureNioChannel that I'll look
> at refining once I've tracked down the root cause.

I added a test, and I cannot reproduce the discrepancy SecureNioChannel.read
using it (the read count returned matches the amount of data that is added into
the buffers). My test also fails to reproduce the POST issue described so far,
despite appearing identical. I do get some flow control errors though (non
async, mostly). So not a very good result so far ...

-- 
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 master updated: Hack in TLS support for HTTP/2 tests

[remm]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new c2b3c47  Hack in TLS support for HTTP/2 tests
c2b3c47 is described below

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

Hack in TLS support for HTTP/2 tests

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

diff --git a/test/org/apache/coyote/http2/Http2TestBase.java 
b/test/org/apache/coyote/http2/Http2TestBase.java
index 2afeb92..f622569 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -55,6 +55,7 @@ import org.apache.tomcat.util.codec.binary.Base64;
 import org.apache.tomcat.util.compat.JrePlatform;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
 import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.net.TesterSupport;
 
 /**
  * Tests for compliance with the https://tools.ietf.org/html/rfc7540;>
@@ -112,9 +113,13 @@ public abstract class Http2TestBase extends TomcatBaseTest 
{
  * that the first response is correctly received.
  */
 protected void http2Connect() throws Exception {
-enableHttp2();
+http2Connect(false);
+}
+
+protected void http2Connect(boolean tls) throws Exception {
+enableHttp2(tls);
 configureAndStartWebApplication();
-openClientConnection();
+openClientConnection(tls);
 doHttpUpgrade();
 sendClientPreface();
 validateHttp2InitialResponse();
@@ -547,8 +552,17 @@ public abstract class Http2TestBase extends TomcatBaseTest 
{
 }
 
 protected void enableHttp2(long maxConcurrentStreams) {
-Connector connector = getTomcatInstance().getConnector();
-http2Protocol = new Http2Protocol();
+enableHttp2(maxConcurrentStreams, false);
+}
+
+protected void enableHttp2(boolean tls) {
+enableHttp2(200, tls);
+}
+
+protected void enableHttp2(long maxConcurrentStreams, boolean tls) {
+Tomcat tomcat = getTomcatInstance();
+Connector connector = tomcat.getConnector();
+http2Protocol = new UpgradableHttp2Protocol();
 // Short timeouts for now. May need to increase these for CI systems.
 http2Protocol.setReadTimeout(6000);
 http2Protocol.setWriteTimeout(6000);
@@ -558,8 +572,18 @@ public abstract class Http2TestBase extends TomcatBaseTest 
{
 http2Protocol.setMaxConcurrentStreams(maxConcurrentStreams);
 http2Protocol.setHttp11Protocol(new Http11NioProtocol());
 connector.addUpgradeProtocol(http2Protocol);
+if (tls) {
+// Enable TLS
+TesterSupport.initSsl(tomcat);
+}
 }
 
+private class UpgradableHttp2Protocol extends Http2Protocol {
+@Override
+public String getHttpUpgradeName(boolean isSSLEnabled) {
+return "h2c";
+}
+}
 
 protected void configureAndStartWebApplication() throws LifecycleException 
{
 Tomcat tomcat = getTomcatInstance();
@@ -581,8 +605,13 @@ public abstract class Http2TestBase extends TomcatBaseTest 
{
 
 
 protected void openClientConnection() throws IOException {
+openClientConnection(false);
+}
+
+protected void openClientConnection(boolean tls) throws IOException {
+SocketFactory socketFactory = tls ? TesterSupport.configureClientSsl() 
: SocketFactory.getDefault();
 // Open a connection
-s = SocketFactory.getDefault().createSocket("localhost", getPort());
+s = socketFactory.createSocket("localhost", getPort());
 s.setSoTimeout(3);
 
 os = s.getOutputStream();
@@ -619,6 +648,9 @@ public abstract class Http2TestBase extends TomcatBaseTest {
 
 boolean readHttpUpgradeResponse() throws IOException {
 String[] responseHeaders = readHttpResponseHeaders();
+for (String header : responseHeaders) {
+System.out.println("HEADER: " + header);
+}
 
 if (responseHeaders.length < 3) {
 return false;
diff --git a/test/org/apache/coyote/http2/TestLargeUpload.java 
b/test/org/apache/coyote/http2/TestLargeUpload.java
new file mode 100644
index 000..1e657af
--- /dev/null
+++ b/test/org/apache/coyote/http2/TestLargeUpload.java
@@ -0,0 +1,112 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for 

[tomcat] branch 9.0.x updated: Note additional property required by listener

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new b144651  Note additional property required by listener
b144651 is described below

commit b144651beeda3ff7a3debbe2b1d5ba1edc8d4a3a
Author: Mark Thomas 
AuthorDate: Wed Mar 4 11:00:21 2020 +

Note additional property required by listener

Required because the default value used by the listener if the property
is not set is "true".
---
 webapps/docs/changelog.xml| 11 +++
 webapps/docs/config/listeners.xml |  6 --
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8c3b31e..116d0fa 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -163,6 +163,17 @@
   
 
   
+  
+
+  
+Add to the documentation for the 
JmxRemoteLifecycleListener
+the requirement to use
+-Dcom.sun.management.jmxremote.registry.ssl=false if TLS 
is
+not being used else clients will be unable to connect to the JMX 
server.
+(markt)
+  
+
+  
   
 
   
diff --git a/webapps/docs/config/listeners.xml 
b/webapps/docs/config/listeners.xml
index 25828d8..f37dbaf 100644
--- a/webapps/docs/config/listeners.xml
+++ b/webapps/docs/config/listeners.xml
@@ -649,7 +649,8 @@
 with the following system properties set (e.g. in setenv.sh):
 
-Dcom.sun.management.jmxremote.password.file=$CATALINA_BASE/conf/jmxremote.password
   
-Dcom.sun.management.jmxremote.access.file=$CATALINA_BASE/conf/jmxremote.access
-  -Dcom.sun.management.jmxremote.ssl=false
+  -Dcom.sun.management.jmxremote.ssl=false
+  -Dcom.sun.management.jmxremote.registry.ssl=false
 $CATALINA_BASE/conf/jmxremote.password containing:
   admin letmein
 $CATALINA_BASE/conf/jmxremote.access containing:
@@ -685,7 +686,8 @@
 -Dcom.sun.management.jmxremote.login.config=Tomcat
   -Djava.security.auth.login.config=$CATALINA_BASE/conf/login.config
   
-Dcom.sun.management.jmxremote.access.file=$CATALINA_BASE/conf/jmxremote.access
-  -Dcom.sun.management.jmxremote.ssl=false
+  -Dcom.sun.management.jmxremote.ssl=false
+  -Dcom.sun.management.jmxremote.registry.ssl=false
 $CATALINA_BASE/conf/login.config containing your choice of JAAS 
LoginModule implementation, for example:
 Tomcat { /* should match to the 
com.sun.management.jmxremote.login.config property */
 


-
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

[buildbot]

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/84

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] 9f86303a59ca8c11c71884947e1cff0c2094d19a
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: Trouble building and running Tomcat 10 unit tests

[Martin Grigorov]

Hi Chris,

Travis CI (ARM64 tests) uses Ant 1.10.7 and OpenJDK 8 b232 and the build
passes fine: https://travis-ci.org/apache/tomcat/jobs/65889/config
On my VM I use Ant 1.9.14 and OpenJDK 8 b242 and again everything is green.
BuildBot is also stable: https://ci.apache.org/builders/tomcat-trunk


Martin

On Tue, Mar 3, 2020 at 10:31 PM Christopher Schultz <
ch...@christopherschultz.net> wrote:

> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
>
> All,
>
> I'm up-to-date with git master, using ant 1.9.13, JDK 13.
>
> $ ant test
>
> [...]
>
> test-compile:
> [javac] Compiling 1 source file to
> /Users/christopherschultz/git/tomcat-trunk/output/testclasses
> [javac] Ignoring source, target and bootclasspath as release has
> been set
> [javac]
> /Users/christopherschultz/git/tomcat-trunk/test/org/apache/catalina/ant/
> TestDeployTask.java:37:
> error: cannot access BuildException
> [javac] public void execute(String command,
> InputStream istream, String contentType, long contentLength)
> [javac] ^
> [javac]   class file for BuildException not found
> [javac] 1 error
>
> Ant has this class. Not sure why it can't access it. Okay, fine, I'll
> just delete the file and move on:
>
> $ rm test/org/apache/catalina/ant/TestDeployTask.java
> $ ant test
>
> [...]
>
> add-osgi:
>  [echo] add-osgi
> /Users/christopherschultz/git/tomcat-trunk/output/build/lib/catalina.jar
> true
>   [bndwrap] 1 ERRORS
>   [bndwrap]  The default package '.' is not permitted by the
> Import-Package syntax.
>   [bndwrap]  This can be caused by compile errors in Eclipse because
> Eclipse creates
>   [bndwrap] valid class files regardless of compile errors.
>   [bndwrap] The following package(s) import from the default package
> [org.apache.naming.factory.webservices, org.apache.catalina.startup]
>
> BUILD FAILED
> /Users/christopherschultz/git/tomcat-trunk/build.xml:852: The
> following error occurred while executing this line:
> /Users/christopherschultz/git/tomcat-trunk/build.xml:3372: The
> following error occurred while executing this line:
> /Users/christopherschultz/git/tomcat-trunk/build.xml:3381: Failed to
> wrap jar file
>
> Downgrading to Java 8 (as per Tomcat 10 build instructions) yields the
> same result.
>
> What am I missing?
>
> Thanks,
> - -chris
> -BEGIN PGP SIGNATURE-
> Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl5evpsACgkQHPApP6U8
> pFiGcRAAkaGS2G+/DCXQbByimPYmCWbWWtq3pZPICjW4CpZA12Gx03Kr9Jo5jJTe
> 3ygSN8WxZTkfArtrcg0bop44FuYJZU7owPbP5ppDt38q7R3bI0einB+KKTsBuu4l
> tsfDipRV6ItzjbIY/UJNJho4/go0vaIcmkQU8KtQf5CI/zZiDWJq1RkQmxSQkc0r
> hMWy2YLAigsSikR1Aah8fOn8WICNEKYOylsUmFVr119Ps6SgkYQ+Vq0+UGSo1UWW
> +yP6hhCqJaK/WIyJBr3n4As8QRzZ9w+n+H6BZmUiH+iQMgURYkTvicTqkcewFOPE
> r6lh5AGDYKJiGRtA8k0uqweOT1mwtIEN7T2OeDG4axXAIVeW5PSAT6O5ZibWRL7p
> ZDITx8ZpZpNvzixOaGm1Nqy7xzd5c/vXwyckvM/phZp/UnLxnFYkZkjqtO14tYQc
> FcNjeBZjIJxP7lPhfLXpMRI1Lf5sQy1lnhZOg3dqVChJEWCabpz/wZscsUSV1LCa
> G05RbMj9JsrDo3Y9jI+9ixWy6t+C3HFGJ4WqayVwd+ErdDjanEIsUO48lTKwD+be
> iz07aP8LMUVSholwhu1kR1YsaWb6mL+Y3f5AeitCBnkiAW2ZvBSAX9knsAFkrhUq
> EkAm9brjvmz44QJ+eUdVJLEY1GXAIUt1rAELtdjt/n/3E1cdvPw=
> =N/et
> -END PGP SIGNATURE-
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[tomcat] branch master updated: Fix typo

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 8a4f01e  Fix typo
8a4f01e is described below

commit 8a4f01e62ade17f65ab7910c88f5b1d115a9606a
Author: Mark Thomas 
AuthorDate: Tue Mar 3 22:26:44 2020 +

Fix typo
---
 java/org/apache/coyote/http2/Http2AsyncParser.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2AsyncParser.java 
b/java/org/apache/coyote/http2/Http2AsyncParser.java
index 5267421..665b0f3 100644
--- a/java/org/apache/coyote/http2/Http2AsyncParser.java
+++ b/java/org/apache/coyote/http2/Http2AsyncParser.java
@@ -131,10 +131,10 @@ class Http2AsyncParser extends Http2Parser {
 throws IOException, Http2Exception {
 handleAsyncException();
 ByteBuffer header = ByteBuffer.allocate(9);
-ByteBuffer framePaylod = ByteBuffer.allocate(input.getMaxFrameSize());
-FrameCompletionHandler handler = new FrameCompletionHandler(expected, 
header, framePaylod);
+ByteBuffer framePayload = ByteBuffer.allocate(input.getMaxFrameSize());
+FrameCompletionHandler handler = new FrameCompletionHandler(expected, 
header, framePayload);
 CompletionState state =
-socketWrapper.read(block ? BlockingMode.BLOCK : 
BlockingMode.NON_BLOCK, socketWrapper.getReadTimeout(), TimeUnit.MILLISECONDS, 
null, handler, handler, header, framePaylod);
+socketWrapper.read(block ? BlockingMode.BLOCK : 
BlockingMode.NON_BLOCK, socketWrapper.getReadTimeout(), TimeUnit.MILLISECONDS, 
null, handler, handler, header, framePayload);
 if (state == CompletionState.ERROR || state == CompletionState.INLINE) 
{
 handleAsyncException();
 return true;


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

[tomcat] branch 9.0.x updated: Fix typo

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 9f86303  Fix typo
9f86303 is described below

commit 9f86303a59ca8c11c71884947e1cff0c2094d19a
Author: Mark Thomas 
AuthorDate: Tue Mar 3 22:26:44 2020 +

Fix typo
---
 java/org/apache/coyote/http2/Http2AsyncParser.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2AsyncParser.java 
b/java/org/apache/coyote/http2/Http2AsyncParser.java
index 827105a..5b1af5b 100644
--- a/java/org/apache/coyote/http2/Http2AsyncParser.java
+++ b/java/org/apache/coyote/http2/Http2AsyncParser.java
@@ -131,10 +131,10 @@ class Http2AsyncParser extends Http2Parser {
 throws IOException, Http2Exception {
 handleAsyncException();
 ByteBuffer header = ByteBuffer.allocate(9);
-ByteBuffer framePaylod = ByteBuffer.allocate(input.getMaxFrameSize());
-FrameCompletionHandler handler = new FrameCompletionHandler(expected, 
header, framePaylod);
+ByteBuffer framePayload = ByteBuffer.allocate(input.getMaxFrameSize());
+FrameCompletionHandler handler = new FrameCompletionHandler(expected, 
header, framePayload);
 CompletionState state =
-socketWrapper.read(block ? BlockingMode.BLOCK : 
BlockingMode.NON_BLOCK, socketWrapper.getReadTimeout(), TimeUnit.MILLISECONDS, 
null, handler, handler, header, framePaylod);
+socketWrapper.read(block ? BlockingMode.BLOCK : 
BlockingMode.NON_BLOCK, socketWrapper.getReadTimeout(), TimeUnit.MILLISECONDS, 
null, handler, handler, header, framePayload);
 if (state == CompletionState.ERROR || state == CompletionState.INLINE) 
{
 handleAsyncException();
 return true;


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

[Bug 64097] Service loader implementation incomplete

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|WONTFIX |FIXED

--- Comment #6 from Mark Thomas  ---
Restore the correct resolution. If you have questions, please use the users
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

[GitHub] [tomcat] lkirchev opened a new pull request #252: 8.5.x

[GitBox]

lkirchev opened a new pull request #252: 8.5.x
URL: https://github.com/apache/tomcat/pull/252
 
 
   Provide means for the cookie header generation to make decisions based on 
properties of the request. 


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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

[Bug 64097] Service loader implementation incomplete

[bugzilla]

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

Josh V  changed:

   What|Removed |Added

 Resolution|FIXED   |WONTFIX

--- Comment #5 from Josh V  ---
(In reply to Peer Heijnen from comment #4)
> You are absolutely right. Thanks for your quick and correct analysis!
> 
> Problem was caused by the depedency of the Maven plugin on an older Tomcat
> version. Fixed by updating its dependency.

May I ask exactly what you changed? I am getting a similar issue and cannot
find a maven plugin in my project with a tomcat dependency. Thanks!

-- 
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 64191] Applications not working with 7.0.100

[bugzilla]

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

--- Comment #6 from thomas.w...@gfk.com ---
(In reply to Mark Thomas from comment #5)
> I uploaded a build here:
> http://people.apache.org/~markt/dev/v7.0.101-dev/
> 
> This isn't an official release. It is just for testing purposes.

This seems to work - so I guess you fixed it.
Do you have a clue, if this would be released quickly (I guess I'm not the only
one, which have this issue)

-- 
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