[Bug 60875] Process Request null pointer exception.

2017-03-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60875

--- Comment #4 from Aaron  ---
The problem never happen in test case. I have two servers deployed with same
war. One never produce this problem. But the other one produce this sometimes.
I wonder why this problem happen, because requests are processed in controller.
What cause of difference in two servers. thx!

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

[GUMP@vmgump-vm3]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed

2017-03-21 Thread 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-tc8.0.x-test-nio2 has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 2 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-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 commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 mins
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs 
-Dexecute.test.nio2=true -Dtest.temp=output/test-tmp-NIO2 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dtest.accesslog=true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170322.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20170322/bin/openssl
 -Dexecute.test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170322-native-src.tar.gz
 -Dtest.repor
 ts=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170322-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.0.x/true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja

[Bug 60900] org.apache.tomcat.util.net.AprEndpoint$Poller.run throws java.lang.NullPointerException

2017-03-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60900

--- Comment #1 from linbo  ---
The similar bug https://bz.apache.org/bugzilla/show_bug.cgi?id=54513

-- 
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 60900] New: org.apache.tomcat.util.net.AprEndpoint$Poller.run throws java.lang.NullPointerException

2017-03-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60900

Bug ID: 60900
   Summary: org.apache.tomcat.util.net.AprEndpoint$Poller.run
throws java.lang.NullPointerException
   Product: Tomcat 8
   Version: 8.5.11
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: llbg...@gmail.com
  Target Milestone: 

Created attachment 34866
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=34866=edit
server.xml configure file

Environment:

OS: Red Hat Enterprise Linux Server release 6.7  2.6.32-573.el6.x86_64
JDK: version "1.8.0_65" Java HotSpot(TM) 64-Bit Server VM
Memory: 16G
CPU: 1
Tomcat:  tested 8.5.3 and 8.5.11
APR: 1.5.2-1


Test step:

1. Install tomcat
2. Test home page

./wrk -t2000 -c 2000 -d 100s http://testhost:8080/


Exception throws in catalina.log:

22-Mar-2017 09:09:04.344 WARNING [http-apr-8080-Poller]
org.apache.tomcat.util.net.AprEndpoint$Poller.run Unexpected poller error
 java.lang.NullPointerException
at
org.apache.tomcat.util.net.AprEndpoint$AprSocketWrapper.access$400(AprEndpoint.java:2292)
at
org.apache.tomcat.util.net.AprEndpoint$Poller.run(AprEndpoint.java:1703)
at java.lang.Thread.run(Thread.java:745)

-- 
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 60875] Process Request null pointer exception.

2017-03-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60875

--- Comment #3 from Mark Thomas  ---
Can you provide a simple test case that demonstrates this problem?

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

svn commit: r1788034 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java

2017-03-21 Thread markt 
Author: markt
Date: Tue Mar 21 23:13:11 2017
New Revision: 1788034

URL: http://svn.apache.org/viewvc?rev=1788034=rev
Log:
Trivial commit to test CI system

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1788034=1788033=1788034=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
Tue Mar 21 23:13:11 2017
@@ -14,11 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.ant;
 
-
 import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -32,21 +29,18 @@ import org.apache.tomcat.util.codec.bina
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 
-
 /**
- * Abstract base class for Ant tasks that interact with the
- * Manager web application for dynamically deploying and
- * undeploying applications.  These tasks require Ant 1.4 or later.
+ * Abstract base class for Ant tasks that interact with the Manager 
web
+ * application for dynamically deploying and undeploying applications. These
+ * tasks require Ant 1.4 or later.
  *
  * @author Craig R. McClanahan
  * @since 4.1
  */
 public abstract class AbstractCatalinaTask extends BaseRedirectorHelperTask {
 
-
 // - Instance Variables
 
-
 /**
  * manager webapp's encoding.
  */
@@ -55,56 +49,52 @@ public abstract class AbstractCatalinaTa
 
 // - Properties
 
-
 /**
  * The charset used during URL encoding.
  */
 protected String charset = "ISO-8859-1";
 
 public String getCharset() {
-return (this.charset);
+return this.charset;
 }
 
 public void setCharset(String charset) {
 this.charset = charset;
 }
 
-
 /**
  * The login password for the Manager application.
  */
 protected String password = null;
 
 public String getPassword() {
-return (this.password);
+return this.password;
 }
 
 public void setPassword(String password) {
 this.password = password;
 }
 
-
 /**
  * The URL of the Manager application to be used.
  */
 protected String url = "http://localhost:8080/manager/text;;
 
 public String getUrl() {
-return (this.url);
+return this.url;
 }
 
 public void setUrl(String url) {
 this.url = url;
 }
 
-
 /**
  * The login username for the Manager application.
  */
 protected String username = null;
 
 public String getUsername() {
-return (this.username);
+return this.username;
 }
 
 public void setUsername(String username) {
@@ -116,9 +106,9 @@ public abstract class AbstractCatalinaTa
  * message that must be "OK -".
  * 
  * When this attribute is set to {@code false} (the default), the first 
line
- * of server response is expected to start with "OK -". If it does not
- * then the task is considered as failed and the first line is treated
- * as an error message.
+ * of server response is expected to start with "OK -". If it does not then
+ * the task is considered as failed and the first line is treated as an
+ * error message.
  * 
  * When this attribute is set to {@code true}, the first line of the
  * response is treated like any other, regardless of its text.
@@ -136,28 +126,21 @@ public abstract class AbstractCatalinaTa
 
 // - Public Methods
 
-
 /**
- * Execute the specified command.  This logic only performs the common
- * attribute validation required by all subclasses; it does not perform
- * any functional logic directly.
+ * Execute the specified command. This logic only performs the common
+ * attribute validation required by all subclasses; it does not perform any
+ * functional logic directly.
  *
  * @exception BuildException if a validation error occurs
  */
 @Override
 public void execute() throws BuildException {
-
 if ((username == null) || (password == null) || (url == null)) {
-throw new BuildException
-("Must specify all of 'username', 'password', and 'url'");
+throw new BuildException("Must specify all of 'username', 
'password', and 'url'");
 }
-
 }
 
 
-// -- Protected Methods
-
-
 /**
  * Execute the

[Bug 60892] Ability to remove Tomcat cache (work dir)

2017-03-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60892

Mark Thomas  changed:

   What|Removed |Added

   Severity|normal  |enhancement

--- Comment #1 from Mark Thomas  ---
The work directory contains:
- class files (and possible java files) for JSP pages
- serialized sessions that were active on shutdown

The work directory is removed automatically when a web application is
undeployed.

The work directory is not removed when Tomcat is shutdown.

If the work directory were removed on shutdown it would:
- break the default session persistence across restarts
- slow first access to JSPs as each would need to be re-compiled

Given that the work directory is removed on undeployment (if you have an issue
with locked files that is a different problem) and that removing the work
directory on shutdown breaks stuff, I'm leaning towards resolving this as
WONTFIX. However, I'll leave it open for now in case there are points I have
missed.

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

svn commit: r1788031 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java

2017-03-21 Thread markt 
Author: markt
Date: Tue Mar 21 22:58:17 2017
New Revision: 1788031

URL: http://svn.apache.org/viewvc?rev=1788031=rev
Log:
Trivial commit to test CI system

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java?rev=1788031=1788030=1788031=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java
 Tue Mar 21 22:58:17 2017
@@ -21,8 +21,7 @@ import java.net.URLEncoder;
 
 import org.apache.tools.ant.BuildException;
 
-public abstract class AbstractCatalinaCommandTask extends
-AbstractCatalinaTask {
+public abstract class AbstractCatalinaCommandTask extends AbstractCatalinaTask 
{
 
 /**
  * The context path of the web application we are managing.
@@ -30,7 +29,7 @@ public abstract class AbstractCatalinaCo
 protected String path = null;
 
 public String getPath() {
-return (this.path);
+return this.path;
 }
 
 public void setPath(String path) {
@@ -43,13 +42,14 @@ public abstract class AbstractCatalinaCo
 protected String version = null;
 
 public String getVersion() {
-return (this.version);
+return this.version;
 }
 
 public void setVersion(String version) {
 this.version = version;
 }
 
+
 // - Public Methods
 
 /**
@@ -77,10 +77,8 @@ public abstract class AbstractCatalinaCo
 }
 }
 } catch (UnsupportedEncodingException e) {
-throw new BuildException
-("Invalid 'charset' attribute: " + getCharset());
+throw new BuildException("Invalid 'charset' attribute: " + 
getCharset());
 }
 return buffer;
 }
-
 }
\ No newline at end of file



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

buildbot success in on tomcat-trunk

2017-03-21 Thread buildbot 
The Buildbot has detected a restored build on builder tomcat-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/2192

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1788030
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1788030 - /tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java

2017-03-21 Thread markt 
Author: markt
Date: Tue Mar 21 22:41:10 2017
New Revision: 1788030

URL: http://svn.apache.org/viewvc?rev=1788030=rev
Log:
Trivial commit to test CI system

Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java?rev=1788030=1788029=1788030=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaCommandTask.java 
Tue Mar 21 22:41:10 2017
@@ -21,8 +21,7 @@ import java.net.URLEncoder;
 
 import org.apache.tools.ant.BuildException;
 
-public abstract class AbstractCatalinaCommandTask extends
-AbstractCatalinaTask {
+public abstract class AbstractCatalinaCommandTask extends AbstractCatalinaTask 
{
 
 /**
  * The context path of the web application we are managing.



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

[GUMP@vmgump-vm3]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed

2017-03-21 Thread 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-tc8.0.x-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-tc8.0.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-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 commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 mins 18 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs 
-Dexecute.test.nio2=true -Dtest.temp=output/test-tmp-NIO2 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dtest.accesslog=true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170321.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20170321/bin/openssl
 -Dexecute.test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170321-native-src.tar.gz
 -Dtest.repor
 ts=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170321-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.0.x/true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x

[Bug 60897] jasper compiling jsp fails error: code too large for try statement

2017-03-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60897

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #2 from Mark Thomas  ---
It has been fixed as much as we reasonably can. We had to add additional error
handling and that plumbing reduced the space available for user code.

-- 
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: Question about r1780601

2017-03-21 Thread Rémy Maucherat 
2017-03-21 17:45 GMT+01:00 Violeta Georgieva :

> Hi,
>
> I was checking some back ports related to bug 60897.
> This [1] was not back ported to the older versions.
> Do we really want it only for Tomcat 9?
>

It can now be backported since nobody complained about it, although it will
increase code size, causing more reports like the BZ. I broke things once
with the fix, hence no new backport.

Rémy

>
> Regards,
> Violeta
>
> [1] https://svn.apache.org/viewvc?view=revision=1780601
>

Question about r1780601

2017-03-21 Thread Violeta Georgieva 
Hi,

I was checking some back ports related to bug 60897.
This [1] was not back ported to the older versions.
Do we really want it only for Tomcat 9?

Regards,
Violeta

[1] https://svn.apache.org/viewvc?view=revision=1780601

buildbot exception in on tomcat-7-trunk

2017-03-21 Thread buildbot 
The Buildbot has detected a build exception on builder tomcat-7-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/697

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1787999
Blamelist: violetagg

BUILD FAILED: exception compile upload_2

Sincerely,
 -The Buildbot




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

svn commit: r1787999 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

2017-03-21 Thread violetagg 
Author: violetagg
Date: Tue Mar 21 16:40:09 2017
New Revision: 1787999

URL: http://svn.apache.org/viewvc?rev=1787999=rev
Log:
Move the changelog for r1781602 to the correct Tomcat version.

Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1787999=1787998=1787999=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 21 16:40:09 2017
@@ -136,6 +136,14 @@
   
 
   
+  
+
+  
+Refactor code generated for JSPs to reduce the size of the code 
required
+for tags. (markt)
+  
+
+  
   
 
   
@@ -330,10 +338,6 @@
   
 Revert use of try/finally for simple tags. (remm)
   
-  
-Refactor code generated for JSPs to reduce the size of the code 
required
-for tags. (markt)
-  
 
   
   



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

[Bug 60897] jasper compiling jsp fails error: code too large for try statement

2017-03-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60897

--- Comment #1 from mgrigorov  ---
I believe this has been fixed recently.
Please try with the latest release (7.0.76)

-- 
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: Read events suspend/resume logic in websocket impl to achieve backpressure

2017-03-21 Thread Rémy Maucherat 
2017-03-20 15:41 GMT+01:00 Violeta Georgieva :

> Hi,
>
> 2017-02-27 16:50 GMT+02:00 Mark Thomas :
> >
> > On 27/02/17 11:55, Violeta Georgieva wrote:
> >
> > 
> >
> > >> A new patch is available based on the provided comments.
> > >> Can you please review it.
> > >
> > > Any feedback for the latest changes
> >
> > Sorry for the delay.
> >
> > On a minor/style point, I'd prefer SUSPENDED rather than READ_SUSPENDED
> > since the socket won't be eligible for read or write.
>
> Ok
>
> > Thinking some more about that, could that cause problems? Does the patch
> > need to ensure write operations aren't attempted? Non-blocking writes
> > should be OK but a blocking write would be problematic.
>
> I was thinking something
> around org.apache.tomcat.websocket.WsRemoteEndpointBasic.send* methods.
> If the reading is suspended then these methods will do nothing and log
> error.
> What do you think?
>
> > I think there is still a timing / concurrency issue around resume().
> > Consider the following sequence:
> > - incoming message is being processed in WsFrameServer
> > - suspend() is called on another thread
> > - while loop ends and onDataAvailable returns
> > - resume() is called on another thread
> > - then WsHttpUpgradeHandler checks if the thread is suspended
> >
> > The problem is between onDataAvailable returning and
> > WsHttpUpgradeHandler checking if the thread is suspended. If resume() is
> > called and processed during that admittedly narrow gap, the socket will
> > end up in the Poller twice which - from past experience - will cause
> > problems.
>
> I fixed that. The PR https://github.com/apache/tomcat/pull/42 is updated.
>
> A long time ago there were two extensions proposed for the "comet" API
(still in the wiki somehow: https://wiki.apache.org/tomcat/WhatIsComet ).
As part of them was suspend/resume which do exactly what you propose:
suspend read events for a while. While the Servlet API additions also looks
very similar, it decided to be less flexible and in particular there's no
suspend/resume (conceptually with the Servlet API, you'd have to unset the
listeners which isn't allowed).

So, having looked at the history, it's hard for me to really complain about
this being added.

Rémy

[Bug 60897] jasper compiling jsp fails error: code too large for try statement

2017-03-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60897

jenner.toq...@parexel.com changed:

   What|Removed |Added

   Priority|P2  |P3

-- 
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 60897] New: jasper compiling jsp fails error: code too large for try statement

2017-03-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60897

Bug ID: 60897
   Summary: jasper compiling jsp fails error: code too large for
try statement
   Product: Tomcat 7
   Version: 7.0.75
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: jenner.toq...@parexel.com
  Target Milestone: ---

compiling a particular jsp fails with tomcat 7.0.75 with error: code too large
for try statement
[javac] try {

This is successful in 7.0.70, 7.0.72, 7.0.73.

-- 
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: Host header validation

2017-03-21 Thread Mark Thomas 
On 21 March 2017 14:14:19 GMT+00:00, Christopher Schultz 
 wrote:
>Mark,
>
>On 3/19/17 4:55 PM, Mark Thomas wrote:
>> Hi,
>> 
>> r1787662 adds Host header validation along with a fair number of
>> unit tests.
>> 
>> It includes a performance test which indicates - on my machine at
>> least - that the performance impact is in the noise. I'd like to
>> see better performance for full IPv6 addresses but the current code
>> looks to be acceptable.
>> 
>> The validation is not yet integrated into the request processing.
>> My primary reason for not integrating it is that it will trigger a
>> 400 response if the header is invalid and I don't want to
>> incorrectly reject valid headers. Therefore I have a request.
>> Please try and break these new parsers. Please commit any values
>> you test with.
>> 
>> Once we are happy with the quality of these parsers, I'll integrate
>> them into the request processing.
>
>How about an option to disable the validity-checking, in case someone
>in the field finds a case they need to support, or if they don't care
>about hostname-checking and want their "performance back"?

I'm not too concerned about performance. The checks are at most 1% of the 
current processing time for a trivial servlet accessed over localhost. For real 
use cases it will be less.

Some form of transition could work (eg log only) but I'm reluctant to an an 
option that effectively bypasses spec compliance.

Mark

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

buildbot failure in on tomcat-trunk

2017-03-21 Thread buildbot 
The Buildbot has detected a new failure on builder tomcat-trunk while building 
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/2191

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1787973
Blamelist: markt

BUILD FAILED: failed shell_7

Sincerely,
 -The Buildbot




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

Re: Host header validation

2017-03-21 Thread Christopher Schultz 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 3/19/17 4:55 PM, Mark Thomas wrote:
> Hi,
> 
> r1787662 adds Host header validation along with a fair number of
> unit tests.
> 
> It includes a performance test which indicates - on my machine at
> least - that the performance impact is in the noise. I'd like to
> see better performance for full IPv6 addresses but the current code
> looks to be acceptable.
> 
> The validation is not yet integrated into the request processing.
> My primary reason for not integrating it is that it will trigger a
> 400 response if the header is invalid and I don't want to
> incorrectly reject valid headers. Therefore I have a request.
> Please try and break these new parsers. Please commit any values
> you test with.
> 
> Once we are happy with the quality of these parsers, I'll integrate
> them into the request processing.

How about an option to disable the validity-checking, in case someone
in the field finds a case they need to support, or if they don't care
about hostname-checking and want their "performance back"?

- -chris
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBCAAGBQJY0TU7AAoJEBzwKT+lPKRYK+cP/jVu+waZHfEL7s8LrTwC8+v/
+5le9Lo8vM9T5zSAYl/xbNuOx0uVkFAz1lVMxL0Jy2pG/HhntdBRmcAyP8Ms2/Ci
bdqRYtKb+ZrTZNQkFKjmKrZYOrB/IgwzTrGLQ0JewbKOd7doHtN3gsa2ekzQ5h7l
D9D6w6tflVzlByPgJLQ9VbqD5MxQsmxkaFBkSzfnpKYbzsXqrHF18R9p/234PLqD
hxUuHhPm39AtrfeNpXUcVLxUrcGbDlzeP9pUDxgZHM69Yi82cHdoCi65VCMysges
BCSnkbP2CBdkT2/aSfZa73RplOFT2XMk6OQOMSJv6SEXRdqS58A3m/Grnjj9LCX5
EtwYuy8q+Edd8JMPV6mOO980EaiQ4nha1HgrZa8Vsmbtn2xzp017lrYJPO19Cvoc
cGEiCvQVTlmtUhdPV1SdogBvIhHGpMORj7+eSRPlBmCopjzSIYfeWCoecWzyRKfj
6xZ/hSVH/IufbHolRBNWIcZWQI1Oo1VkuYLQ9xM26CcodYjFcQfm9JaD4ixCXhDW
81f4erOxGVkGRrrXVQwxJ1sdXyAbB5FHbdBj5CTSv8U3LnZK26Qk/e0PcvlXTaHm
CAhelcMpplkD78Dc5Chb38t3PZk41WfwRFF1km5+XhXxfGVokFhjDMNP5SuF+1EM
LkYsnfIDFyApXSyq27/S
=LRYA
-END PGP SIGNATURE-

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

svn commit: r1787973 - in /tomcat/trunk: java/org/apache/coyote/AbstractProtocol.java java/org/apache/tomcat/util/net/SSLHostConfig.java webapps/docs/changelog.xml

2017-03-21 Thread markt 
Author: markt
Date: Tue Mar 21 14:13:11 2017
New Revision: 1787973

URL: http://svn.apache.org/viewvc?rev=1787973=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60853
Expose the SSLHostConfig and SSLHostConfigCertificate objects via JMX.

Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1787973=1787972=1787973=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Tue Mar 21 
14:13:11 2017
@@ -19,6 +19,7 @@ package org.apache.coyote;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -42,6 +43,8 @@ import org.apache.tomcat.util.collection
 import org.apache.tomcat.util.modeler.Registry;
 import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.AbstractEndpoint.Handler;
+import org.apache.tomcat.util.net.SSLHostConfig;
+import org.apache.tomcat.util.net.SSLHostConfigCertificate;
 import org.apache.tomcat.util.net.SocketEvent;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 import org.apache.tomcat.util.res.StringManager;
@@ -74,6 +77,10 @@ public abstract class AbstractProtocol sslOnames = new HashSet<>();
+private Set sslCertOnames = new HashSet<>();
+
+
 /**
  * Unique ID for this connector. Only used if the connector is configured
  * to use a random port as the port will change if stop(), start() is
@@ -533,7 +540,7 @@ public abstract class AbstractProtocolhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1787973=1787972=1787973=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Tue Mar 21 
14:13:11 2017
@@ -128,6 +128,10 @@ public class SSLHostConfig implements Se
 }
 
 
+// Expose in String form for JMX
+public String getConfigType() {
+return configType.name();
+}
 public void setConfigType(Type configType) {
 this.configType = configType;
 if (configType == Type.EITHER) {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1787973=1787972=1787973=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 21 14:13:11 2017
@@ -65,6 +65,10 @@
 (markt)
   
   
+60853: Expose the SSLHostConfig and
+SSLHostConfigCertificate objects via JMX. (markt)
+  
+  
 60876: Ensure that Set-Cookie headers generated
 by the Rfc6265CookieProcessor are aligned with the
 specification. Patch provided by Jim Griswold. (markt)



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

[Bug 60853] MBeans require update for new TLS configuration

2017-03-21 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60853

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #2 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.0.M19 onwards
- 8.5.x for 8.5.13 onwards

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

svn commit: r1787974 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/AbstractProtocol.java java/org/apache/tomcat/util/net/SSLHostConfig.java webapps/docs/changelog.xml

2017-03-21 Thread markt 
Author: markt
Date: Tue Mar 21 14:16:45 2017
New Revision: 1787974

URL: http://svn.apache.org/viewvc?rev=1787974=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60853
Expose the SSLHostConfig and SSLHostConfigCertificate objects via JMX.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 21 14:16:45 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217

svn commit: r1787963 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http11/AbstractHttp11Protocol.java java/org/apache/tomcat/util/net/SSLHostConfig.java

2017-03-21 Thread markt 
Author: markt
Date: Tue Mar 21 13:14:38 2017
New Revision: 1787963

URL: http://svn.apache.org/viewvc?rev=1787963=rev
Log:
https://bz.apache.org/bugzilla/show_bug.cgi?id=60853
This is a partial fix. This restores read/write access to the deprecated 
attributes via JMX.
JMX access to the new objects is still TODO.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 21 13:14:38 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217

svn commit: r1787962 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/manager/host/ java/org/apache/catalina/security/ java/org/apache/catalina/users/ java/org/ap

2017-03-21 Thread markt 
Author: markt
Date: Tue Mar 21 13:10:48 2017
New Revision: 1787962

URL: http://svn.apache.org/viewvc?rev=1787962=rev
Log:
Refactoring
Single utility class for X -> comma separated list

Added:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/StringUtils.java
  - copied, changed from r1787938, 
tomcat/trunk/java/org/apache/tomcat/util/buf/StringUtils.java
Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityListener.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/MemoryGroup.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/MemoryUser.java

tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/SignCode.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 21 13:10:48 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1

svn commit: r1787959 - in /tomcat/trunk/java/org/apache: coyote/http11/AbstractHttp11Protocol.java tomcat/util/net/SSLHostConfig.java

2017-03-21 Thread markt 
Author: markt
Date: Tue Mar 21 12:52:04 2017
New Revision: 1787959

URL: http://svn.apache.org/viewvc?rev=1787959=rev
Log:
https://bz.apache.org/bugzilla/show_bug.cgi?id=60853
This is a partial fix. This restores read/write access to the deprecated 
attributes via JMX.
JMX access to the new objects is still TODO.

Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1787959=1787958=1787959=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Tue 
Mar 21 12:52:04 2017
@@ -568,203 +568,353 @@ public abstract class AbstractHttp11Prot
 }
 
 
-// TODO: All of these SSL setters can be removed once it is no longer
-// necessary to support the old configuration attributes (Tomcat 10?).
+// TODO: All of these SSL getters and setters can be removed once it is no
+// longer necessary to support the old configuration attributes (Tomcat 
10?)
 
+public String getSslEnabledProtocols() {
+registerDefaultSSLHostConfig();
+return StringUtils.join(defaultSSLHostConfig.getEnabledProtocols());
+}
 public void setSslEnabledProtocols(String enabledProtocols) {
 registerDefaultSSLHostConfig();
 defaultSSLHostConfig.setProtocols(enabledProtocols);
 }
+public String getSSLProtocol() {
+registerDefaultSSLHostConfig();
+return StringUtils.join(defaultSSLHostConfig.getEnabledProtocols());
+}
 public void setSSLProtocol(String sslProtocol) {
 registerDefaultSSLHostConfig();
 defaultSSLHostConfig.setProtocols(sslProtocol);
 }
 
 
+public String getKeystoreFile() {
+registerDefaultSSLHostConfig();
+return defaultSSLHostConfig.getCertificateKeystoreFile();
+}
 public void setKeystoreFile(String keystoreFile) {
 registerDefaultSSLHostConfig();
 defaultSSLHostConfig.setCertificateKeystoreFile(keystoreFile);
 }
+public String getSSLCertificateChainFile() {
+registerDefaultSSLHostConfig();
+return defaultSSLHostConfig.getCertificateChainFile();
+}
 public void setSSLCertificateChainFile(String certificateChainFile) {
 registerDefaultSSLHostConfig();
 defaultSSLHostConfig.setCertificateChainFile(certificateChainFile);
 }
+public String getSSLCertificateFile() {
+registerDefaultSSLHostConfig();
+return defaultSSLHostConfig.getCertificateFile();
+}
 public void setSSLCertificateFile(String certificateFile) {
 registerDefaultSSLHostConfig();
 defaultSSLHostConfig.setCertificateFile(certificateFile);
 }
+public String getSSLCertificateKeyFile() {
+registerDefaultSSLHostConfig();
+return defaultSSLHostConfig.getCertificateKeyFile();
+}
 public void setSSLCertificateKeyFile(String certificateKeyFile) {
 registerDefaultSSLHostConfig();
 defaultSSLHostConfig.setCertificateKeyFile(certificateKeyFile);
 }
 
 
+public String getAlgorithm() {
+registerDefaultSSLHostConfig();
+return defaultSSLHostConfig.getKeyManagerAlgorithm();
+}
 public void setAlgorithm(String keyManagerAlgorithm) {
 registerDefaultSSLHostConfig();
 defaultSSLHostConfig.setKeyManagerAlgorithm(keyManagerAlgorithm);
 }
 
 
+public String getClientAuth() {
+registerDefaultSSLHostConfig();
+return defaultSSLHostConfig.getCertificateVerification().toString();
+}
 public void setClientAuth(String certificateVerification) {
 registerDefaultSSLHostConfig();
 
defaultSSLHostConfig.setCertificateVerification(certificateVerification);
 }
 
 
+public String getSSLVerifyClient() {
+registerDefaultSSLHostConfig();
+return defaultSSLHostConfig.getCertificateVerification().toString();
+}
 public void setSSLVerifyClient(String certificateVerification) {
 registerDefaultSSLHostConfig();
 
defaultSSLHostConfig.setCertificateVerification(certificateVerification);
 }
 
 
+public int getTrustMaxCertLength(){
+registerDefaultSSLHostConfig();
+return defaultSSLHostConfig.getCertificateVerificationDepth();
+}
 public void setTrustMaxCertLength(int certificateVerificationDepth){
 registerDefaultSSLHostConfig();
 
defaultSSLHostConfig.setCertificateVerificationDepth(certificateVerificationDepth);
 }
+public int getSSLVerifyDepth() {
+registerDefaultSSLHostConfig();
+return

svn commit: r1787938 - in /tomcat/trunk: java/org/apache/catalina/core/ java/org/apache/catalina/manager/host/ java/org/apache/catalina/security/ java/org/apache/catalina/users/ java/org/apache/coyote

2017-03-21 Thread markt 
Author: markt
Date: Tue Mar 21 11:14:19 2017
New Revision: 1787938

URL: http://svn.apache.org/viewvc?rev=1787938=rev
Log:
Refactoring
Single utility class for X -> comma separated list

Added:
tomcat/trunk/java/org/apache/tomcat/util/buf/StringUtils.java   (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java
tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1787938=1787937=1787938=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Mar 21 
11:14:19 2017
@@ -114,6 +114,7 @@ import org.apache.tomcat.InstanceManager
 import org.apache.tomcat.JarScanner;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.IntrospectionUtils;
+import org.apache.tomcat.util.buf.StringUtils;
 import org.apache.tomcat.util.descriptor.XmlIdentifiers;
 import org.apache.tomcat.util.descriptor.web.ApplicationParameter;
 import org.apache.tomcat.util.descriptor.web.ErrorPage;
@@ -1029,17 +1030,7 @@ public class StandardContext extends Con
 
 @Override
 public String getResourceOnlyServlets() {
-StringBuilder result = new StringBuilder();
-boolean first = true;
-for (String servletName : resourceOnlyServlets) {
-if (first) {
-first = false;
-} else {
-result.append(',');
-}
-result.append(servletName);
-}
-return result.toString();
+return StringUtils.join(resourceOnlyServlets);
 }
 
 

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=1787938=1787937=1787938=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java 
Tue Mar 21 11:14:19 2017
@@ -44,6 +44,7 @@ import org.apache.catalina.core.Containe
 import org.apache.catalina.core.StandardHost;
 import org.apache.catalina.startup.HostConfig;
 import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.buf.StringUtils;
 import org.apache.tomcat.util.res.StringManager;
 
 /**
@@ -519,15 +520,8 @@ public class HostManagerServlet
 Host host = (Host) hosts[i];
 String name = host.getName();
 String[] aliases = host.findAliases();
-StringBuilder buf = new StringBuilder();
-if (aliases.length > 0) {
-buf.append(aliases[0]);
-for (int j = 1; j < aliases.length; j++) {
-buf.append(',').append(aliases[j]);
-}
-}
 writer.println(smClient.getString("hostManagerServlet.listitem",
-name, buf.toString()));
+name, StringUtils.join(aliases)));
 }
 }
 

Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java?rev=1787938=1787937=1787938=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java Tue 
Mar 21 11:14:19 2017
@@ -17,7 +17,6 @@
 package org.apache.catalina.security;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Locale;
 import java.util.Set;
 
@@ -26,6 +25,7 @@ import org.apache.catalina.LifecycleEven
 import org.apache.catalina.LifecycleListener;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.buf.StringUtils;
 import org.apache.tomcat.util.res.StringManager;
 
 public class