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

2017-04-28 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-apr has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 17 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-apr :  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-apr/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-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 22 mins 30 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=false -Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.0.x/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-20170429.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20170429/bin/openssl
 -Dexecute.test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dexecute.test.apr=true -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commo
 ns-daemon-20170429-native-src.tar.gz -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170429-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-12/dest-20170429/lib 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=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

[GUMP@vmgump-vm3]: Project taglibs-standard-spec (in module tomcat-taglibs) failed

2017-04-28 Thread 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-standard-spec has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 215 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- taglibs-standard-spec :  JSP Taglibs


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-taglibs/taglibs-standard-spec/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Sole jar output [taglibs-standard-spec-*[0-9T].jar] identifier set to 
project name
 -DEBUG- (Apache Gump generated) Apache Maven Settings in: 
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/gump_mvn_settings.xml
 -INFO- Failed with reason build failed
 -DEBUG- Maven POM in: 
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/pom.xml
 -INFO- Failed to extract fallback artifacts from Gump Repository



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-taglibs/taglibs-standard-spec/gump_work/build_tomcat-taglibs_taglibs-standard-spec.html
Work Name: build_tomcat-taglibs_taglibs-standard-spec (Type: Build)
Work ended in a state of : Failed
Elapsed: 3 secs
Command Line: /opt/maven3/bin/mvn --batch-mode --settings 
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/gump_mvn_settings.xml 
install 
[Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard/spec]
M2_HOME: /opt/maven3
-
[INFO] Scanning for projects...
[INFO] Downloading: 
http://localhost:8192/maven2/org/apache/taglibs/taglibs-parent/3/taglibs-parent-3.pom
[INFO] Downloaded: 
http://localhost:8192/maven2/org/apache/taglibs/taglibs-parent/3/taglibs-parent-3.pom
 (8 KB at 53.7 KB/sec)
[WARNING] 
[WARNING] Some problems were encountered while building the effective model for 
org.apache.taglibs:taglibs-standard-spec:bundle:1.2.6-SNAPSHOT
[WARNING] 'parent.relativePath' of POM 
org.apache.taglibs:taglibs-standard:1.2.6-SNAPSHOT 
(/srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml) points at 
org.apache.tomcat.taglibs:taglibs-aggregator instead of 
org.apache.taglibs:taglibs-parent, please verify your project structure @ 
org.apache.taglibs:taglibs-standard:1.2.6-SNAPSHOT, 
/srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml, line 23, column 11
[WARNING] 
[WARNING] It is highly recommended to fix these problems because they threaten 
the stability of your build.
[WARNING] 
[WARNING] For this reason, future Maven versions might no longer support 
building such malformed projects.
[WARNING] 
[INFO] 
[INFO] 
[INFO] Building Apache Standard Taglib Specification API 1.2.6-SNAPSHOT
[INFO] 
[INFO] Downloading: 
http://localhost:8192/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.15/maven-surefire-plugin-2.15.pom
[INFO] Downloaded: 
http://localhost:8192/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.15/maven-surefire-plugin-2.15.pom
 (6 KB at 325.0 KB/sec)
[INFO] Downloading: 
http://localhost:8192/maven2/org/apache/maven/surefire/surefire/2.15/surefire-2.15.pom
[INFO] Downloaded: 
http://localhost:8192/maven2/org/apache/maven/surefire/surefire/2.15/surefire-2.15.pom
 (19 KB at 1066.8 KB/sec)
[INFO] Downloading: 
http://localhost:8192/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.15/maven-surefire-plugin-2.15.jar
[INFO] Downloaded: 
http://localhost:8192/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.15/maven-surefire-plugin-2.15.jar
 (32 KB at 2101.6 KB/sec)
[INFO] Downloading: 
http://localhost:8192/maven2/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1.pom
[INFO] Downloaded: 
http://localhost:8192/maven2/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1.pom (157 
B at 9.0 KB/sec)
[INFO] Downloading: 
http://localhost:8192/maven2/javax/el/el-api/1.0/el-api-1.0.pom
[INFO] Downloaded: 
http://localhost:8192/maven2/javax/el/el-api/1.0/el-api-1.0.pom (184 B at 11.2 
KB/sec)
[INFO] Downloading: 
http://localhost:8192/maven2/org/easymock/easymock/3.0/easymock-3.0.pom
[INFO] Downloaded: 
http://localhost:8192/maven2/org/easymock/easymock/3.0/easymock-3.0.pom (6 KB 
at 623.2 KB/sec)
[INFO] Downloading: 
http://localhost:8192/maven2/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1.jar
[INFO] Downloading: 
http://localhost:8192/maven2/javax/el/el-api/1.0/el-api-1.0.jar
[INFO] Downloading: 
http://localhost:8192/maven2/org/easymock/easymock/3.0/easymock-3.0.jar
[INFO] Downloaded:

svn commit: r1793148 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java

2017-04-28 Thread violetagg 
Author: violetagg
Date: Fri Apr 28 20:15:14 2017
New Revision: 1793148

URL: http://svn.apache.org/viewvc?rev=1793148=rev
Log:
Test for WsSession#suspend/resume. (the test was forgotten when committing the 
new functionality)

Added:

tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java   
(with props)

Added: 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java?rev=1793148=auto
==
--- 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java 
(added)
+++ 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java 
Fri Apr 28 20:15:14 2017
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.websocket;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.websocket.ClientEndpointConfig;
+import javax.websocket.CloseReason;
+import javax.websocket.ContainerProvider;
+import javax.websocket.Endpoint;
+import javax.websocket.EndpointConfig;
+import javax.websocket.Session;
+import javax.websocket.WebSocketContainer;
+import javax.websocket.server.ServerEndpointConfig;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.servlets.DefaultServlet;
+import org.apache.catalina.startup.Tomcat;
+import 
org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEndpoint;
+import org.apache.tomcat.websocket.server.TesterEndpointConfig;
+
+public class TestWsSessionSuspendResume extends WebSocketBaseTest {
+
+@Test
+public void test() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+Context ctx = tomcat.addContext("", null);
+ctx.addApplicationListener(Config.class.getName());
+
+Tomcat.addServlet(ctx, "default", new DefaultServlet());
+ctx.addServletMappingDecoded("/", "default");
+
+tomcat.start();
+
+WebSocketContainer wsContainer = 
ContainerProvider.getWebSocketContainer();
+
+ClientEndpointConfig clientEndpointConfig = 
ClientEndpointConfig.Builder.create().build();
+Session wsSession = wsContainer.connectToServer(
+TesterProgrammaticEndpoint.class,
+clientEndpointConfig,
+new URI("ws://localhost:" + getPort() + Config.PATH));
+
+CountDownLatch latch = new CountDownLatch(2);
+wsSession.addMessageHandler(String.class, message -> {
+Assert.assertTrue("[echo, echo, echo]".equals(message));
+latch.countDown();
+});
+for (int i = 0; i < 8; i++) {
+wsSession.getAsyncRemote().sendText("echo");
+}
+
+boolean latchResult = latch.await(30, TimeUnit.SECONDS);
+Assert.assertTrue(latchResult);
+
+wsSession.close();
+}
+
+
+public static final class Config extends TesterEndpointConfig {
+private static final String PATH = "/echo";
+
+@Override
+protected Class getEndpointClass() {
+return SuspendResumeEndpoint.class;
+}
+
+@Override
+protected ServerEndpointConfig getServerEndpointConfig() {
+return ServerEndpointConfig.Builder.create(getEndpointClass(), 
PATH).build();
+}
+}
+
+
+public static final class SuspendResumeEndpoint extends Endpoint {
+
+@Override
+public void onOpen(Session session, EndpointConfig  epc) {
+MessageProcessor processor = new MessageProcessor(session, 3);
+session.addMessageHandler(String.class, message -> 
processor.addMessage(message));
+}
+
+@Override
+public void onClose(Session session, CloseReason closeReason) {
+try {
+session.close();
+} catch (IOException e) {
+e.printStackTrace();
+}
+}
+
+@Override
+public

[GitHub] tomcat pull request #42: Read events suspend/resume logic in websocket impl ...

2017-04-28 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/tomcat/pull/42


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

svn commit: r1793147 - in /tomcat/trunk: java/org/apache/coyote/ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/websocket/ java/org/apache/tomcat/websocket/server/ webapps/docs/

2017-04-28 Thread violetagg 
Author: violetagg
Date: Fri Apr 28 20:13:10 2017
New Revision: 1793147

URL: http://svn.apache.org/viewvc?rev=1793147=rev
Log:
Introduce new API - WsSession#suspend/WsSession#resume that can be used to 
suspend/resume reading of the incoming messages.

This closes #42

Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java

tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.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=1793147=1793146=1793147=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Fri Apr 28 
20:13:10 2017
@@ -880,6 +880,10 @@ public abstract class AbstractProtocolhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1793147=1793146=1793147=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Fri Apr 
28 20:13:10 2017
@@ -68,7 +68,7 @@ public abstract class AbstractEndpointhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1793147=1793146=1793147=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Fri 
Apr 28 20:13:10 2017
@@ -52,12 +52,15 @@ util.unknownDecoderType=The Decoder type
 # frames and therefore must be 123 bytes (not characters) or less in length.
 # Messages are encoded using UTF-8 where a single character may be encoded in
 # as many as 4 bytes.
+wsFrame.alreadyResumed=Message receiving has already been resumed.
+wsFrame.alreadySuspended=Message receiving has already been suspended.
 wsFrame.bufferTooSmall=No async message support and buffer too small. Buffer 
size: [{0}], Message size: [{1}]
 wsFrame.byteToLongFail=Too many bytes ([{0}]) were provided to be converted 
into a long
 wsFrame.closed=New frame received after a close control frame
 wsFrame.controlFragmented=A fragmented control frame was received but control 
frames may not be fragmented
 wsFrame.controlPayloadTooBig=A control frame was sent with a payload of size 
[{0}] which is larger than the maximum permitted of 125 bytes
 wsFrame.controlNoFin=A control frame was sent that did not have the fin bit 
set. Control frames are not permitted to use continuation frames.
+wsFrame.illegalReadState=Unexpected read state [{0}]
 wsFrame.invalidOpCode= A WebSocket frame was sent with an unrecognised opCode 
of [{0}]
 wsFrame.invalidUtf8=A WebSocket text frame was received that could not be 
decoded to UTF-8 because it contained invalid byte sequences
 wsFrame.invalidUtf8Close=A WebSocket close frame was received with a close 
reason that contained invalid UTF-8 byte sequences
@@ -68,6 +71,7 @@ wsFrame.notMasked=The client frame was n
 wsFrame.oneByteCloseCode=The client sent a close frame with a single byte 
payload which is not valid
 wsFrame.partialHeaderComplete=WebSocket frame received. fin [{0}], rsv [{1}], 
OpCode [{2}], payload length [{3}]
 wsFrame.sessionClosed=The client data cannot be processed because the session 
has already been closed
+wsFrame.suspendRequested=Suspend of the message receiving has already been 
requested.
 wsFrame.textMessageTooBig=The decoded text message was too big for the output 
buffer and the endpoint does not support partial messages
 wsFrame.wrongRsv=The client frame set the reserved bits to [{0}] for a message 
with opCode [{1}] which was not supported by this endpoint
 

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1793147=1793146=1793147=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Fri Apr 28 
20:13:10 2017
@@ -23,6 +23,7 @@ import

svn commit: r1793142 - /tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java

2017-04-28 Thread markt 
Author: markt
Date: Fri Apr 28 19:39:52 2017
New Revision: 1793142

URL: http://svn.apache.org/viewvc?rev=1793142=rev
Log:
Bah. And another one

Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1793142=1793141=1793142=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Fri Apr 28 
19:39:52 2017
@@ -313,7 +313,7 @@ public final class UDecoder {
  * string is not a query string.
  *
  * @param str The url-encoded string
- * @param enc The encoding to use; if null, the default encoding is used. 
If
+ * @param enc The encoding to use; if null, UTF-8 is used. If
  * an unsupported encoding is specified null will be returned
  * @return the decoded string
  * @exception IllegalArgumentException if a '%' character is not followed



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

svn commit: r1793141 - /tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java

2017-04-28 Thread markt 
Author: markt
Date: Fri Apr 28 19:37:37 2017
New Revision: 1793141

URL: http://svn.apache.org/viewvc?rev=1793141=rev
Log:
Correct Javadoc to new behaviour

Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1793141=1793140=1793141=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Fri Apr 28 
19:37:37 2017
@@ -294,9 +294,9 @@ public final class UDecoder {
 
 /**
  * Decode and return the specified URL-encoded String.
- * When the byte array is converted to a string, the system default
- * character encoding is used...  This may be different than some other
- * servers. It is assumed the string is not a query string.
+ * When the byte array is converted to a string, the UTF-8 is used. This 
may
+ * be different than some other servers. It is assumed the string is not a
+ * query string.
  *
  * @param str The url-encoded string
  * @return the decoded string



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

svn commit: r1793140 - /tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java

2017-04-28 Thread markt 
Author: markt
Date: Fri Apr 28 19:33:07 2017
New Revision: 1793140

URL: http://svn.apache.org/viewvc?rev=1793140=rev
Log:
Code review / Servlet 4.0
UTF-8 is now the default for URLs

Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1793140=1793139=1793140=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Fri Apr 28 
19:33:07 2017
@@ -328,7 +328,7 @@ public final class UDecoder {
  * Decode and return the specified URL-encoded String.
  *
  * @param str The url-encoded string
- * @param enc The encoding to use; if null, ISO-8859-1 is used. If
+ * @param enc The encoding to use; if null, UTF-8 is used. If
  * an unsupported encoding is specified null will be returned
  * @param isQuery Is this a query string being processed
  * @return the decoded string
@@ -351,7 +351,7 @@ public final class UDecoder {
  * Decode and return the specified URL-encoded byte array.
  *
  * @param bytes The url-encoded byte array
- * @param enc The encoding to use; if null, ISO-8859-1 is used. If
+ * @param enc The encoding to use; if null, UTF-8 is used. If
  * an unsupported encoding is specified null will be returned
  * @param isQuery Is this a query string being processed
  * @return the decoded string
@@ -390,7 +390,7 @@ public final class UDecoder {
 return null;
 }
 }
-return new String(bytes, 0, ox, StandardCharsets.ISO_8859_1);
+return new String(bytes, 0, ox, StandardCharsets.UTF_8);
 
 }
 



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

svn commit: r1793139 - /tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java

2017-04-28 Thread markt 
Author: markt
Date: Fri Apr 28 19:31:47 2017
New Revision: 1793139

URL: http://svn.apache.org/viewvc?rev=1793139=rev
Log:
Code review
One method defaulted to ISO-8859-1
One method defaulted to platform default.
Make them consistent (ISO-8859-1)

Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1793139=1793138=1793139=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Fri Apr 28 
19:31:47 2017
@@ -343,11 +343,6 @@ public final class UDecoder {
 // URLs are always in US-ASCII
 byte[] bytes = str.getBytes(StandardCharsets.US_ASCII);
 
-// If an encoding is not specified, use ISO-8859-1
-if (enc == null) {
-enc = "ISO-8859-1";
-}
-
 return URLDecode(bytes, enc, isQuery);
 }
 
@@ -356,7 +351,7 @@ public final class UDecoder {
  * Decode and return the specified URL-encoded byte array.
  *
  * @param bytes The url-encoded byte array
- * @param enc The encoding to use; if null, the default encoding is used. 
If
+ * @param enc The encoding to use; if null, ISO-8859-1 is used. If
  * an unsupported encoding is specified null will be returned
  * @param isQuery Is this a query string being processed
  * @return the decoded string
@@ -395,7 +390,7 @@ public final class UDecoder {
 return null;
 }
 }
-return new String(bytes, 0, ox);
+return new String(bytes, 0, ox, StandardCharsets.ISO_8859_1);
 
 }
 



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

svn commit: r1793136 - /tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java

2017-04-28 Thread markt 
Author: markt
Date: Fri Apr 28 19:29:42 2017
New Revision: 1793136

URL: http://svn.apache.org/viewvc?rev=1793136=rev
Log:
Code review while investigating expanding the use of Charset for encoding 
rather than String.
URLs (when %nn encoded) should always be in US-ASCII. Simplify the decode 
method on that basis.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1793136=1793135=1793136=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Fri Apr 28 
19:29:42 2017
@@ -328,7 +328,7 @@ public final class UDecoder {
  * Decode and return the specified URL-encoded String.
  *
  * @param str The url-encoded string
- * @param enc The encoding to use; if null, the default encoding is used. 
If
+ * @param enc The encoding to use; if null, ISO-8859-1 is used. If
  * an unsupported encoding is specified null will be returned
  * @param isQuery Is this a query string being processed
  * @return the decoded string
@@ -336,28 +336,19 @@ public final class UDecoder {
  * by a valid 2-digit hexadecimal number
  */
 public static String URLDecode(String str, String enc, boolean isQuery) {
-if (str == null)
-return (null);
+if (str == null) {
+return null;
+}
+
+// URLs are always in US-ASCII
+byte[] bytes = str.getBytes(StandardCharsets.US_ASCII);
 
-// use the specified encoding to extract bytes out of the
-// given string so that the encoding is not lost. If an
-// encoding is not specified, use ISO-8859-1
-byte[] bytes = null;
-try {
-if (enc == null) {
-bytes = str.getBytes(StandardCharsets.ISO_8859_1);
-enc = "ISO-8859-1";
-} else {
-bytes = str.getBytes(B2CConverter.getCharset(enc));
-}
-} catch (UnsupportedEncodingException uee) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("uDecoder.urlDecode.uee", enc), uee);
-}
+// If an encoding is not specified, use ISO-8859-1
+if (enc == null) {
+enc = "ISO-8859-1";
 }
 
 return URLDecode(bytes, enc, isQuery);
-
 }
 
 



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

svn commit: r1793131 - /tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java

2017-04-28 Thread markt 
Author: markt
Date: Fri Apr 28 18:45:09 2017
New Revision: 1793131

URL: http://svn.apache.org/viewvc?rev=1793131=rev
Log:
Remove deprecated code

Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=1793131=1793130=1793131=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Fri Apr 28 
18:45:09 2017
@@ -66,32 +66,11 @@ public class B2CConverter {
  * @throws UnsupportedEncodingException If the requested Charset is not
  *  available
  */
-public static Charset getCharset(String enc)
-throws UnsupportedEncodingException {
+public static Charset getCharset(String enc) throws 
UnsupportedEncodingException {
 
 // Encoding names should all be ASCII
 String lowerCaseEnc = enc.toLowerCase(Locale.ENGLISH);
 
-return getCharsetLower(lowerCaseEnc);
-}
-
-
-/**
- * Only to be used when it is known that the encoding name is in lower 
case.
- * @param lowerCaseEnc The name of the encoding for the required charset in
- * lower case
- *
- * @return The Charset corresponding to the requested encoding
- *
- * @throws UnsupportedEncodingException If the requested Charset is not
- *  available
- *
- * @deprecated Will be removed in Tomcat 9.0.x
- */
-@Deprecated
-public static Charset getCharsetLower(String lowerCaseEnc)
-throws UnsupportedEncodingException {
-
 Charset charset = encodingToCharsetCache.get(lowerCaseEnc);
 
 if (charset == null) {



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

svn commit: r1793129 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/buf/B2CConverter.java

2017-04-28 Thread markt 
Author: markt
Date: Fri Apr 28 18:44:19 2017
New Revision: 1793129

URL: http://svn.apache.org/viewvc?rev=1793129=rev
Log:
Deprecate unused method

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 28 18:44:19 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,1745535,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,1747
 
536,1747924,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-1
 
756410,1756778,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,176216

svn commit: r1793127 - /tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java

2017-04-28 Thread markt 
Author: markt
Date: Fri Apr 28 18:43:55 2017
New Revision: 1793127

URL: http://svn.apache.org/viewvc?rev=1793127=rev
Log:
Deprecate unused method

Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=1793127=1793126=1793127=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Fri Apr 28 
18:43:55 2017
@@ -55,6 +55,17 @@ public class B2CConverter {
 }
 }
 
+
+/**
+ * Obtain the Charset for the given encoding
+ *
+ * @param enc The name of the encoding for the required charset
+ *
+ * @return The Charset corresponding to the requested encoding
+ *
+ * @throws UnsupportedEncodingException If the requested Charset is not
+ *  available
+ */
 public static Charset getCharset(String enc)
 throws UnsupportedEncodingException {
 
@@ -64,6 +75,7 @@ public class B2CConverter {
 return getCharsetLower(lowerCaseEnc);
 }
 
+
 /**
  * Only to be used when it is known that the encoding name is in lower 
case.
  * @param lowerCaseEnc The name of the encoding for the required charset in
@@ -73,7 +85,10 @@ public class B2CConverter {
  *
  * @throws UnsupportedEncodingException If the requested Charset is not
  *  available
+ *
+ * @deprecated Will be removed in Tomcat 9.0.x
  */
+@Deprecated
 public static Charset getCharsetLower(String lowerCaseEnc)
 throws UnsupportedEncodingException {
 
@@ -87,6 +102,7 @@ public class B2CConverter {
 return charset;
 }
 
+
 private final CharsetDecoder decoder;
 private ByteBuffer bb = null;
 private CharBuffer cb = null;



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

svn commit: r1793125 - /tomcat/trunk/java/org/apache/catalina/connector/Connector.java

2017-04-28 Thread markt 
Author: markt
Date: Fri Apr 28 18:38:10 2017
New Revision: 1793125

URL: http://svn.apache.org/viewvc?rev=1793125=rev
Log:
Remove deprecated code

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1793125=1793124=1793125=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Fri Apr 28 
18:38:10 2017
@@ -22,7 +22,6 @@ import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.Locale;
 
 import javax.management.ObjectName;
 
@@ -259,22 +258,6 @@ public class Connector extends Lifecycle
 protected Adapter adapter = null;
 
 
-/**
- * URI encoding.
- *
- * @deprecated This will be removed in 9.0.x onwards
- */
-@Deprecated
-protected String URIEncoding = null;
-
-
-/**
- * @deprecated This will be removed in 9.0.x onwards
- */
-@Deprecated
-protected String URIEncodingLower = null;
-
-
 private Charset uriCharset = StandardCharsets.UTF_8;
 
 
@@ -707,17 +690,6 @@ public class Connector extends Lifecycle
 }
 
 
-/**
- * @return the character encoding to be used for the URI using lower case.
- *
- * @deprecated This will be removed in 9.0.x onwards
- */
-@Deprecated
-public String getURIEncodingLower() {
-return uriCharset.name().toLowerCase(Locale.ENGLISH);
-}
-
-
 /**
  *
  * @return The Charset to use to convert raw URI bytes (after %nn decoding)



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

svn commit: r1793124 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ test/org/apache/catalina/core/ webapps/docs/

2017-04-28 Thread markt 
Author: markt
Date: Fri Apr 28 18:36:53 2017
New Revision: 1793124

URL: http://svn.apache.org/viewvc?rev=1793124=rev
Log:
Start to move towards using Charset rather than String internally to reduce the 
number of calls required to B2CConverter.getCharset() during a request.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationPushBuilder.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 28 18:36:53 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,1745535,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,1747
 
536,1747924,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-1
 
756410,1756778,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,176216

svn commit: r1793123 - /tomcat/trunk/webapps/docs/changelog.xml

2017-04-28 Thread markt 
Author: markt
Date: Fri Apr 28 18:35:54 2017
New Revision: 1793123

URL: http://svn.apache.org/viewvc?rev=1793123=rev
Log:
Additional entry for previous change

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1793123=1793122=1793123=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Apr 28 18:35:54 2017
@@ -77,6 +77,12 @@
 to UTF-8 as required by the Servlet 4.0 specification.
 (markt)
   
+  
+Start to switch to using Charset rather than
+String to store encoding configuration settings to reduce
+the number of places the associated Charset needs to be
+looked up. (markt)
+  
 
   
   



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

svn commit: r1793121 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/catalina/core/ test/org/apache/catalina/core/ webapps/docs/

2017-04-28 Thread markt 
Author: markt
Date: Fri Apr 28 18:18:06 2017
New Revision: 1793121

URL: http://svn.apache.org/viewvc?rev=1793121=rev
Log:
Update the default URIEncoding for a Connector to UTF-8 as required by the 
Servlet 4.0 specification.
Start to move towards using Charset rather than String internally to reduce the 
number of calls required to B2CConverter.getCharset() during a request.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
tomcat/trunk/test/org/apache/catalina/core/TestApplicationPushBuilder.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1793121=1793120=1793121=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Fri Apr 28 
18:18:06 2017
@@ -16,14 +16,16 @@
  */
 package org.apache.catalina.connector;
 
+import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Locale;
 
 import javax.management.ObjectName;
 
-import org.apache.catalina.Globals;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.LifecycleState;
 import org.apache.catalina.Service;
@@ -37,6 +39,7 @@ import org.apache.coyote.http11.Abstract
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.IntrospectionUtils;
+import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.net.SSLHostConfig;
 import org.apache.tomcat.util.net.openssl.OpenSSLImplementation;
 import org.apache.tomcat.util.res.StringManager;
@@ -105,11 +108,6 @@ public class Connector extends Lifecycle
 this.protocolHandler = p;
 }
 
-if (!Globals.STRICT_SERVLET_COMPLIANCE) {
-URIEncoding = "UTF-8";
-URIEncodingLower = URIEncoding.toLowerCase(Locale.ENGLISH);
-}
-
 // Default for Connector depends on this system property
 
setThrowOnFailure(Boolean.getBoolean("org.apache.catalina.startup.EXIT_ON_INIT_FAILURE"));
 }
@@ -263,11 +261,23 @@ public class Connector extends Lifecycle
 
 /**
  * URI encoding.
+ *
+ * @deprecated This will be removed in 9.0.x onwards
  */
+@Deprecated
 protected String URIEncoding = null;
+
+
+/**
+ * @deprecated This will be removed in 9.0.x onwards
+ */
+@Deprecated
 protected String URIEncodingLower = null;
 
 
+private Charset uriCharset = StandardCharsets.UTF_8;
+
+
 /**
  * URI encoding as body.
  */
@@ -689,33 +699,45 @@ public class Connector extends Lifecycle
 
 
 /**
- * @return the character encoding to be used for the URI using the original
- * case.
+ * @return the name of character encoding to be used for the URI using the
+ * original case.
  */
 public String getURIEncoding() {
-return this.URIEncoding;
+return uriCharset.name();
 }
 
 
 /**
  * @return the character encoding to be used for the URI using lower case.
+ *
+ * @deprecated This will be removed in 9.0.x onwards
  */
+@Deprecated
 public String getURIEncodingLower() {
-return this.URIEncodingLower;
+return uriCharset.name().toLowerCase(Locale.ENGLISH);
 }
 
 
 /**
+ *
+ * @return The Charset to use to convert raw URI bytes (after %nn decoding)
+ * to characters. This will never be null
+ */
+public Charset getURICharset() {
+return uriCharset;
+}
+
+/**
  * Set the URI encoding to be used for the URI.
  *
  * @param URIEncoding The new URI character encoding.
  */
 public void setURIEncoding(String URIEncoding) {
-this.URIEncoding = URIEncoding;
-if (URIEncoding == null) {
-URIEncodingLower = null;
-} else {
-this.URIEncodingLower = URIEncoding.toLowerCase(Locale.ENGLISH);
+try {
+uriCharset = B2CConverter.getCharset(URIEncoding);
+} catch (UnsupportedEncodingException e) {
+log.warn(sm.getString("coyoteConnector.invalidEncoding",
+URIEncoding, uriCharset.name()), e);
 }
 }
 

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1793121=1793120=1793121=diff

svn commit: r1793102 - /tomcat/trunk/java/org/apache/catalina/connector/Connector.java

2017-04-28 Thread markt 
Author: markt
Date: Fri Apr 28 14:52:06 2017
New Revision: 1793102

URL: http://svn.apache.org/viewvc?rev=1793102=rev
Log:
Remove unnecessary code.
There is no matching attribute on any ProtocolHandler implementation.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1793102=1793101=1793102=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Fri Apr 28 
14:52:06 2017
@@ -717,7 +717,6 @@ public class Connector extends Lifecycle
 } else {
 this.URIEncodingLower = URIEncoding.toLowerCase(Locale.ENGLISH);
 }
-setProperty("uRIEncoding", URIEncoding);
 }
 
 



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

Re: JDK 9 EA Build 167 and JDK 8u152 build 03 are available on jdk.java.net

2017-04-28 Thread Mark Thomas 
Rory,

I need some advice. Various articles I have read about Jigsaw state that
Java 9 will include a new API for applications to use to obtain
information about any annotations that are present on classes.

It looks like Tomcat will need to use this for some of the annotation
scanning it currently performs.

I have spent a fair amount of time looking for such an API but have been
unable to find it. Could you point me in the right direction?

Thanks,

Mark


On 28/04/17 10:24, Rory O'Donnell wrote:
> Hi Mark,
> 
> 
> *JDK 9 Early Access*  build 167  is available at the new location : -
> jdk.java.net/9/
> 
> A summary of all the changes in this build are listed here
> . One change
> that maybe of interest is :
> 
>  *JEP 291: Deprecate the Concurrent Mark Sweep (CMS) Garbage
>Collector [1]
> 
> *
> *
> 
> *JDK 8u152 Early Access* build 03 is available at the new location : -
> jdk.java.net/8/ 
> 
> More information on the change of location for Early Access builds. [2]
> 
> NOTE: - Oracle's JRE and JDK Cryptographic Roadmap has been updated
> since last availability email [3]
> 
> Rgds,Rory
> 
> [1] http://mail.openjdk.java.net/pipermail/jdk9-dev/2017-April/005766.html
> [2]
> http://mail.openjdk.java.net/pipermail/adoption-discuss/2017-April/001610.html
> 
> [3] https://www.java.com/en/jre-jdk-cryptoroadmap.html
> 


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

svn commit: r1793096 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/changelog.xml

2017-04-28 Thread markt 
Author: markt
Date: Fri Apr 28 14:04:56 2017
New Revision: 1793096

URL: http://svn.apache.org/viewvc?rev=1793096=rev
Log:
Better changelog entry

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 28 14:04:56 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,1745535,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,1747
 
536,1747924,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-1
 
756410,1756778,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,176216

svn commit: r1793095 - /tomcat/trunk/webapps/docs/changelog.xml

2017-04-28 Thread markt 
Author: markt
Date: Fri Apr 28 14:04:21 2017
New Revision: 1793095

URL: http://svn.apache.org/viewvc?rev=1793095=rev
Log:
Better changelog entry

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1793095=1793094=1793095=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Apr 28 14:04:21 2017
@@ -66,10 +66,11 @@
 initialised HTTP connector where TLS is enabled. (markt)
   
   
-If a wild card hostName is configured for a
-SSLHostConfig element, quote the host name when using it 
as
-part of a JMX object name to avoid errors that prevent the associated
-TLS connector from starting. (markt)
+Always quote the hostName of an SSLHostConfig
+element when using it as part of the JMX object name to avoid errors 
that
+prevent the associated TLS connector from starting if a wild card
+hostName is configured (because * is a
+reserved character for JMX object names). (markt)
   
 
   



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

Re: svn commit: r1792957 - in /tomcat/trunk: java/org/apache/coyote/AbstractProtocol.java webapps/docs/changelog.xml

2017-04-28 Thread Mark Thomas 
On 27/04/17 21:59, Christopher Schultz wrote:
> Mark,
> 
> On 4/27/17 4:49 PM, ma...@apache.org wrote:
>> Author: markt Date: Thu Apr 27 20:49:32 2017 New Revision: 1792957
> 
>> URL: http://svn.apache.org/viewvc?rev=1792957=rev Log: 
>> Wildcard host names need quoting since '*' is a reserved character
>> in an ObjectName.



> We are always quoting, not just for wildcard hostnames. The "fix"
> implies that quoting only happens for wildcards.

I'll see if I can come up with a better wording.

Mark

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

JDK 9 EA Build 167 and JDK 8u152 build 03 are available on jdk.java.net

2017-04-28 Thread Rory O'Donnell 

Hi Mark,


*JDK 9 Early Access*  build 167  is available at the new location : - 
jdk.java.net/9/


A summary of all the changes in this build are listed here 
. One change 
that maybe of interest is :


 *JEP 291: Deprecate the Concurrent Mark Sweep (CMS) Garbage
   Collector [1]

*
*

*JDK 8u152 Early Access* build 03 is available at the new location : - 
jdk.java.net/8/ 


More information on the change of location for Early Access builds. [2]

NOTE: - Oracle's JRE and JDK Cryptographic Roadmap has been updated 
since last availability email [3]


Rgds,Rory

[1] http://mail.openjdk.java.net/pipermail/jdk9-dev/2017-April/005766.html
[2] 
http://mail.openjdk.java.net/pipermail/adoption-discuss/2017-April/001610.html

[3] https://www.java.com/en/jre-jdk-cryptoroadmap.html

--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland

[Bug 60362] Missing reason phrase in response

2017-04-28 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60362

--- Comment #54 from Blazej Bucko  ---
Yes, that's true. But, according to older spec, it's perfectly legal for
clients to rely on this information. And removing the reason phrase breaks
them.

-- 
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-04-28 Thread Violeta Georgieva 
2017-04-27 23:33 GMT+03:00 Mark Thomas :
>
> On 27/04/17 21:22, Violeta Georgieva wrote:
> > Hi,
> >
> > 2017-04-26 17:43 GMT+03:00 Mark Thomas :
> >>
> >> On 25/04/17 11:47, Violeta Georgieva wrote:
> >>
> >> 
> >>
> >>> Thanks for the review.
> >>> Changes for all comments are applied to the PR.
> >>> Can you take a look?
> >>
> >> Sure. A few more comments but nothing serious. Unless the fixes for any
> >> of these require large changes to the patch I'd be +1 on applying the
> >> patch with these fixes. I'd be fine with the patch being committed
> >> without the minor issues fixed as long as they were addressed later.
> >>
> >> Mark
> >>
> >>
> >> Moderate
> >>
> >> - If another thread calls suspend() after the call to close() it looks
> >>   like there could be an issue. Is another state - CLOSING - required?
> >>
> >> - On the client READ means a read is progress and READY means data has
> >>   been read and is being processed. On the server the meanings are
> >>   reversed.
> >
> > You are correct and it is tricky to find fitting state names as the
server
> > and the client has different roles.
> > Currently the states mean:
> >
> > On the Server
> > - READY means we are waiting for a notification that data is ready to be
> > read from the socket
> > - READ means we are reading from the socket and processing data
> >
> > On the Client
> > - READ means that we will process the data if such has already been read
> > and more data will be read from the socket
> > - READY means data has been read and is available for processing
>
> Maybe just document the above in the Javadoc for the state diagram.

I think that WAITING/PROCESSING describe the states better than READY/READ
and I'm considering to change them.

> Mark
>
>
> >
> > What about to rename
> > READY -> WAITING which will have meaning:
> > - on the Server - waiting to read a data from the socket
> > - on the Client - waiting for a data to be processed
> >
> > READ -> PROCESSING
> > - on the Server - the data is read from the socket and processed
> > - on the Client - the available data is processed and more data is read
> > from the socket
> >
> > Also the other states will be:
> >
> > READY_SUSPENDING -> SUSPENDING_WAIT
> > READ_SUSPENDING -> SUSPENDING_PROCESS
> >
> > Regards,
> > Violeta
> >
> >>
> >> - A couple of lines have trailing whitespace
> >>   (only moderate because it will break the CI system)
> >>
> >>
> >> Minor
> >>
> >> - The Javadoc for the state diagram would be clearer with separate
> >>   lines for each transition rather than some lines being bi-directional
> >>
> >> - Can WsFrameClient.processSocketRead() be simplified? The try/catch
> >>   block that sets read state to READY looks to be unnecessary. The code
> >>   paths all appear to lead to close - and that sets the read state
> >>   anyway.
> >>
> >>
> >> -
> >> 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: Read events suspend/resume logic in websocket impl to achieve backpressure

2017-04-28 Thread Violeta Georgieva 
Hi,

2017-04-26 17:43 GMT+03:00 Mark Thomas :
>
> On 25/04/17 11:47, Violeta Georgieva wrote:
>
> 
>
> > Thanks for the review.
> > Changes for all comments are applied to the PR.
> > Can you take a look?
>
> Sure. A few more comments but nothing serious. Unless the fixes for any
> of these require large changes to the patch I'd be +1 on applying the
> patch with these fixes. I'd be fine with the patch being committed
> without the minor issues fixed as long as they were addressed later.
>
> Mark
>
>
> Moderate
>
> - If another thread calls suspend() after the call to close() it looks
>   like there could be an issue. Is another state - CLOSING - required?
>
> - On the client READ means a read is progress and READY means data has
>   been read and is being processed. On the server the meanings are
>   reversed.
>
> - A couple of lines have trailing whitespace
>   (only moderate because it will break the CI system)
>
>
> Minor
>
> - The Javadoc for the state diagram would be clearer with separate
>   lines for each transition rather than some lines being bi-directional
>
> - Can WsFrameClient.processSocketRead() be simplified? The try/catch
>   block that sets read state to READY looks to be unnecessary. The code
>   paths all appear to lead to close - and that sets the read state
>   anyway.

The fixes for all comments are available in the PR.
If there are no other comments I'm going to commit this functionality to
Tomcat 9.

Thanks,
Violeta

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

[Bug 60963] Optimize class loading for unpackWARs=false case

2017-04-28 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=60963

--- Comment #14 from Thomas Meyer  ---
Hi,

any news on this? Do you want me to attach the patch here? Anything else I can
do?

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