[GUMP@vmgump]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed
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 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-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 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: 50 mins 3 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.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150601-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150601.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150601-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-master/dest-20150601/bin/o penssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-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/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/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-util.jar:/srv
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/667 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1682878 Blamelist: violetagg BUILD FAILED: failed compile Sincerely, -The Buildbot - 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-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/669 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1682881 Blamelist: violetagg 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: r1682879 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/server/LocalStrings.properties java/org/apache/tomcat/websocket/server/WsServerContainer.java webapps/docs/changelo
Author: violetagg Date: Mon Jun 1 12:06:25 2015 New Revision: 1682879 URL: http://svn.apache.org/r1682879 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57676 Merged revision 1665292 from tomcat/trunk: Improve error message when multiple Websocket endpoints are bound to the same path. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 1 12:06:25 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,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 -/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
svn commit: r1682885 - in /tomcat/trunk: java/org/apache/coyote/http2/Http2Parser.java test/org/apache/coyote/http2/Http2TestBase.java test/org/apache/coyote/http2/TestHttp2Section_3_2.java
Author: markt
Date: Mon Jun 1 12:31:56 2015
New Revision: 1682885
URL: http://svn.apache.org/r1682885
Log:
Refactor
- put the test only code in the test classes
- reorganise to make it easier to test various connection scenarios
Implement a couple of TODO tests
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1682885r1=1682884r2=1682885view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Mon Jun 1
12:31:56 2015
@@ -17,7 +17,6 @@
package org.apache.coyote.http2;
import java.io.IOException;
-import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import org.apache.juli.logging.Log;
@@ -92,61 +91,6 @@ class Http2Parser {
return true;
}
-
-boolean readHttpUpgradeResponse() throws IOException {
-// Only used by test code so safe to keep this just a little larger
than
-// we are expecting.
-ByteBuffer data = ByteBuffer.allocate(128);
-byte[] singleByte = new byte[1];
-// Looking for \r\n\r\n
-int seen = 0;
-while (seen 4) {
-input.fill(singleByte, true);
-switch (seen) {
-case 0:
-case 2: {
-if (singleByte[0] == '\r') {
-seen++;
-} else {
-seen = 0;
-}
-break;
-}
-case 1:
-case 3: {
-if (singleByte[0] == '\n') {
-seen++;
-} else {
-seen = 0;
-}
-break;
-}
-}
-data.put(singleByte[0]);
-}
-
-String response = new String(data.array(), data.arrayOffset(),
-data.arrayOffset() + data.position(),
StandardCharsets.ISO_8859_1);
-
-String[] responseLines = response.split(\r\n);
-
-if (responseLines.length 3) {
-return false;
-}
-if (!responseLines[0].startsWith(HTTP/1.1 101)) {
-return false;
-}
-// TODO: There may be other headers.
-if (!responseLines[1].equals(Connection: Upgrade)) {
-return false;
-}
-if (!responseLines[2].startsWith(Upgrade: h2c)) {
-return false;
-}
-
-return true;
-}
-
/**
* Interface that must be implemented by the source of data for the parser.
Modified: tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java?rev=1682885r1=1682884r2=1682885view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Mon Jun 1
12:31:56 2015
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
+import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import javax.net.SocketFactory;
@@ -29,12 +30,13 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.junit.Assert;
-import org.junit.Before;
import org.apache.catalina.Context;
+import org.apache.catalina.LifecycleException;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.coyote.http2.Http2Parser.Input;
import org.apache.tomcat.util.codec.binary.Base64;
@@ -52,31 +54,34 @@ public abstract class Http2TestBase exte
}
private Socket s;
+protected Input input;
protected Http2Parser parser;
protected OutputStream os;
-@Before
-public void setup() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-// Enable HTTP/2
-Connector connector = tomcat.getConnector();
+protected void enableHttp2() {
+Connector connector = getTomcatInstance().getConnector();
Http2Protocol http2Protocol = new Http2Protocol();
// Short timeouts for now. May need to increase these for CI systems.
http2Protocol.setReadTimeout(2000);
http2Protocol.setKeepAliveTimeout(5000);
http2Protocol.setWriteTimeout(2000);
connector.addUpgradeProtocol(http2Protocol);
+}
+
+
+protected void configureAndStartWebApplication() throws
svn commit: r1682871 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/Util.java
Author: violetagg Date: Mon Jun 1 11:05:36 2015 New Revision: 1682871 URL: http://svn.apache.org/r1682871 Log: Merged revision 1630199 from tomcat/tc8.0.x/trunk: NPE protection. Note NPE only possible with test code. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Util.java (contents, props changed) Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 1 11:05:36 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,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 -/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
svn commit: r1682875 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/server/LocalStrings.properties java/org/apache/tomcat/websocket/server/UpgradeUtil.java
Author: violetagg Date: Mon Jun 1 11:35:29 2015 New Revision: 1682875 URL: http://svn.apache.org/r1682875 Log: Merged revision 1630194 from tomcat/trunk: Fix an i18n TODO Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 1 11:35:29 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,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 -/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
svn commit: r1682873 - in /tomcat/trunk/test/org/apache/coyote/http2: Http2TestBase.java TestHttp2Base.java TestHttp2Section_3_2.java TestHttp2Section_3_2_1.java
Author: markt
Date: Mon Jun 1 11:11:18 2015
New Revision: 1682873
URL: http://svn.apache.org/r1682873
Log:
Rename so base test isn't picked up as a test class
Added:
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
- copied, changed from r1682848,
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Base.java
Removed:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Base.java
Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2_1.java
Copied: tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (from
r1682848, tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Base.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java?p2=tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.javap1=tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Base.javar1=1682848r2=1682873rev=1682873view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Base.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Mon Jun 1
11:11:18 2015
@@ -42,7 +42,7 @@ import org.apache.tomcat.util.codec.bina
* Tests for compliance with the a href=https://tools.ietf.org/html/rfc7540;
* HTTP/2 specification/a.
*/
-public abstract class TestHttp2Base extends TomcatBaseTest {
+public abstract class Http2TestBase extends TomcatBaseTest {
private static final String HTTP2_SETTINGS;
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java?rev=1682873r1=1682872r2=1682873view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java Mon Jun
1 11:11:18 2015
@@ -28,7 +28,10 @@ import org.junit.Test;
* The order of tests in this class is aligned with the order of the
* requirements in the RFC.
*/
-public class TestHttp2Section_3_2 extends TestHttp2Base {
+public class TestHttp2Section_3_2 extends Http2TestBase {
+
+// Note: Tests for zero/multiple HTTP2-Settings fields can be found in
+// TestHttp2Section_3_2_1
// TODO: Test initial requests with bodies of various sizes
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2_1.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2_1.java?rev=1682873r1=1682872r2=1682873view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2_1.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2_1.java Mon
Jun 1 11:11:18 2015
@@ -16,7 +16,7 @@
*/
package org.apache.coyote.http2;
-public class TestHttp2Section_3_2_1 extends TestHttp2Base {
+public class TestHttp2Section_3_2_1 extends Http2TestBase {
// TODO: Test zero Http2-Settings headers
-
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-nio (in module tomcat-8.0.x) failed
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-nio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio : 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-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-8.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 41 mins 14 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.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150601-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150601.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150601-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-1.0.2/dest-20150601/bin/op enssl -Dexecute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-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/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu ild/lib/tomcat-util.jar:/srv
svn commit: r1682843 - /tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
Author: markt
Date: Mon Jun 1 09:18:47 2015
New Revision: 1682843
URL: http://svn.apache.org/r1682843
Log:
Writing unit tests means we need an HTTP/2 client. Start to extract the HTTP/2
parsing code into a separate class so it can be shared by the test class and
the server. This is a work in progress.
Added:
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (with props)
Added: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1682843view=auto
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (added)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Mon Jun 1
09:18:47 2015
@@ -0,0 +1,173 @@
+/*
+ * 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.coyote.http2;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
+
+class Http2Parser {
+
+private static final Log log = LogFactory.getLog(Http2Parser.class);
+private static final StringManager sm =
StringManager.getManager(Http2Parser.class);
+
+private static final byte[] CLIENT_PREFACE_START =
+PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n
.getBytes(StandardCharsets.ISO_8859_1);
+
+private final Input input;
+private final byte[] frameHeaderBuffer = new byte[9];
+
+private volatile boolean readPreface = false;
+
+Http2Parser(Input input) {
+this.input = input;
+}
+
+
+/**
+ * Read and process a single frame. Once the start of a frame is read, the
+ * remainder will be read using blocking IO.
+ *
+ * @param block Should this method block until a frame is available is no
+ * frame is available immediately?
+ *
+ * @throws IOException If an IO error occurs while trying to read a frame
+ */
+public void readFrame(boolean block) throws IOException {
+input.fill(frameHeaderBuffer, block);
+
+// TODO: This is incomplete
+}
+
+
+/**
+ * Read and validate the connection preface from input using blocking IO.
+ *
+ * @return codetrue/code if a valid preface was read, otherwise false.
+ */
+public boolean readConnectionPreface() {
+if (readPreface) {
+return true;
+}
+
+byte[] data = new byte[CLIENT_PREFACE_START.length];
+try {
+input.fill(data, true);
+} catch (IOException ioe) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString(http2Parser.preface.io), ioe);
+}
+return false;
+}
+
+for (int i = 0; i CLIENT_PREFACE_START.length; i++) {
+if (CLIENT_PREFACE_START[i] != data[i]) {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString(http2Parser.preface.invalid,
+new String(data, StandardCharsets.ISO_8859_1)));
+}
+return false;
+}
+}
+
+readPreface = true;
+return true;
+}
+
+
+boolean readHttpUpgradeResponse() throws IOException {
+// Only used by test code so safe to keep this just a little larger
than
+// we are expecting.
+ByteBuffer data = ByteBuffer.allocate(128);
+byte[] singleByte = new byte[1];
+// Looking for \r\n\r\n
+int seen = 0;
+while (seen 4) {
+input.fill(singleByte, true);
+switch (seen) {
+case 0:
+case 2: {
+if (singleByte[0] == '\r') {
+seen++;
+} else {
+seen = 0;
+}
+break;
+}
+case 1:
+case 3: {
+if (singleByte[0] == '\n') {
+seen++;
+} else {
+seen = 0;
+}
+break;
+}
+}
+
buildbot success in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/283 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1682846 Blamelist: kkolinko 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: r1682878 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/server/UpgradeUtil.java
Author: violetagg Date: Mon Jun 1 11:40:29 2015 New Revision: 1682878 URL: http://svn.apache.org/r1682878 Log: Merged revision 1629906 from tomcat/trunk: Use constants Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 1 11:40:29 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,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 -/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
[Bug 57676] WebSocket check same path endpoint implementation enhancement
https://bz.apache.org/bugzilla/show_bug.cgi?id=57676 --- Comment #3 from Violeta Georgieva violet...@apache.org --- Fixed in Tomcat 7 trunk and will be in 7.0.63 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682881 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
Author: violetagg
Date: Mon Jun 1 12:17:00 2015
New Revision: 1682881
URL: http://svn.apache.org/r1682881
Log:
Use the correct constant.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java?rev=1682881r1=1682880r2=1682881view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
Mon Jun 1 12:17:00 2015
@@ -50,8 +50,8 @@ import org.apache.tomcat.websocket.pojo.
public class UpgradeUtil {
-private static final StringManager sm =
-StringManager.getManager(Constants.PACKAGE_NAME);
+private static final StringManager sm = StringManager
+
.getManager(org.apache.tomcat.websocket.server.Constants.PACKAGE_NAME);
private static final byte[] WS_ACCEPT =
258EAFA5-E914-47DA-95CA-C5AB0DC85B11.getBytes(
StandardCharsets.ISO_8859_1);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57977] New: The original class loader isn't re-bound to the thread in PersistentValve.invoke()
https://bz.apache.org/bugzilla/show_bug.cgi?id=57977 Bug ID: 57977 Summary: The original class loader isn't re-bound to the thread in PersistentValve.invoke() Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: nakamura.kyohei@gmail.com Created attachment 32769 -- https://bz.apache.org/bugzilla/attachment.cgi?id=32769action=edit patch against trunk In PersistentValve.invoke(Request, Response) method, The Webapp class loader has been bound to the current thread. However, the original class loader that had been used before bind isn't restored to the thread. The original class loader should be re-bound to the thread. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682847 - in /tomcat/trunk/java/org/apache/coyote/http2: ConnectionPrefaceParser.java Http2Protocol.java Http2UpgradeHandler.java LocalStrings.properties
Author: markt
Date: Mon Jun 1 09:24:58 2015
New Revision: 1682847
URL: http://svn.apache.org/r1682847
Log:
Remove the (overly complex) ConnectionPrefaceParser and use the new Http2Parser
instead.
Initial unit tests identified a need to be able to set timeouts. Provide the
ability to set these when configuring the UpgradeProtocol and take a first stab
at some defaults (10s within an HTTP/2 frame, 30s between frames).
Removed:
tomcat/trunk/java/org/apache/coyote/http2/ConnectionPrefaceParser.java
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java?rev=1682847r1=1682846r2=1682847view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java Mon Jun 1
09:24:58 2015
@@ -32,6 +32,11 @@ public class Http2Protocol implements Up
private static final String ALPN_NAME = h2;
private static final byte[] ALPN_IDENTIFIER =
ALPN_NAME.getBytes(StandardCharsets.UTF_8);
+// All timeouts in milliseconds
+private long readTimeout = 1;
+private long keepAliveTimeout = 3;
+private long writeTimeout = 1;
+
@Override
public String getHttpUpgradeName(boolean isSecure) {
if (isSecure) {
@@ -62,6 +67,42 @@ public class Http2Protocol implements Up
@Override
public InternalHttpUpgradeHandler getInteralUpgradeHandler(Adapter adapter,
Request coyoteRequest) {
-return new Http2UpgradeHandler(adapter, coyoteRequest);
+Http2UpgradeHandler result = new Http2UpgradeHandler(adapter,
coyoteRequest);
+
+result.setReadTimeout(getReadTimeout());
+result.setKeepAliveTimeout(getKeepAliveTimeout());
+result.setWriteTimeout(getWriteTimeout());
+
+return result;
+}
+
+
+public long getReadTimeout() {
+return readTimeout;
+}
+
+
+public void setReadTimeout(long readTimeout) {
+this.readTimeout = readTimeout;
+}
+
+
+public long getKeepAliveTimeout() {
+return keepAliveTimeout;
+}
+
+
+public void setKeepAliveTimeout(long keepAliveTimeout) {
+this.keepAliveTimeout = keepAliveTimeout;
+}
+
+
+public long getWriteTimeout() {
+return writeTimeout;
+}
+
+
+public void setWriteTimeout(long writeTimeout) {
+this.writeTimeout = writeTimeout;
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1682847r1=1682846r2=1682847view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Mon Jun
1 09:24:58 2015
@@ -32,10 +32,12 @@ import java.util.concurrent.atomic.Atomi
import javax.servlet.http.WebConnection;
import org.apache.coyote.Adapter;
+import org.apache.coyote.ProtocolException;
import org.apache.coyote.Request;
import org.apache.coyote.Response;
import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler;
import org.apache.coyote.http2.HpackEncoder.State;
+import org.apache.coyote.http2.Http2Parser.Input;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.codec.binary.Base64;
@@ -68,7 +70,8 @@ import org.apache.tomcat.util.res.String
*
* TODO: Review cookie parsing
*/
-public class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeHandler {
+public class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeHandler,
+Input {
private static final Log log =
LogFactory.getLog(Http2UpgradeHandler.class);
private static final StringManager sm =
StringManager.getManager(Http2UpgradeHandler.class);
@@ -104,9 +107,9 @@ public class Http2UpgradeHandler extends
private volatile SocketWrapperBase? socketWrapper;
private volatile SSLSupport sslSupport;
+private volatile Http2Parser parser;
+
private volatile boolean initialized = false;
-private volatile ConnectionPrefaceParser connectionPrefaceParser =
-new ConnectionPrefaceParser();
private volatile boolean firstFrame = true;
private final ConnectionSettings remoteSettings = new ConnectionSettings();
@@ -117,6 +120,11 @@ public class Http2UpgradeHandler extends
private ByteBuffer headerReadBuffer = ByteBuffer.allocate(1024);
private HpackEncoder hpackEncoder;
+//
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1298 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] 1682843 Blamelist: kkolinko,markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682868 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Author: violetagg Date: Mon Jun 1 10:37:49 2015 New Revision: 1682868 URL: http://svn.apache.org/r1682868 Log: Merged revision 1669370 from tomcat/trunk: Use constants for constant byte arrays. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 1 10:37:49 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,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 -/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
[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio2 has an issue affecting its community integration. This issue affects 1 projects, 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-trunk-test-nio2 : 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-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 41 mins 36 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.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150601-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150601.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150601-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20150601/bi n/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-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/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/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat
svn commit: r1682846 - in /tomcat/tc8.0.x/trunk: ./ build.properties.default webapps/docs/changelog.xml
Author: kkolinko Date: Mon Jun 1 09:21:41 2015 New Revision: 1682846 URL: http://svn.apache.org/r1682846 Log: Update to Checkstyle 6.7 Merged r1682842 from tomcat/trunk. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/build.properties.default tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 1 09:21:41 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,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,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,1657609,1657682,1657 907,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,137,149,1 666757,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330
[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 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-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 failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs 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: 32 mins 11 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.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150601-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20150601/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150601.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150601-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-20150601/bin/openssl -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-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/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/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat
svn commit: r1682840 - /tomcat/trunk/java/org/apache/coyote/ProtocolException.java
Author: markt
Date: Mon Jun 1 09:12:09 2015
New Revision: 1682840
URL: http://svn.apache.org/r1682840
Log:
New exception intended to be used when a protocol error occurs (e.g. client
sent bad data) and we need to close the connection but we can't throw an
unchecked exception (e.g. HttpUpgradeHandler.init()).
Having a dedicated exception will allow this to be caught in the
ConnectionHandler and silently (well logged at debug level) caught without
filling the logs with exceptions every time a client does something wrong.
Added:
tomcat/trunk/java/org/apache/coyote/ProtocolException.java (with props)
Added: tomcat/trunk/java/org/apache/coyote/ProtocolException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ProtocolException.java?rev=1682840view=auto
==
--- tomcat/trunk/java/org/apache/coyote/ProtocolException.java (added)
+++ tomcat/trunk/java/org/apache/coyote/ProtocolException.java Mon Jun 1
09:12:09 2015
@@ -0,0 +1,42 @@
+/*
+ * 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.coyote;
+
+/**
+ * Used when we need to indicate failure but the (Servlet) API doesn't declare
+ * any appropriate exceptions.
+ */
+public class ProtocolException extends RuntimeException {
+
+private static final long serialVersionUID = 1L;
+
+public ProtocolException() {
+super();
+}
+
+public ProtocolException(String message, Throwable cause) {
+super(message, cause);
+}
+
+public ProtocolException(String message) {
+super(message);
+}
+
+public ProtocolException(Throwable cause) {
+super(cause);
+}
+}
Propchange: tomcat/trunk/java/org/apache/coyote/ProtocolException.java
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682842 - /tomcat/trunk/build.properties.default
Author: kkolinko
Date: Mon Jun 1 09:17:06 2015
New Revision: 1682842
URL: http://svn.apache.org/r1682842
Log:
Update to Checkstyle 6.7
Modified:
tomcat/trunk/build.properties.default
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1682842r1=1682841r2=1682842view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jun 1 09:17:06 2015
@@ -207,7 +207,7 @@ objenesis.loc=https://objenesis.googleco
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
# - Checkstyle, version 6.0 or later -
-checkstyle.version=6.6
+checkstyle.version=6.7
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
-
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
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/1299 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] 1682848 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
svn commit: r1682841 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java LocalStrings.properties
Author: markt
Date: Mon Jun 1 09:13:00 2015
New Revision: 1682841
URL: http://svn.apache.org/r1682841
Log:
Add handling for the new (and as yet unused) exception.
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1682841r1=1682840r2=1682841view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Jun 1
09:13:00 2015
@@ -804,6 +804,11 @@ public abstract class AbstractProtocolS
// IOExceptions are normal
getLog().debug(sm.getString(
abstractConnectionHandler.ioexception.debug), e);
+} catch (ProtocolException e) {
+// Protocol exceptions normally mean the client sent invalid or
+// incomplete data.
+getLog().debug(sm.getString(
+abstractConnectionHandler.protocolexception.debug),
e);
}
// Future developers: if you discover any other
// rare-but-nonfatal exceptions, catch them here, and log as
Modified: tomcat/trunk/java/org/apache/coyote/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/LocalStrings.properties?rev=1682841r1=1682840r2=1682841view=diff
==
--- tomcat/trunk/java/org/apache/coyote/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings.properties Mon Jun 1
09:13:00 2015
@@ -14,6 +14,7 @@
# limitations under the License.
abstractConnectionHandler.error=Error reading request, ignored
abstractConnectionHandler.ioexception.debug=IOExceptions are normal, ignored
+abstractConnectionHandler.protocolexception.debug=ProtocolExceptions are
normal, ignored
abstractConnectionHandler.socketexception.debug=SocketExceptions are normal,
ignored
abstractConnectionHandler.negotiatedProcessor.fail=Failed to create Processor
for negotiated protocol [{0}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682848 - in /tomcat/trunk/test/org/apache/coyote/http2: TestHttp2Base.java TestHttp2Section_3_2.java TestHttp2Section_3_2_1.java
Author: markt
Date: Mon Jun 1 09:26:13 2015
New Revision: 1682848
URL: http://svn.apache.org/r1682848
Log:
Start to provide unit tests for the HTTP/2 implementation.
Added:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Base.java (with props)
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java (with
props)
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2_1.java
(with props)
Added: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Base.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Base.java?rev=1682848view=auto
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Base.java (added)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Base.java Mon Jun 1
09:26:13 2015
@@ -0,0 +1,154 @@
+/*
+ * 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.coyote.http2;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.nio.charset.StandardCharsets;
+
+import javax.net.SocketFactory;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Before;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.connector.Connector;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.codec.binary.Base64;
+
+
+/**
+ * Tests for compliance with the a href=https://tools.ietf.org/html/rfc7540;
+ * HTTP/2 specification/a.
+ */
+public abstract class TestHttp2Base extends TomcatBaseTest {
+
+private static final String HTTP2_SETTINGS;
+
+static {
+byte[] empty = new byte[0];
+HTTP2_SETTINGS = Base64.encodeBase64String(empty);
+}
+
+private Socket s;
+protected Http2Parser parser;
+protected OutputStream os;
+
+
+@Before
+public void setup() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+// Enable HTTP/2
+Connector connector = tomcat.getConnector();
+Http2Protocol http2Protocol = new Http2Protocol();
+// Short timeouts for now. May need to increase these for CI systems.
+http2Protocol.setReadTimeout(2000);
+http2Protocol.setKeepAliveTimeout(5000);
+http2Protocol.setWriteTimeout(2000);
+connector.addUpgradeProtocol(http2Protocol);
+
+// Add a web application
+Context ctxt = tomcat.addContext(, null);
+Tomcat.addServlet(ctxt, simple, new SimpleServlet());
+ctxt.addServletMapping(/*, simple);
+
+// Start the Tomcat instance
+tomcat.start();
+
+// Open a connection
+s = SocketFactory.getDefault().createSocket(localhost, getPort());
+s.setSoTimeout(3);
+
+os = s.getOutputStream();
+InputStream is = s.getInputStream();
+
+TestInput testInput = new TestInput(is);
+parser = new Http2Parser(testInput);
+}
+
+
+protected void doHttpUpgrade() throws IOException {
+byte[] upgradeRequest = (GET / HTTP/1.1\r\n +
+Host: localhost: + getPort() + \r\n +
+Connection: Upgrade, HTTP2-Settings\r\n +
+Upgrade: h2c\r\n +
+HTTP2-Settings: + HTTP2_SETTINGS + \r\n +
+\r\n).getBytes(StandardCharsets.ISO_8859_1);
+os.write(upgradeRequest);
+os.flush();
+
+Assert.assertTrue(Failed to read HTTP Upgrade response,
parser.readHttpUpgradeResponse());
+
+}
+
+
+private static class TestInput implements Http2Parser.Input {
+
+private final InputStream is;
+
+
+public TestInput(InputStream is) {
+this.is = is;
+}
+
+
+@Override
+public boolean fill(byte[] data, boolean block) throws IOException {
+// Note: Block is ignored for this test class. Reads always block.
+int off = 0;
+int len = data.length;
+while (len 0) {
+
svn commit: r1682925 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/PerMessageDeflate.java
Author: violetagg Date: Mon Jun 1 15:04:49 2015 New Revision: 1682925 URL: http://svn.apache.org/r1682925 Log: Merged revisions 1630210, 1630375 from tomcat/trunk: - Correct logic (error detected by Autobahn test suite) - Window size validation needs to vary for client vs server as well Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 1 15:04:49 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,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 -/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
svn commit: r1682928 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/LocalStrings.properties java/org/apache/tomcat/websocket/WsFrameClient.java
Author: violetagg Date: Mon Jun 1 15:11:44 2015 New Revision: 1682928 URL: http://svn.apache.org/r1682928 Log: Merged revision 1630203 from tomcat/trunk: Add debug logging for IOEs while reading data from server Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 1 15:11:44 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,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 -/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
[Bug 57982] build.xml assumes Javadoc 7+ is used but does not check this
https://bz.apache.org/bugzilla/show_bug.cgi?id=57982 --- Comment #1 from Sebb s...@apache.org --- (In reply to Sebb from comment #0) The build file in Tomcat 6 forces the use of Java 7 for running javadoc. s/6/7/ The build.xml file for Tomcat 9 (and 8) assumes that javadoc 7+ will be used (and so, like TC6, does not apply any fix for CVE-2013-1571). s/TC6/TC7/ -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57982] build.xml assumes Javadoc 7+ is used but does not check this
https://bz.apache.org/bugzilla/show_bug.cgi?id=57982 Mark Thomas ma...@apache.org changed: What|Removed |Added Resolution|--- |WONTFIX Status|NEW |RESOLVED --- Comment #3 from Mark Thomas ma...@apache.org --- The minimum Java version is documented. If folks want to jump through the hoops they'd have to jump through to do this (and do so using a non-supported version of Java) then they should be prepared to deal with the consequences. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57982] build.xml assumes Javadoc 7+ is used but does not check this
https://bz.apache.org/bugzilla/show_bug.cgi?id=57982 --- Comment #2 from Sebb s...@apache.org --- Possible solution: add the following to any tasks that run javadoc: available property=jdk1.7+ classname=java.lang.AutoCloseable/ fail unless=jdk1.7+ message=Must use Java 7 or later for creating the Javadocs/ -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57980] New: After submitting a multipart form-data, if the Http request object is not parsed and return from server without parsing, causes browser crashed ('program cannot display the webpage' m
https://bz.apache.org/bugzilla/show_bug.cgi?id=57980
Bug ID: 57980
Summary: After submitting a multipart form-data, if the Http
request object is not parsed and return from server
without parsing, causes browser crashed ('program
cannot display the webpage' message gets displayed
from browser).
Product: Tomcat 7
Version: 7.0.62
Hardware: PC
Status: NEW
Severity: blocker
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: pgarnaik.wo...@gmail.com
In a jsp, a form is created with enctype=multipart/form-data. we submit the
form
after uploading a file (say of size 10MB) to a servlet (jdk 1.7u80).
In servlet.doPost() followings code snippet is written to validate the max file
size that can be uploaded and if size exceed a fixed limit servlet redirects
control to a the same jsp page without parsing the multipart request.
long contentLength = request.getContentLength();
long uploadFileSize = 100;
if(contentLength uploadFileSize){
getServletContext().getRequestDispatcher(/upload.jsp).forward(request,
response);
return;
}
-
This code causes browser crashed and a message 'Program cannot display the
webpage' gets displayed by the browser to user.
This problem got resolved if we parse the request object before redirecting as
below.
org.apache.commons.fileupload.servlet.ServletFileUpload.parse(request);
However it causes performance issue.
Note: This problem is not there with Tomcat6 and jdk1.5 .
Additional Detail: Servlet 2.5 , JSP 2.1 and jdk1.7u80
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682922 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/ java/org/apache/tomcat/websocket/server/ test/org/apache/tomcat/websocket/ webapps/docs/
Author: violetagg Date: Mon Jun 1 14:58:45 2015 New Revision: 1682922 URL: http://svn.apache.org/r1682922 Log: Merged revisions 1630065, 1630092 from tomcat/trunk: - Extend support for permessage-deflate to the WebSocket client implementation. - Correct type as spotted by Martin Grigorov Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Constants.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/TransformationFactory.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 1 14:58:45 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,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 -/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
[Bug 57977] The original class loader isn't re-bound to the thread in PersistentValve.invoke()
https://bz.apache.org/bugzilla/show_bug.cgi?id=57977 Christopher Schultz ch...@christopherschultz.net changed: What|Removed |Added Keywords||PatchAvailable -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57982] New: build.xml assumes Javadoc 7+ is used but does not check this
https://bz.apache.org/bugzilla/show_bug.cgi?id=57982 Bug ID: 57982 Summary: build.xml assumes Javadoc 7+ is used but does not check this Product: Tomcat 9 Version: unspecified Hardware: All OS: All Status: NEW Severity: minor Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: s...@apache.org The build file in Tomcat 6 forces the use of Java 7 for running javadoc. The build.xml file for Tomcat 9 (and 8) assumes that javadoc 7+ will be used (and so, like TC6, does not apply any fix for CVE-2013-1571). However the build file does not check that a suitable version of javadoc is being used. Although it is not possible to compile these versions of Tomcat using Java 6, it is possible to use Java 6 to create the javadoc. This is a slightly unlikely scenario, but it might still be worth adding a java version check. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57977] The original class loader isn't re-bound to the thread in PersistentValve.invoke()
https://bz.apache.org/bugzilla/show_bug.cgi?id=57977 --- Comment #1 from Christopher Schultz ch...@christopherschultz.net --- Would it be possible to revert the changes (likely whitespace) that don't affect the code at all? It would make for a much cleaner and readable diff. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57980] After submitting a multipart form-data, if the Http request object is not parsed and return from server without parsing, causes browser crashed ('program cannot display the webpage' messag
https://bz.apache.org/bugzilla/show_bug.cgi?id=57980 Christopher Schultz ch...@christopherschultz.net changed: What|Removed |Added Resolution|--- |INVALID OS||All Status|NEW |RESOLVED --- Comment #1 from Christopher Schultz ch...@christopherschultz.net --- A few comments: 1. The browser has not crashed. 2. You are not redirecting anything. Please post to the users' list with your question. If this turns out to be a bug, feel free to REOPEN this issue. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682963 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/Constants.java java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Author: violetagg Date: Mon Jun 1 17:54:50 2015 New Revision: 1682963 URL: http://svn.apache.org/r1682963 Log: Merged revision 1642327 from tomcat/trunk: Make use of the new case-insensitive map implementation. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Constants.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 1 17:54:50 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,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 -/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
svn commit: r1682984 - in /tomcat/trunk: java/org/apache/coyote/http2/ test/org/apache/coyote/http2/
Author: markt
Date: Mon Jun 1 20:03:13 2015
New Revision: 1682984
URL: http://svn.apache.org/r1682984
Log:
Fix an overflow issue in 4 byte to unsigned integer conversion (needed to be a
long).
Fix a related TODO in ConnectionSettings
Added:
tomcat/trunk/test/org/apache/coyote/http2/TestByteUtil.java (with props)
Modified:
tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java?rev=1682984r1=1682983r2=1682984view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java Mon Jun 1 20:03:13
2015
@@ -68,8 +68,8 @@ public class ByteUtil {
}
-public static int getFourBytes(byte[] input, int firstByte) {
-return ((input[firstByte] 0xFF) 24) + ((input[firstByte + 1]
0xFF) 16) +
+public static long getFourBytes(byte[] input, int firstByte) {
+return ((long)(input[firstByte] 0xFF) 24) + ((input[firstByte +
1] 0xFF) 16) +
((input[firstByte + 2] 0xFF) 8) + (input[firstByte + 3]
0xFF);
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java?rev=1682984r1=1682983r2=1682984view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java Mon Jun
1 20:03:13 2015
@@ -28,20 +28,19 @@ public class ConnectionSettings {
private final StringManager sm =
StringManager.getManager(ConnectionSettings.class);
public static final int DEFAULT_WINDOW_SIZE = (1 16) - 1;
-// TODO: The maximum allowed in a settings frame as 2^32 (unsigned)
-private static final int UNLIMITED = (1 31) -1; // Use the maximum
possible
+private static final long UNLIMITED = ((long)1 32); // Use the maximum
possible
private static final int MAX_WINDOW_SIZE = (1 31) - 1;
private static final int MIN_MAX_FRAME_SIZE = 1 14;
private static final int MAX_MAX_FRAME_SIZE = (1 24) - 1;
private volatile int headerTableSize = 4096;
-private volatile int enablePush = 1;
-private volatile int maxConcurrentStreams = UNLIMITED;
+private volatile boolean enablePush = true;
+private volatile long maxConcurrentStreams = UNLIMITED;
private volatile int initialWindowSize = DEFAULT_WINDOW_SIZE;
private volatile int maxFrameSize = MIN_MAX_FRAME_SIZE;
-private volatile int maxHeaderListSize = UNLIMITED;
+private volatile long maxHeaderListSize = UNLIMITED;
-public void set(int parameterId, int value) throws IOException {
+public void set(int parameterId, long value) throws IOException {
if (log.isDebugEnabled()) {
log.debug(sm.getString(connectionSettings.debug,
Integer.toString(parameterId), Long.toString(value)));
@@ -77,29 +76,34 @@ public class ConnectionSettings {
public int getHeaderTableSize() {
return headerTableSize;
}
-public void setHeaderTableSize(int headerTableSize) {
-this.headerTableSize = headerTableSize;
+public void setHeaderTableSize(long headerTableSize) throws IOException {
+// Need to put a sensible limit on this. Start with 16k (default is 4k)
+if (headerTableSize (16 * 1024)) {
+throw new
Http2Exception(sm.getString(connectionSettings.headerTableSizeLimit,
+Long.toString(headerTableSize)), 0,
Http2Exception.PROTOCOL_ERROR);
+}
+this.headerTableSize = (int) headerTableSize;
}
-public int getEnablePush() {
+public boolean getEnablePush() {
return enablePush;
}
-public void setEnablePush(int enablePush) throws IOException {
+public void setEnablePush(long enablePush) throws IOException {
// Can't be less than zero since the result of the byte-long
conversion
// will never be negative
if (enablePush 1) {
throw new
Http2Exception(sm.getString(connectionSettings.enablePushInvalid,
Long.toString(enablePush)), 0,
Http2Exception.PROTOCOL_ERROR);
}
-this.enablePush = enablePush;
+this.enablePush = (enablePush == 1);
}
-public int getMaxConcurrentStreams() {
+public long getMaxConcurrentStreams() {
return maxConcurrentStreams;
}
-public void setMaxConcurrentStreams(int
svn commit: r1682989 - /tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Author: markt
Date: Mon Jun 1 20:10:30 2015
New Revision: 1682989
URL: http://svn.apache.org/r1682989
Log:
Format
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1682989r1=1682988r2=1682989view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Mon Jun 1 20:10:30
2015
@@ -118,7 +118,7 @@ public class Stream extends AbstractStre
@Override
public void emitHeader(String name, String value, boolean neverIndex) {
if (log.isDebugEnabled()) {
-log.debug(sm.getString(stream.header.debug,getConnectionId(),
getIdentifier(),
+log.debug(sm.getString(stream.header.debug, getConnectionId(),
getIdentifier(),
name, value));
}
@@ -169,7 +169,7 @@ public class Stream extends AbstractStre
void flushData() {
if (log.isDebugEnabled()) {
-log.debug(sm.getString(stream.write,getConnectionId(),
getIdentifier()));
+log.debug(sm.getString(stream.write, getConnectionId(),
getIdentifier()));
}
try {
outputBuffer.flush();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682991 - in /tomcat/trunk: java/org/apache/coyote/http2/Http2Parser.java java/org/apache/coyote/http2/Http2UpgradeHandler.java test/org/apache/coyote/http2/Http2TestBase.java test/org/ap
Author: markt
Date: Mon Jun 1 20:15:46 2015
New Revision: 1682991
URL: http://svn.apache.org/r1682991
Log:
Make fill() consistent with other read methods
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1682991r1=1682990r2=1682991view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Mon Jun 1
20:15:46 2015
@@ -51,7 +51,7 @@ class Http2Parser {
* @throws IOException If an IO error occurs while trying to read a frame
*/
public void readFrame(boolean block) throws IOException {
-input.fill(frameHeaderBuffer, block);
+input.fill(block, frameHeaderBuffer);
// TODO: This is incomplete
}
@@ -69,7 +69,7 @@ class Http2Parser {
byte[] data = new byte[CLIENT_PREFACE_START.length];
try {
-input.fill(data, true);
+input.fill(true, data);
} catch (IOException ioe) {
if (log.isDebugEnabled()) {
log.debug(sm.getString(http2Parser.preface.io), ioe);
@@ -102,9 +102,9 @@ class Http2Parser {
* no data is available. If any data is available then the buffer will
* be filled with blocking I/O.
*
- * @param data Buffer to fill
* @param block Should the first read into the provided buffer be a
* blocking read or not.
+ * @param data Buffer to fill
*
* @return codetrue/code if the buffer was filled otherwise
* codefalse/code
@@ -112,6 +112,6 @@ class Http2Parser {
* @throws IOException If an I/O occurred while obtaining data with
* which to fill the buffer
*/
-boolean fill(byte[] data, boolean block) throws IOException;
+boolean fill(boolean block, byte[] data) throws IOException;
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1682991r1=1682990r2=1682991view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Mon Jun
1 20:15:46 2015
@@ -1077,7 +1077,7 @@ public class Http2UpgradeHandler extends
// --- Http2Parser.Input
methods
@Override
-public boolean fill(byte[] data, boolean block) throws IOException {
+public boolean fill(boolean block, byte[] data) throws IOException {
int len = data.length;
int pos = 0;
boolean nextReadBlock = block;
Modified: tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java?rev=1682991r1=1682990r2=1682991view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Mon Jun 1
20:15:46 2015
@@ -140,7 +140,7 @@ public abstract class Http2TestBase exte
// Looking for \r\n\r\n
int seen = 0;
while (seen 4) {
-input.fill(singleByte, true);
+input.fill(true, singleByte);
switch (seen) {
case 0:
case 2: {
@@ -186,7 +186,7 @@ public abstract class Http2TestBase exte
@Override
-public boolean fill(byte[] data, boolean block) throws IOException {
+public boolean fill(boolean block, byte[] data) throws IOException {
// Note: Block is ignored for this test class. Reads always block.
int off = 0;
int len = data.length;
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java?rev=1682991r1=1682990r2=1682991view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java Mon Jun
1 20:15:46 2015
@@ -134,7 +134,7 @@ public class TestHttp2Section_3_2 extend
}
int len
svn commit: r1682977 - in /tomcat/trunk/java/org/apache/coyote/http2: AbstractStream.java Http2UpgradeHandler.java Stream.java
Author: markt
Date: Mon Jun 1 19:32:34 2015
New Revision: 1682977
URL: http://svn.apache.org/r1682977
Log:
Store connectionId as a string so it is only converted once (it is only ever
used in String form)
Modified:
tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java?rev=1682977r1=1682976r2=1682977view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java Mon Jun 1
19:32:34 2015
@@ -107,7 +107,7 @@ abstract class AbstractStream {
protected abstract Log getLog();
-protected abstract int getConnectionId();
+protected abstract String getConnectionId();
protected abstract int getWeight();
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1682977r1=1682976r2=1682977view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Mon Jun
1 19:32:34 2015
@@ -101,7 +101,7 @@ public class Http2UpgradeHandler extends
private static final byte[] HTTP2_UPGRADE_ACK = (HTTP/1.1 101 Switching
Protocols\r\n +
Connection: Upgrade\r\nUpgrade:
h2c\r\n\r\n).getBytes(StandardCharsets.ISO_8859_1);
-private final int connectionId;
+private final String connectionId;
private final Adapter adapter;
private volatile SocketWrapperBase? socketWrapper;
@@ -136,7 +136,7 @@ public class Http2UpgradeHandler extends
public Http2UpgradeHandler(Adapter adapter, Request coyoteRequest) {
super (STREAM_ID_ZERO);
this.adapter = adapter;
-this.connectionId = connectionIdGenerator.getAndIncrement();
+this.connectionId =
Integer.toString(connectionIdGenerator.getAndIncrement());
// Initial HTTP request becomes stream 0.
if (coyoteRequest != null) {
@@ -151,7 +151,7 @@ public class Http2UpgradeHandler extends
@Override
public void init(WebConnection webConnection) {
if (log.isDebugEnabled()) {
-log.debug(sm.getString(upgradeHandler.init,
Long.toString(connectionId)));
+log.debug(sm.getString(upgradeHandler.init, connectionId));
}
parser = new Http2Parser(this);
@@ -234,8 +234,7 @@ public class Http2UpgradeHandler extends
@Override
public SocketState upgradeDispatch(SocketStatus status) {
if (log.isDebugEnabled()) {
-log.debug(sm.getString(upgradeHandler.upgradeDispatch.entry,
-Long.toString(connectionId), status));
+log.debug(sm.getString(upgradeHandler.upgradeDispatch.entry,
connectionId, status));
}
if (!initialized) {
@@ -269,8 +268,7 @@ public class Http2UpgradeHandler extends
}
} catch (IOException ioe) {
if (log.isDebugEnabled()) {
-log.debug(sm.getString(upgradeHandler.ioerror,
-Long.toString(connectionId)), ioe);
+log.debug(sm.getString(upgradeHandler.ioerror,
connectionId), ioe);
}
close();
result = SocketState.CLOSED;
@@ -295,8 +293,7 @@ public class Http2UpgradeHandler extends
}
} catch (IOException ioe) {
if (log.isDebugEnabled()) {
-log.debug(sm.getString(upgradeHandler.ioerror,
-Long.toString(connectionId)), ioe);
+log.debug(sm.getString(upgradeHandler.ioerror,
connectionId), ioe);
}
close();
result = SocketState.CLOSED;
@@ -326,8 +323,7 @@ public class Http2UpgradeHandler extends
}
if (log.isDebugEnabled()) {
-log.debug(sm.getString(upgradeHandler.upgradeDispatch.exit,
-Long.toString(connectionId), result));
+log.debug(sm.getString(upgradeHandler.upgradeDispatch.exit,
connectionId, result));
}
return result;
}
@@ -376,9 +372,9 @@ public class Http2UpgradeHandler extends
private void processFrameData(int flags, int streamId, int payloadSize)
throws IOException {
if (log.isDebugEnabled()) {
-log.debug(sm.getString(upgradeHandler.processFrame,
-Long.toString(connectionId), Integer.toString(streamId),
-
svn commit: r1682985 - /tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
Author: markt
Date: Mon Jun 1 20:07:03 2015
New Revision: 1682985
URL: http://svn.apache.org/r1682985
Log:
Use a constant for the default max frame size
Modified:
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java?rev=1682985r1=1682984r2=1682985view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java Mon Jun
1 20:07:03 2015
@@ -30,14 +30,16 @@ public class ConnectionSettings {
public static final int DEFAULT_WINDOW_SIZE = (1 16) - 1;
private static final long UNLIMITED = ((long)1 32); // Use the maximum
possible
private static final int MAX_WINDOW_SIZE = (1 31) - 1;
+
private static final int MIN_MAX_FRAME_SIZE = 1 14;
private static final int MAX_MAX_FRAME_SIZE = (1 24) - 1;
+private static final int DEFAULT_MAX_FRAME_SIZE = MIN_MAX_FRAME_SIZE;
private volatile int headerTableSize = 4096;
private volatile boolean enablePush = true;
private volatile long maxConcurrentStreams = UNLIMITED;
private volatile int initialWindowSize = DEFAULT_WINDOW_SIZE;
-private volatile int maxFrameSize = MIN_MAX_FRAME_SIZE;
+private volatile int maxFrameSize = DEFAULT_MAX_FRAME_SIZE;
private volatile long maxHeaderListSize = UNLIMITED;
public void set(int parameterId, long value) throws IOException {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682990 - /tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Author: markt
Date: Mon Jun 1 20:12:37 2015
New Revision: 1682990
URL: http://svn.apache.org/r1682990
Log:
If a write fills the buffer exactly, flush shouldn't empty it. It might be the
last write of the response and if we flush we'll need to send an empty data
frame later with end of stream set rather than setting end of stream on the
frame that sends the full buffer.
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1682990r1=1682989r2=1682990view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Mon Jun 1 20:12:37
2015
@@ -243,7 +243,9 @@ public class Stream extends AbstractStre
buffer.put(chunk.getBytes(), chunk.getOffset() + offset,
thisTime);
offset += thisTime;
len -= thisTime;
-if (!buffer.hasRemaining()) {
+if (len 0 !buffer.hasRemaining()) {
+// Only flush if we have more data to write and the buffer
+// is full
flush();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1683000 - /tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
Author: markt
Date: Mon Jun 1 20:51:15 2015
New Revision: 1683000
URL: http://svn.apache.org/r1683000
Log:
Remove unwanted space from client preface start
Make package private to enable re-use in testing
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1683000r1=1682999r2=1683000view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Mon Jun 1
20:51:15 2015
@@ -28,8 +28,8 @@ class Http2Parser {
private static final Log log = LogFactory.getLog(Http2Parser.class);
private static final StringManager sm =
StringManager.getManager(Http2Parser.class);
-private static final byte[] CLIENT_PREFACE_START =
-PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n
.getBytes(StandardCharsets.ISO_8859_1);
+static final byte[] CLIENT_PREFACE_START =
+PRI *
HTTP/2.0\r\n\r\nSM\r\n\r\n.getBytes(StandardCharsets.ISO_8859_1);
private final Input input;
private final byte[] frameHeaderBuffer = new byte[9];
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1683006 - in /tomcat/trunk: java/org/apache/coyote/http2/ test/org/apache/coyote/http2/
Author: markt
Date: Mon Jun 1 21:11:48 2015
New Revision: 1683006
URL: http://svn.apache.org/r1683006
Log:
Add a unit request for a complete HTTP/1.1 request with upgrade to HTTP/2
response.
Expand (most copy/paste Http2UpgradeHandler) the Http2Parser to support the
additional frame types required.
Eventually, the parsing code will move from Http2UpgradeHandler to Http2Parser
Modified:
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java?rev=1683006r1=1683005r2=1683006view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java Mon Jun
1 21:11:48 2015
@@ -33,7 +33,7 @@ public class ConnectionSettings {
private static final int MIN_MAX_FRAME_SIZE = 1 14;
private static final int MAX_MAX_FRAME_SIZE = (1 24) - 1;
-private static final int DEFAULT_MAX_FRAME_SIZE = MIN_MAX_FRAME_SIZE;
+static final int DEFAULT_MAX_FRAME_SIZE = MIN_MAX_FRAME_SIZE;
private volatile int headerTableSize = 4096;
private volatile boolean enablePush = true;
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1683006r1=1683005r2=1683006view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Mon Jun 1
21:11:48 2015
@@ -17,13 +17,15 @@
package org.apache.coyote.http2;
import java.io.IOException;
+import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
+import org.apache.coyote.http2.HpackDecoder.HeaderEmitter;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
-class Http2Parser {
+class Http2Parser implements HeaderEmitter {
private static final Log log = LogFactory.getLog(Http2Parser.class);
private static final StringManager sm =
StringManager.getManager(Http2Parser.class);
@@ -31,13 +33,26 @@ class Http2Parser {
static final byte[] CLIENT_PREFACE_START =
PRI *
HTTP/2.0\r\n\r\nSM\r\n\r\n.getBytes(StandardCharsets.ISO_8859_1);
+private static final int FRAME_TYPE_DATA = 0;
+private static final int FRAME_TYPE_HEADERS = 1;
+private static final int FRAME_TYPE_SETTINGS = 4;
+
+private final String connectionId;
private final Input input;
+private final Output output;
private final byte[] frameHeaderBuffer = new byte[9];
+private volatile HpackDecoder hpackDecoder;
+private final ByteBuffer headerReadBuffer = ByteBuffer.allocate(1024);
+
private volatile boolean readPreface = false;
+private volatile int maxPayloadSize =
ConnectionSettings.DEFAULT_MAX_FRAME_SIZE;
+
-Http2Parser(Input input) {
+Http2Parser(String connectionId, Input input, Output output) {
+this.connectionId = connectionId;
this.input = input;
+this.output = output;
}
@@ -48,12 +63,227 @@ class Http2Parser {
* @param block Should this method block until a frame is available is no
* frame is available immediately?
*
+ * @return codetrue/code if a frame was read otherwise
+ * codefalse/code
+ *
* @throws IOException If an IO error occurs while trying to read a frame
*/
-public void readFrame(boolean block) throws IOException {
-input.fill(block, frameHeaderBuffer);
+boolean readFrame(boolean block) throws IOException {
+if (!input.fill(block, frameHeaderBuffer)) {
+return false;
+}
+
+int payloadSize = ByteUtil.getThreeBytes(frameHeaderBuffer, 0);
+int frameType = ByteUtil.getOneByte(frameHeaderBuffer, 3);
+int flags = ByteUtil.getOneByte(frameHeaderBuffer, 4);
+int streamId = ByteUtil.get31Bits(frameHeaderBuffer, 5);
+
+if (payloadSize maxPayloadSize) {
+throw new Http2Exception(sm.getString(http2Parser.payloadTooBig,
+Integer.toString(payloadSize),
Integer.toString(maxPayloadSize)),
+streamId, Http2Exception.FRAME_SIZE_ERROR);
+}
+
+switch (frameType) {
+case FRAME_TYPE_DATA:
+
svn commit: r1682994 - in /tomcat/trunk: java/org/apache/coyote/http2/Http2Parser.java test/org/apache/coyote/http2/Http2TestBase.java test/org/apache/coyote/http2/TestHttp2Section_3_2.java
Author: markt
Date: Mon Jun 1 20:22:14 2015
New Revision: 1682994
URL: http://svn.apache.org/r1682994
Log:
Various minor clean-ups
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1682994r1=1682993r2=1682994view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Mon Jun 1
20:22:14 2015
@@ -62,7 +62,7 @@ class Http2Parser {
*
* @return codetrue/code if a valid preface was read, otherwise false.
*/
-public boolean readConnectionPreface() {
+boolean readConnectionPreface() {
if (readPreface) {
return true;
}
Modified: tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java?rev=1682994r1=1682993r2=1682994view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Mon Jun 1
20:22:14 2015
@@ -213,13 +213,12 @@ public abstract class Http2TestBase exte
// Generate content with a simple known format.
resp.setContentType(application/octet-stream);
-int count = 16 * 1024;
+int count = 4 * 1024;
// Two bytes per entry
resp.setContentLengthLong(count * 2);
OutputStream os = resp.getOutputStream();
byte[] data = new byte[2];
-// 1024 * 16 * 2 bytes = 32k of content.
for (int i = 0; i count; i++) {
data[0] = (byte) (i 0xFF);
data[1] = (byte) ((i 8) 0xFF);
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java?rev=1682994r1=1682993r2=1682994view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java Mon Jun
1 20:22:14 2015
@@ -138,6 +138,6 @@ public class TestHttp2Section_3_2 extend
return;
}
}
-throw new IOException(No content-length);
+Assert.fail(No content-length);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1682995 - in /tomcat/trunk: java/org/apache/coyote/http2/Http2UpgradeHandler.java test/org/apache/coyote/http2/TestHttp2Section_3_2.java
Author: markt
Date: Mon Jun 1 20:26:40 2015
New Revision: 1682995
URL: http://svn.apache.org/r1682995
Log:
More clean-up
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1682995r1=1682994r2=1682995view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Mon Jun
1 20:26:40 2015
@@ -610,7 +610,7 @@ public class Http2UpgradeHandler extends
socketWrapper.flush(true);
} else {
// This is an ACK.
-// NO-OP (until such time this implementation decides in initiate
+// NO-OP (until such time this implementation decides to initiate
// pings)
}
}
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java?rev=1682995r1=1682994r2=1682995view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_3_2.java Mon Jun
1 20:26:40 2015
@@ -138,6 +138,6 @@ public class TestHttp2Section_3_2 extend
return;
}
}
-Assert.fail(No content-length);
+Assert.fail(No content-length in response);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57977] The original class loader isn't re-bound to the thread in PersistentValve.invoke()
https://bz.apache.org/bugzilla/show_bug.cgi?id=57977 Kyohei Nakamura nakamura.kyohei@gmail.com changed: What|Removed |Added Attachment #32769|0 |1 is obsolete|| --- Comment #2 from Kyohei Nakamura nakamura.kyohei@gmail.com --- Created attachment 32776 -- https://bz.apache.org/bugzilla/attachment.cgi?id=32776action=edit patch(rev.1) against trunk. Thank you for your comment. I attached the patch that ignored whitespace changes. -- 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
