Re: svn commit: r1706858 - /tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java

2015-10-06 Thread jean-frederic clere

On 10/05/2015 05:47 PM, r...@apache.org wrote:

Author: remm
Date: Mon Oct  5 15:47:21 2015
New Revision: 1706858

URL: http://svn.apache.org/viewvc?rev=1706858&view=rev
Log:
A flush seems to be missing when writing a window update [for consistency at 
least].


It seems it helps: with my demo from the ApacheCon now the status of 
http/2 is:

FF : apr OK, nio NOTOK and nio2 NOTOK.
Chrome: apr OK nio OK and nio2 NOTOK (chrome still gives an error with 
nio2, something like a timeout).


Cheers

Jean-Frederic



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



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

2015-10-06 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-trunk-test-apr has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Timed Out'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on 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 timed out
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 1 hour 2 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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151006-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20151006/lib 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151006.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151006-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -
 Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20151006/bin/openssl
 -Dexecute.test.apr=true -Dtest.excludePerformance=true 
-Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-tr

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed

2015-10-06 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-tc7.0.x-test-apr has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-test-apr :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.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 tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -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.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 30 mins 6 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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151006-native-src.tar.gz
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151006-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20151006/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151006.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtest.exclu
 dePerformance=true -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio=false 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20151006.jar
 -Dtest.temp=output/test-tmp-APR 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/buil

svn commit: r1706967 - /tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java

2015-10-06 Thread markt
Author: markt
Date: Tue Oct  6 09:06:12 2015
New Revision: 1706967

URL: http://svn.apache.org/viewvc?rev=1706967&view=rev
Log:
Trivial Javadoc commit to test the CI system

Modified:
tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java

Modified: tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java?rev=1706967&r1=1706966&r2=1706967&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java Tue Oct  6 
09:06:12 2015
@@ -14,14 +14,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.coyote;
 
 import java.util.concurrent.Executor;
 
 import org.apache.tomcat.util.net.SSLHostConfig;
 
-
 /**
  * Abstract the protocol implementation, including threading, etc.
  * Processor is single threaded and specific to stream-based protocols,
@@ -48,12 +46,16 @@ public interface ProtocolHandler {
 
 /**
  * The executor, provide access to the underlying thread pool.
+ *
+ * @return The executor used to process requests
  */
 public Executor getExecutor();
 
 
 /**
  * Initialise the protocol.
+ *
+ * @throws Exception If the protocol handler fails to initialise
  */
 public void init() throws Exception;
 



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



buildbot success in ASF Buildbot on tomcat-trunk

2015-10-06 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/390

Buildbot URL: http://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] 1706967
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: r1706969 - /tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java

2015-10-06 Thread markt
Author: markt
Date: Tue Oct  6 09:42:26 2015
New Revision: 1706969

URL: http://svn.apache.org/viewvc?rev=1706969&view=rev
Log:
Trivial Javadoc commit to test the CI system

Modified:
tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java

Modified: tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java?rev=1706969&r1=1706968&r2=1706969&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java Tue Oct  6 
09:42:26 2015
@@ -62,42 +62,58 @@ public interface ProtocolHandler {
 
 /**
  * Start the protocol.
+ *
+ * @throws Exception If the protocol handler fails to start
  */
 public void start() throws Exception;
 
 
 /**
  * Pause the protocol (optional).
+ *
+ * @throws Exception If the protocol handler fails to pause
  */
 public void pause() throws Exception;
 
 
 /**
  * Resume the protocol (optional).
+ *
+ * @throws Exception If the protocol handler fails to resume
  */
 public void resume() throws Exception;
 
 
 /**
  * Stop the protocol.
+ *
+ * @throws Exception If the protocol handler fails to stop
  */
 public void stop() throws Exception;
 
 
 /**
  * Destroy the protocol (optional).
+ *
+ * @throws Exception If the protocol handler fails to destroy
  */
 public void destroy() throws Exception;
 
 
 /**
  * Requires APR/native library
+ *
+ * @return true if this Protocol Handler requires the
+ * APR/native library, otherwise false
  */
 public boolean isAprRequired();
 
 
 /**
  * Does this ProtocolHandler support sendfile?
+ *
+ * @return true if this Protocol Handler supports sendfile,
+ * otherwise false
  */
 public boolean isSendfileSupported();
 



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



svn commit: r1706978 - in /tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net: TestSsl.java TesterSupport.java

2015-10-06 Thread markt
Author: markt
Date: Tue Oct  6 10:24:47 2015
New Revision: 1706978

URL: http://svn.apache.org/viewvc?rev=1706978&view=rev
Log:
Java6 uses SSLv2Hello which Tomcat has disabled by default. Use a custom 
SSLSocketFactory to disable SSLv2Hello (and SSLv2) on the client side.

Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java

Modified: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java?rev=1706978&r1=1706977&r2=1706978&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java Tue Oct  
6 10:24:47 2015
@@ -170,7 +170,8 @@ public class TestSsl extends TomcatBaseT
 
 SSLContext sslCtx = SSLContext.getInstance("TLS");
 sslCtx.init(null, TesterSupport.getTrustManagers(), null);
-SSLSocketFactory socketFactory = sslCtx.getSocketFactory();
+SSLSocketFactory socketFactory = 
+new 
TesterSupport.NoSSLv2SocketFactory(sslCtx.getSocketFactory());
 SSLSocket socket = (SSLSocket) socketFactory.createSocket("localhost",
 getPort());
 

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1706978&r1=1706977&r2=1706978&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java 
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Tue 
Oct  6 10:24:47 2015
@@ -20,16 +20,25 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.InetAddress;
+import java.net.Socket;
 import java.net.URISyntaxException;
+import java.net.UnknownHostException;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
 
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
@@ -162,11 +171,13 @@ public final class TesterSupport {
 
 protected static void configureClientSsl() {
 try {
+System.setProperty("https.protocols", "TLSv1");
 SSLContext sc = SSLContext.getInstance("TLS");
 sc.init(TesterSupport.getUser1KeyManagers(),
 TesterSupport.getTrustManagers(),
 null);
-
javax.net.ssl.HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+javax.net.ssl.HttpsURLConnection.setDefaultSSLSocketFactory(
+new NoSSLv2SocketFactory(sc.getSocketFactory()));
 } catch (Exception e) {
 e.printStackTrace();
 }
@@ -297,4 +308,64 @@ public final class TesterSupport {
 // NOOP - Trust everything
 }
 }
+
+public static class NoSSLv2SocketFactory extends SSLSocketFactory {
+
+SSLSocketFactory factory;
+
+public NoSSLv2SocketFactory(SSLSocketFactory factory) {
+this.factory = factory;
+}
+
+@Override
+public String[] getDefaultCipherSuites() {
+return factory.getDefaultCipherSuites();
+}
+
+@Override
+public String[] getSupportedCipherSuites() {
+return factory.getSupportedCipherSuites();
+}
+
+@Override
+public Socket createSocket(Socket s, String host, int port, boolean 
autoClose) throws IOException {
+return filterProtocols((SSLSocket) factory.createSocket(s, host, 
port, autoClose));
+}
+
+@Override
+public Socket createSocket(String host, int port) throws IOException, 
UnknownHostException {
+return filterProtocols((SSLSocket) factory.createSocket(host, 
port));
+}
+
+@Override
+public Socket createSocket(InetAddress host, int port) throws 
IOException {
+return filterProtocols((SSLSocket) factory.createSocket(host, 
port));
+}
+
+@Override
+public Socket createSocket(String host, int port, InetAddress 
localHost, int localPort)
+throws IOException, UnknownHostException {
+  

svn commit: r1707046 - /tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java

2015-10-06 Thread markt
Author: markt
Date: Tue Oct  6 12:58:24 2015
New Revision: 1707046

URL: http://svn.apache.org/viewvc?rev=1707046&view=rev
Log:
Fix a concurrency issue in the unit test (streams 19 and 21 may not both be 
blocked by the time the client sends the window update) identified by code 
review.
It may not be immediately obvious why this fixes the issue so it includes 
extension commentary. 

Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java

Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java?rev=1707046&r1=1707045&r2=1707046&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java 
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java Tue Oct 
 6 12:58:24 2015
@@ -116,36 +116,45 @@ public class TestHttp2Section_5_3 extend
 
 // At this point 17 is blocked because the stream window is zero and
 // 19 & 21 are blocked because the connection window is zero.
-
-// This should release a single byte from each of 19 and 21 (the update
-// is allocated by weight and then rounded up).
-sendWindowUpdate(0, 1);
-parser.readFrame(true);
-// Debugging Gump failure
-log.info(output.getTrace());
-
-// This frame is not always written
-int count = 0;
-while (!parser.readFrame(false) && count < 10) {
-Thread.sleep(100);
-count++;
-}
-if (count == 10) {
-Assert.fail("Second 1 byte body frame not received");
+//
+// Note: All these streams are processed in their own threads so it is
+//   possible that not all of them reach the point where output
+//   is blocked at the same time.
+//
+// The loop below handles 0, 1 or 2 stream being blocked
+// - If 0 streams are blocked the connection window will be set to one
+//   and that will be consumed by the first stream to attempt to write.
+//   That body frame will be read by the client. The stream will then 
be
+//   blocked and the loop will start again.
+// - If 1 stream is blocked, the connection window will be set to one
+//   which will then be consumed by the blocked stream. After writing
+//   the single byte the stream will again be blocked and the loop will
+//   start again.
+// - If 2 streams are blocked the connection window will be set to one
+//   but one byte will be permitted for both streams (due to rounding 
in
+//   the allocation). The window size will be -1. Two frames (one for
+//   each stream will be written) one of which will be consumed by the
+//   client. The loop will start again and the Window size incremented
+//   to zero. No data will be written by the streams but the second 
data
+//   frame written in the last iteration of the loop will be read. The
+//   loop will then exit since frames from both streams will have been
+//   observed.
+boolean seen19 = false;
+boolean seen21 = false;
+while (!seen19 || !seen21) {
+sendWindowUpdate(0, 1);
+parser.readFrame(true);
+if (output.getTrace().contains("19-Body-1")) {
+seen19 = true;
+} else if (output.getTrace().contains("21-Body-1")) {
+seen21 = true;
+} else {
+// Unexpected trace
+Assert.fail(output.getTrace());
+}
+output.clearTrace();
 }
 
-// Debugging Gump failure
-log.info(output.getTrace());
-
-String trace = output.getTrace();
-Assert.assertTrue(trace, trace.contains("19-Body-1"));
-Assert.assertTrue(trace, trace.contains("21-Body-1"));
-output.clearTrace();
-
-// This should address the 'overrun' of the connection flow control
-// window above.
-sendWindowUpdate(0, 1);
-
 sendWindowUpdate(0, 1024);
 parser.readFrame(true);
 // Debugging Gump failure
@@ -154,7 +163,7 @@ public class TestHttp2Section_5_3 extend
 // Debugging Gump failure
 log.info(output.getTrace());
 
-trace = output.getTrace();
+String trace = output.getTrace();
 Assert.assertTrue(trace, trace.contains("19-Body-256"));
 Assert.assertTrue(trace, trace.contains("21-Body-768"));
 



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



buildbot failure in ASF Buildbot on tomcat-trunk

2015-10-06 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/392

Buildbot URL: http://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] 1707046
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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



Minor issue in jar packaging of tomcat-juli-adapters, in extras

2015-10-06 Thread Benjamin Gandon
Hi there,

Working on my JULI-to-SLF4J bridge library (see 
),
I have identified a small and invisible issue in the jar packaging of 
tomcat-juli-adapters in the extras.

Indeed, the LogFactoryImpl is shipped with the adapters, but it is not supposed 
to.
1. Because it is already shipped with the tomcat-juli jar.
2. Because the ${files.tomcat-extras-juli-adapters} in build.xml specifies an 
exclusion on it.

But the exclusion is ineffective because it lacks a star at the end.

The issue is invisible because of class loading delegation. Children class 
loaders accessing the adapters favor delegation to the System loader.
So the LogFactoryImpl from tomcat-juli (System classpath) always masks the one 
erroneously shipped with tomcat-juli-adapters (Catalina classpath).

I would be happy to submit a PR on github for this, I mean at 
,
but it just looks like it’s not the way you guys are working. :)

Do you need a BZ issue for this?
Or could someone just commit the fix for me please? I include the diff below.

Cheers,
/Benjamin




diff --git a/build.xml b/build.xml
index 4f69f33..492d248 100644
--- a/build.xml
+++ b/build.xml
@@ -484,7 +484,7 @@
   
 
 
-
+
 
 
 



svn commit: r1707052 - /tomcat/trunk/build.xml

2015-10-06 Thread markt
Author: markt
Date: Tue Oct  6 13:28:38 2015
New Revision: 1707052

URL: http://svn.apache.org/viewvc?rev=1707052&view=rev
Log:
Ensure LogFactoryImpl is excluded from adapters jar.
Reported by Benjamin Gandon on the dev list

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1707052&r1=1707051&r2=1707052&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Oct  6 13:28:38 2015
@@ -493,7 +493,7 @@
   
 
 
-
+
 
 
 



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



svn commit: r1707053 - in /tomcat/tc8.0.x/trunk: ./ build.xml webapps/docs/changelog.xml

2015-10-06 Thread markt
Author: markt
Date: Tue Oct  6 13:30:45 2015
New Revision: 1707053

URL: http://svn.apache.org/viewvc?rev=1707053&view=rev
Log:
Ensure LogFactoryImpl is excluded from adapters jar.
Reported by Benjamin Gandon on the dev list

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  6 13:30:45 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1
 
37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
 
2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459

svn commit: r1707054 - in /tomcat/tc7.0.x/trunk: ./ build.xml webapps/docs/changelog.xml

2015-10-06 Thread markt
Author: markt
Date: Tue Oct  6 13:32:27 2015
New Revision: 1707054

URL: http://svn.apache.org/viewvc?rev=1707054&view=rev
Log:
Ensure LogFactoryImpl is excluded from adapters jar.
Reported by Benjamin Gandon on the dev list

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  6 13:32:27 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 
748,1702751,1702754,1702758,1702760,1702763,1702766,1703949,1704253,1704291,1704321-1704322,1704325,1704486,1704574,1704687
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345

buildbot success in ASF Buildbot on tomcat-trunk

2015-10-06 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/393

Buildbot URL: http://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] 1707052
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



Re: Minor issue in jar packaging of tomcat-juli-adapters, in extras

2015-10-06 Thread Mark Thomas
On 06/10/2015 14:14, Benjamin Gandon wrote:
> Hi there,
> 
> Working on my JULI-to-SLF4J bridge library (see 
> ),
> I have identified a small and invisible issue in the jar packaging of 
> tomcat-juli-adapters in the extras.
> 
> Indeed, the LogFactoryImpl is shipped with the adapters, but it is not 
> supposed to.
> 1. Because it is already shipped with the tomcat-juli jar.
> 2. Because the ${files.tomcat-extras-juli-adapters} in build.xml specifies an 
> exclusion on it.
> 
> But the exclusion is ineffective because it lacks a star at the end.
> 
> The issue is invisible because of class loading delegation. Children class 
> loaders accessing the adapters favor delegation to the System loader.
> So the LogFactoryImpl from tomcat-juli (System classpath) always masks the 
> one erroneously shipped with tomcat-juli-adapters (Catalina classpath).
> 
> I would be happy to submit a PR on github for this, I mean at 
> ,
> but it just looks like it’s not the way you guys are working. :)

Pull requests work for us. It is just that not that many folks have used
that route so far.

(Thanks for the reminder that I need to review the current pull requests.)

> Do you need a BZ issue for this?

No need. If a patch isn't picked up fairly quickly (say within 24 hours)
I'd recommend using a pull request or opening a Bugzilla issue since
both those mechanisms reduce the chances of an issue being forgotten about.

> Or could someone just commit the fix for me please? I include the diff below.

Done. For trunk, 8.0.x and 7.0.x.

Many thanks.

Mark


> 
> Cheers,
> /Benjamin
> 
> 
> 
> 
> diff --git a/build.xml b/build.xml
> index 4f69f33..492d248 100644
> --- a/build.xml
> +++ b/build.xml
> @@ -484,7 +484,7 @@
>
>  
>  
> -
> +
>  
>  
>  
> 
> 


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



svn commit: r1707057 - /tomcat/tc7.0.x/trunk/java/javax/servlet/http/Cookie.java

2015-10-06 Thread markt
Author: markt
Date: Tue Oct  6 13:49:06 2015
New Revision: 1707057

URL: http://svn.apache.org/viewvc?rev=1707057&view=rev
Log:
Improve Javadoc
This closes #6
Based on a pull request by theau-aurelien 

Modified:
tomcat/tc7.0.x/trunk/java/javax/servlet/http/Cookie.java

Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/http/Cookie.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/http/Cookie.java?rev=1707057&r1=1707056&r2=1707057&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/http/Cookie.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/http/Cookie.java Tue Oct  6 
13:49:06 2015
@@ -416,10 +416,10 @@ public class Cookie implements Cloneable
 
 }
 
-/*
+/**
  * Tests a string and returns true if the string counts as a reserved token
  * in the Java language.
- * @param value the String to be tested
+ * @param possibleToken the String to be tested
  * @return true if the String is a reserved 
token;
  * false if it is not
  */



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



Re: Minor issue in jar packaging of tomcat-juli-adapters, in extras

2015-10-06 Thread Benjamin Gandon
Thanks for the (lightning fast) response Mark!


> Le 6 oct. 2015 à 15:43, Mark Thomas  a écrit :
> 
> On 06/10/2015 14:14, Benjamin Gandon wrote:
>> Hi there,
>> 
>> Working on my JULI-to-SLF4J bridge library (see 
>> ),
>> I have identified a small and invisible issue in the jar packaging of 
>> tomcat-juli-adapters in the extras.
>> 
>> Indeed, the LogFactoryImpl is shipped with the adapters, but it is not 
>> supposed to.
>> 1. Because it is already shipped with the tomcat-juli jar.
>> 2. Because the ${files.tomcat-extras-juli-adapters} in build.xml specifies 
>> an exclusion on it.
>> 
>> But the exclusion is ineffective because it lacks a star at the end.
>> 
>> The issue is invisible because of class loading delegation. Children class 
>> loaders accessing the adapters favor delegation to the System loader.
>> So the LogFactoryImpl from tomcat-juli (System classpath) always masks the 
>> one erroneously shipped with tomcat-juli-adapters (Catalina classpath).
>> 
>> I would be happy to submit a PR on github for this, I mean at 
>> ,
>> but it just looks like it’s not the way you guys are working. :)
> 
> Pull requests work for us. It is just that not that many folks have used
> that route so far.
> 
> (Thanks for the reminder that I need to review the current pull requests.)
> 
>> Do you need a BZ issue for this?
> 
> No need. If a patch isn't picked up fairly quickly (say within 24 hours)
> I'd recommend using a pull request or opening a Bugzilla issue since
> both those mechanisms reduce the chances of an issue being forgotten about.
> 
>> Or could someone just commit the fix for me please? I include the diff below.
> 
> Done. For trunk, 8.0.x and 7.0.x.
> 
> Many thanks.
> 
> Mark
> 
> 
>> 
>> Cheers,
>> /Benjamin
>> 
>> 
>> 
>> 
>> diff --git a/build.xml b/build.xml
>> index 4f69f33..492d248 100644
>> --- a/build.xml
>> +++ b/build.xml
>> @@ -484,7 +484,7 @@
>>   
>> 
>> 
>> -
>> +
>> 
>> 
>> 
>> 
>> 
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org 
> 
> For additional commands, e-mail: dev-h...@tomcat.apache.org 
> 


svn commit: r1707060 - /tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java

2015-10-06 Thread markt
Author: markt
Date: Tue Oct  6 14:08:51 2015
New Revision: 1707060

URL: http://svn.apache.org/viewvc?rev=1707060&view=rev
Log:
More debug

Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java

Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java?rev=1707060&r1=1707059&r2=1707060&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java 
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java Tue Oct 
 6 14:08:51 2015
@@ -144,6 +144,8 @@ public class TestHttp2Section_5_3 extend
 while (!seen19 || !seen21) {
 sendWindowUpdate(0, 1);
 parser.readFrame(true);
+// Debugging Gump failure
+log.info(output.getTrace());
 if (output.getTrace().contains("19-Body-1")) {
 seen19 = true;
 } else if (output.getTrace().contains("21-Body-1")) {



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



svn commit: r1707072 - /tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java

2015-10-06 Thread remm
Author: remm
Date: Tue Oct  6 15:19:08 2015
New Revision: 1707072

URL: http://svn.apache.org/viewvc?rev=1707072&view=rev
Log:
- Add a (large) TODO for OpenSSL configuration.
- Remove unused log field.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1707072&r1=1707071&r2=1707072&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Tue 
Oct  6 15:19:08 2015
@@ -35,8 +35,6 @@ import org.apache.tomcat.util.net.openss
 
 public abstract class AbstractJsseEndpoint extends AbstractEndpoint {
 
-private static final Log log = 
LogFactory.getLog(AbstractJsseEndpoint.class);
-
 private String sslImplementationName = null;
 private int sniParseLimit = 64 * 1024;
 
@@ -70,6 +68,8 @@ public abstract class AbstractJsseEndpoi
 
 @Override
 protected Type getSslConfigType() {
+// TODO: Add configuration to allow the OpenSSLImplementation to 
optionally use the JSSE configuration
+// (it should still default to OpenSSL style since it is the most 
logical and straightforward)
 if 
(OpenSSLImplementation.IMPLEMENTATION_NAME.equals(sslImplementationName)) {
 return SSLHostConfig.Type.OPENSSL;
 } else {



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



svn commit: r1707077 - /tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java

2015-10-06 Thread remm
Author: remm
Date: Tue Oct  6 15:39:51 2015
New Revision: 1707077

URL: http://svn.apache.org/viewvc?rev=1707077&view=rev
Log:
Forgot unused imports.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1707077&r1=1707076&r2=1707077&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Tue 
Oct  6 15:39:51 2015
@@ -26,9 +26,6 @@ import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSessionContext;
 
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-
 import org.apache.tomcat.util.net.SSLHostConfig.Type;
 import org.apache.tomcat.util.net.jsse.openssl.Cipher;
 import org.apache.tomcat.util.net.openssl.OpenSSLImplementation;



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



buildbot failure in ASF Buildbot on tomcat-trunk

2015-10-06 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/396

Buildbot URL: http://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] 1707077
Blamelist: remm

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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



svn commit: r1707088 - /tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java

2015-10-06 Thread markt
Author: markt
Date: Tue Oct  6 16:57:37 2015
New Revision: 1707088

URL: http://svn.apache.org/viewvc?rev=1707088&view=rev
Log:
Correct an error in the fix for BZ 56777 that did not correctly handle absolute 
paths on Windows.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java?rev=1707088&r1=1707087&r2=1707088&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java Tue Oct 
 6 16:57:37 2015
@@ -56,13 +56,21 @@ public class ConfigFileLoader {
  * provided location
  */
 public static InputStream getInputStream(String location) throws 
IOException {
-
-// Absolute URIs will be left alone
+   // Absolute URIs will be left alone
 // Relative files will be resolved relative to catalina base
 // Absolute files will be converted to URIs
-URI uri = CATALINA_BASE_URI.resolve(location);
-URL url = uri.toURL();
-
+   URI uri;
+   if (location != null &&
+   (location.length() > 2 && 
":\\".equals(location.substring(1, 3)) ||
+   location.startsWith(""))) {
+   // This is an absolute file path in Windows or a UNC 
path
+   File f = new File(location);
+   uri =f.getAbsoluteFile().toURI();
+   } else {
+   // URL, relative path or an absolute path on a 
non-Windows platforms
+   uri = CATALINA_BASE_URI.resolve(location);
+   }
+   URL url = uri.toURL();
 return url.openConnection().getInputStream();
 }
 }



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



svn commit: r1707089 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/file/ConfigFileLoader.java

2015-10-06 Thread markt
Author: markt
Date: Tue Oct  6 17:00:44 2015
New Revision: 1707089

URL: http://svn.apache.org/viewvc?rev=1707089&view=rev
Log:
Correct an error in the fix for BZ 56777 that did not correctly handle absolute 
paths on Windows.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  6 17:00:44 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1
 
37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
 
2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695

svn commit: r1707090 - /tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java

2015-10-06 Thread markt
Author: markt
Date: Tue Oct  6 17:01:28 2015
New Revision: 1707090

URL: http://svn.apache.org/viewvc?rev=1707090&view=rev
Log:
Tab police

Modified:
tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java?rev=1707090&r1=1707089&r2=1707090&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java Tue Oct 
 6 17:01:28 2015
@@ -56,21 +56,21 @@ public class ConfigFileLoader {
  * provided location
  */
 public static InputStream getInputStream(String location) throws 
IOException {
-   // Absolute URIs will be left alone
+// Absolute URIs will be left alone
 // Relative files will be resolved relative to catalina base
 // Absolute files will be converted to URIs
-   URI uri;
-   if (location != null &&
-   (location.length() > 2 && 
":\\".equals(location.substring(1, 3)) ||
-   location.startsWith(""))) {
-   // This is an absolute file path in Windows or a UNC 
path
-   File f = new File(location);
-   uri =f.getAbsoluteFile().toURI();
-   } else {
-   // URL, relative path or an absolute path on a 
non-Windows platforms
-   uri = CATALINA_BASE_URI.resolve(location);
-   }
-   URL url = uri.toURL();
+URI uri;
+if (location != null &&
+(location.length() > 2 && ":\\".equals(location.substring(1, 
3)) ||
+location.startsWith(""))) {
+// This is an absolute file path in Windows or a UNC path
+File f = new File(location);
+uri =f.getAbsoluteFile().toURI();
+} else {
+// URL, relative path or an absolute path on a non-Windows 
platforms
+uri = CATALINA_BASE_URI.resolve(location);
+}
+URL url = uri.toURL();
 return url.openConnection().getInputStream();
 }
 }



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



Using CredentialHandlers in application code

2015-10-06 Thread Christopher Schultz
All,

We (somewhat) recently introduced the CredentialHandler to Tomcat in
order to make it easier to use different password-munging strategies
along with all the Realm implementations. A good example is using a hash
like SHA-256 in one case (using MessageDigest) and using PBKDF2 in
another case (using SecreyKey, etc.). In the past, we had been limited
to whatever the MessageDigest class could support, and we have a nice,
flexible system, now.

This is great for authentication against data already stored somewhere
e.g. a relational database. But it currently does not have an obviously
usable component for an application.

Yes, you can drop catalina.jar into your application's lib directory and
then you can do this:

SecretKeyCredentialHandler ch = new SecretKeyCredentialHandler();

ch.setAlgorithm(ALGORITHM);
ch.setIterations(ITERATIONS);
ch.setSaltLength(SALT_LENGTH);;
ch.setKeyLength(KEY_LENGTH);

hashedPassword = ch.mutate(user.getPassword());

... but there are two downsides to this:

1. The whole of catalina.jar is included in your application, possibly
   breaking a great many things
2. You have to make sure that all of the values match whatever you have
   configured in your  element in context.xml
   (or server.xml)

To solve the first problem, I'm wondering if we could produce an
artifact during the build that just contains the interfaces, etc. for
the CredentialHandlers. This would allow users to build against them and
even lazily deploy them with their code.

For the second issue, I don't see any opportunities at present.

It doesn't look like the application's Realms are available via JMX if
they are declared local to the application -- only the global Realms are
represented by MBeans. Also, it doesn't look like the Realms offer
access to the CredentialHandlers even if they were available.

I think these are two oversights that ought to be corrected: local
Realms ought to be locatable via JMX just as local DataSources are
available in e.g.
Catalina:type=DataSource,host=[host],context=/[context-path],class=javax.sql.DataSource,name="[name]"
and also Realms ought to expose information about their CredentialHandlers.

If those are available, then applications can simply grab the same
CredentialHandler that Tomcat is using for authentication and use it for
two obvious use-cases I can think of:

1. Preparing new credentials for saving to the user data store (e.g.
   registration, change-password, etc.)
2. Verifying existing credentials without Tomcat performing
   authentication (e.g. check-password required to update account
   info, inspect password history to prohibit repeats, etc.)

The only caveat is that the application definitely would not be able to
deploy either catalina.jar or catalina-only-credential-handlers.jar,
otherwise they'll get ClassCastExceptions when they try to use them. But
that's okay: documentation can take care of that to some degree.

Does anyone have any thoughts on any of those items? I'd really like for
applications to be able to re-use those components if possible.

Thanks,
-chris



signature.asc
Description: OpenPGP digital signature


Re: Using CredentialHandlers in application code

2015-10-06 Thread Mark Thomas
On 06/10/2015 18:05, Christopher Schultz wrote:
> All,
> 
> We (somewhat) recently introduced the CredentialHandler to Tomcat in
> order to make it easier to use different password-munging strategies
> along with all the Realm implementations. A good example is using a hash
> like SHA-256 in one case (using MessageDigest) and using PBKDF2 in
> another case (using SecreyKey, etc.). In the past, we had been limited
> to whatever the MessageDigest class could support, and we have a nice,
> flexible system, now.
> 
> This is great for authentication against data already stored somewhere
> e.g. a relational database. But it currently does not have an obviously
> usable component for an application.
> 
> Yes, you can drop catalina.jar into your application's lib directory and
> then you can do this:
> 
> SecretKeyCredentialHandler ch = new SecretKeyCredentialHandler();
> 
> ch.setAlgorithm(ALGORITHM);
> ch.setIterations(ITERATIONS);
> ch.setSaltLength(SALT_LENGTH);;
> ch.setKeyLength(KEY_LENGTH);
> 
> hashedPassword = ch.mutate(user.getPassword());
> 
> ... but there are two downsides to this:
> 
> 1. The whole of catalina.jar is included in your application, possibly
>breaking a great many things
> 2. You have to make sure that all of the values match whatever you have
>configured in your  element in context.xml
>(or server.xml)
> 
> To solve the first problem, I'm wondering if we could produce an
> artifact during the build that just contains the interfaces, etc. for
> the CredentialHandlers. This would allow users to build against them and
> even lazily deploy them with their code.

It doesn't look to be that easy to extract the relevant classes and
their dependencies into a separate JAR. If folks want to interact with
the Tomcat internals I don't think it is unreasonable to expect them to
compile against the standard JARs.

> For the second issue, I don't see any opportunities at present.
> 
> It doesn't look like the application's Realms are available via JMX if
> they are declared local to the application -- only the global Realms are
> represented by MBeans. Also, it doesn't look like the Realms offer
> access to the CredentialHandlers even if they were available.
> 
> I think these are two oversights that ought to be corrected: local
> Realms ought to be locatable via JMX just as local DataSources are
> available in e.g.
> Catalina:type=DataSource,host=[host],context=/[context-path],class=javax.sql.DataSource,name="[name]"
> and also Realms ought to expose information about their CredentialHandlers.

+1.

> If those are available, then applications can simply grab the same
> CredentialHandler that Tomcat is using for authentication and use it for
> two obvious use-cases I can think of:
> 
> 1. Preparing new credentials for saving to the user data store (e.g.
>registration, change-password, etc.)
> 2. Verifying existing credentials without Tomcat performing
>authentication (e.g. check-password required to update account
>info, inspect password history to prohibit repeats, etc.)
> 
> The only caveat is that the application definitely would not be able to
> deploy either catalina.jar or catalina-only-credential-handlers.jar,
> otherwise they'll get ClassCastExceptions when they try to use them. But
> that's okay: documentation can take care of that to some degree.
> 
> Does anyone have any thoughts on any of those items? I'd really like for
> applications to be able to re-use those components if possible.

Big +1 to the JMX.

No so sure about the separate JAR.

How about a Realm option to expose the CredentialHandler via a customer
ServletContext attribute? That way users wouldn't have to jump through
JMX hoops including knowing the container names.

Mark


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



svn commit: r1707130 - /tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java

2015-10-06 Thread markt
Author: markt
Date: Tue Oct  6 19:59:06 2015
New Revision: 1707130

URL: http://svn.apache.org/viewvc?rev=1707130&view=rev
Log:
The CI systems continue to find more timing assumptions in the unit tests. Fix 
another one.

Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java

Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java?rev=1707130&r1=1707129&r2=1707130&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java 
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java Tue Oct 
 6 19:59:06 2015
@@ -132,13 +132,13 @@ public class TestHttp2Section_5_3 extend
 //   start again.
 // - If 2 streams are blocked the connection window will be set to one
 //   but one byte will be permitted for both streams (due to rounding 
in
-//   the allocation). The window size will be -1. Two frames (one for
-//   each stream will be written) one of which will be consumed by the
-//   client. The loop will start again and the Window size incremented
-//   to zero. No data will be written by the streams but the second 
data
-//   frame written in the last iteration of the loop will be read. The
-//   loop will then exit since frames from both streams will have been
-//   observed.
+//   the allocation). The window size should be -1 (see below). Two
+//   frames (one for each stream will be written) one of which will be
+//   consumed by the client. The loop will start again and the Window
+//   size incremented to zero. No data will be written by the streams
+//   but the second data frame written in the last iteration of the 
loop
+//   will be read. The loop will then exit since frames from both
+//   streams will have been observed.
 boolean seen19 = false;
 boolean seen21 = false;
 while (!seen19 || !seen21) {
@@ -159,6 +159,21 @@ public class TestHttp2Section_5_3 extend
 
 sendWindowUpdate(0, 1024);
 parser.readFrame(true);
+
+// Make sure you have read the big comment before the loop above.
+// The 2 streams blocked case assumes that the server processes the
+// window update fast enough that both streams will have written their
+// byte and updated the connection window size to -1 before the next
+// window update frame is processed. That doesn't always happen. If it
+// doesn't another 1 byte data frame will be sent for each stream. 
Those
+// need to be swallowed here.
+while (output.getTrace().contains("Body-1")) {
+// Debugging Gump failure
+log.info(output.getTrace());
+output.clearTrace();
+parser.readFrame(true);
+}
+
 // Debugging Gump failure
 log.info(output.getTrace());
 parser.readFrame(true);



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



buildbot success in ASF Buildbot on tomcat-trunk

2015-10-06 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/398

Buildbot URL: http://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] 1707130
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



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

2015-10-06 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 3 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.apache.org/gump/public/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.apache.org/gump/public/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: 38 mins 54 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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151007-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20151007/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151007.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151007-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest
 
.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20151007/bin/openssl
 -Dexecute.test.bio=false -Dexecute.test.apr=true 
-Dtest.excludePerformance=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.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/output/build/lib/catalina-ha.jar:/srv/gump/public/worksp

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

2015-10-06 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-trunk-test-nio 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-trunk-test-nio :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on 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-trunk/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 49 mins 12 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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151007-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151007.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151007-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-ma
 ster/dest-20151007/bin/openssl -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/