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

[Bill Barker]

To whom it may engage...

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

Project tomcat-trunk-test-apr has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 34 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-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 16 mins 42 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dtest.accesslog=true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170325.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20170325/bin/openssl
 -Dexecute.test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dexecute.test.apr=true -Dexecute.test.nio2=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170325-native-src.tar.gz
 -Dtest.reports=output/logs-APR -Dtomc
 
at-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170325-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20170325/lib 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 

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

[Bill Barker]

To whom it may engage...

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

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


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

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 15 mins 53 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 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170325-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170325.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170325-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-20170325/bin/openssl
 -Dexecute.test.apr=false -Dtest.excludePerformance=true 
-Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 

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

[Bill Barker]

To whom it may engage...

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

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


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

That said, some information snippets are provided here.

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



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

buildbot failure in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1788572
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: r1788573 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/LocalStrings.properties java/org/apache/coyote/http2/Stream.java

[markt]

Author: markt
Date: Sat Mar 25 00:05:14 2017
New Revision: 1788573

URL: http://svn.apache.org/viewvc?rev=1788573=rev
Log:
:method, :scheme and :path are required headers
Found with the h2spec tool written by Moto Ishizawa.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java

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

svn commit: r1788572 - in /tomcat/trunk/java/org/apache/coyote/http2: LocalStrings.properties Stream.java

[markt]

Author: markt
Date: Sat Mar 25 00:04:50 2017
New Revision: 1788572

URL: http://svn.apache.org/viewvc?rev=1788572=rev
Log:
:method, :scheme and :path are required headers
Found with the h2spec tool written by Moto Ishizawa.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http2/Stream.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1788572=1788571=1788572=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Sat Mar 
25 00:04:50 2017
@@ -77,6 +77,7 @@ stream.header.case=Connection [{0}], Str
 stream.header.debug=Connection [{0}], Stream [{1}], HTTP header [{2}], Value 
[{3}]
 stream.header.duplicate=Connection [{0}], Stream [{1}], received multiple 
[{3}] headers
 stream.header.noPath=Connection [{0}], Stream [{1}], The [:path] pseudo header 
was empty
+stream.header.required=Connection [{0}], Stream [{1}], One or more required 
headers was missing
 stream.header.unexpectedPseudoHeader=Connection [{0}], Stream [{1}], Pseudo 
header [{2}] received after a regular header
 stream.header.unknownPseudoHeader=Connection [{0}], Stream [{1}], Unknown 
pseudo header [{2}] received
 stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable

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=1788572=1788571=1788572=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Sat Mar 25 00:04:50 
2017
@@ -350,7 +350,12 @@ class Stream extends AbstractStream impl
 }
 
 
-final boolean receivedEndOfHeaders() {
+final boolean receivedEndOfHeaders() throws ConnectionException {
+if (coyoteRequest.method().isNull() || coyoteRequest.scheme().isNull() 
||
+coyoteRequest.requestURI().isNull()) {
+throw new 
ConnectionException(sm.getString("stream.header.required",
+getConnectionId(), getIdentifier()), 
Http2Error.PROTOCOL_ERROR);
+}
 // Cookie headers need to be concatenated into a single header
 // See RFC 7540 8.1.2.5
 // Can only do this once the headers are fully received



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

svn commit: r1788571 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/LocalStrings.properties java/org/apache/coyote/http2/Stream.java

[markt]

Author: markt
Date: Fri Mar 24 23:59:07 2017
New Revision: 1788571

URL: http://svn.apache.org/viewvc?rev=1788571=rev
Log:
:path header must not be empty
Found with the h2spec tool written by Moto Ishizawa.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java

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

svn commit: r1788570 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/LocalStrings.properties java/org/apache/coyote/http2/Stream.java

[markt]

Author: markt
Date: Fri Mar 24 23:58:49 2017
New Revision: 1788570

URL: http://svn.apache.org/viewvc?rev=1788570=rev
Log:
Header names must be lower case
Found with the h2spec tool written by Moto Ishizawa.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java

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

svn commit: r1788569 - in /tomcat/trunk/java/org/apache/coyote/http2: LocalStrings.properties Stream.java

[markt]

Author: markt
Date: Fri Mar 24 23:58:24 2017
New Revision: 1788569

URL: http://svn.apache.org/viewvc?rev=1788569=rev
Log:
:path header must not be empty
Found with the h2spec tool written by Moto Ishizawa.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http2/Stream.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1788569=1788568=1788569=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Fri Mar 
24 23:58:24 2017
@@ -76,6 +76,7 @@ stream.closed=Connection [{0}], Stream [
 stream.header.case=Connection [{0}], Stream [{1}], HTTP header name [{2}] must 
be in lower case
 stream.header.debug=Connection [{0}], Stream [{1}], HTTP header [{2}], Value 
[{3}]
 stream.header.duplicate=Connection [{0}], Stream [{1}], received multiple 
[{3}] headers
+stream.header.noPath=Connection [{0}], Stream [{1}], The [:path] pseudo header 
was empty
 stream.header.unexpectedPseudoHeader=Connection [{0}], Stream [{1}], Pseudo 
header [{2}] received after a regular header
 stream.header.unknownPseudoHeader=Connection [{0}], Stream [{1}], Unknown 
pseudo header [{2}] received
 stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable

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=1788569=1788568=1788569=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Fri Mar 24 23:58:24 
2017
@@ -272,24 +272,27 @@ class Stream extends AbstractStream impl
 break;
 }
 case ":path": {
-if (coyoteRequest.requestURI().isNull()) {
-int queryStart = value.indexOf('?');
-if (queryStart == -1) {
-coyoteRequest.requestURI().setString(value);
-coyoteRequest.decodedURI().setString(
-coyoteRequest.getURLDecoder().convert(value, 
false));
-} else {
-String uri = value.substring(0, queryStart);
-String query = value.substring(queryStart + 1);
-coyoteRequest.requestURI().setString(uri);
-coyoteRequest.decodedURI().setString(
-coyoteRequest.getURLDecoder().convert(uri, false));
-coyoteRequest.queryString().setString(query);
-}
-} else {
+if (!coyoteRequest.requestURI().isNull()) {
 throw new 
HpackException(sm.getString("stream.header.duplicate",
 getConnectionId(), getIdentifier(), ":path" ));
 }
+if (value.length() == 0) {
+throw new HpackException(sm.getString("stream.header.noPath",
+getConnectionId(), getIdentifier()));
+}
+int queryStart = value.indexOf('?');
+if (queryStart == -1) {
+coyoteRequest.requestURI().setString(value);
+coyoteRequest.decodedURI().setString(
+coyoteRequest.getURLDecoder().convert(value, false));
+} else {
+String uri = value.substring(0, queryStart);
+String query = value.substring(queryStart + 1);
+coyoteRequest.requestURI().setString(uri);
+coyoteRequest.decodedURI().setString(
+coyoteRequest.getURLDecoder().convert(uri, false));
+coyoteRequest.queryString().setString(query);
+}
 break;
 }
 case ":authority": {



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

svn commit: r1788567 - in /tomcat/trunk/java/org/apache/coyote/http2: LocalStrings.properties Stream.java

[markt]

Author: markt
Date: Fri Mar 24 23:55:35 2017
New Revision: 1788567

URL: http://svn.apache.org/viewvc?rev=1788567=rev
Log:
Header names must be lower case
Found with the h2spec tool written by Moto Ishizawa.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http2/Stream.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1788567=1788566=1788567=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Fri Mar 
24 23:55:35 2017
@@ -73,6 +73,7 @@ http2Parser.swallow.debug=Connection [{0
 pingManager.roundTripTime=Connection [{0}] Round trip time measured as [{1}]ns
 
 stream.closed=Connection [{0}], Stream [{1}], Unable to write to stream once 
it has been closed
+stream.header.case=Connection [{0}], Stream [{1}], HTTP header name [{2}] must 
be in lower case
 stream.header.debug=Connection [{0}], Stream [{1}], HTTP header [{2}], Value 
[{3}]
 stream.header.duplicate=Connection [{0}], Stream [{1}], received multiple 
[{3}] headers
 stream.header.unexpectedPseudoHeader=Connection [{0}], Stream [{1}], Pseudo 
header [{2}] received after a regular header

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=1788567=1788566=1788567=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Fri Mar 24 23:55:35 
2017
@@ -22,6 +22,7 @@ import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.Iterator;
+import java.util.Locale;
 
 import org.apache.coyote.ActionCode;
 import org.apache.coyote.CloseNowException;
@@ -226,6 +227,12 @@ class Stream extends AbstractStream impl
 name, value));
 }
 
+// Header names must be lower case
+if (!name.toLowerCase(Locale.US).equals(name)) {
+throw new HpackException(sm.getString("stream.header.case",
+getConnectionId(), getIdentifier(), name));
+}
+
 if (headerStateErrorMsg != null) {
 // Don't bother processing the header since the stream is going to
 // be reset anyway



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

svn commit: r1788561 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2UpgradeHandler.java java/org/apache/coyote/http2/LocalStrings.properties

[markt]

Author: markt
Date: Fri Mar 24 23:07:39 2017
New Revision: 1788561

URL: http://svn.apache.org/viewvc?rev=1788561=rev
Log:
Streams can't depend on themselves.
Found with the h2spec tool written by Moto Ishizawa.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties

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

svn commit: r1788560 - in /tomcat/trunk/java/org/apache/coyote/http2: Http2UpgradeHandler.java LocalStrings.properties

[markt]

Author: markt
Date: Fri Mar 24 23:07:16 2017
New Revision: 1788560

URL: http://svn.apache.org/viewvc?rev=1788560=rev
Log:
Streams can't depend on themselves.
Found with the h2spec tool written by Moto Ishizawa.

Modified:
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/Http2UpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1788560=1788559=1788560=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Fri Mar 
24 23:07:16 2017
@@ -1402,6 +1402,10 @@ class Http2UpgradeHandler extends Abstra
 @Override
 public void reprioritise(int streamId, int parentStreamId,
 boolean exclusive, int weight) throws Http2Exception {
+if (streamId == parentStreamId) {
+throw new 
ConnectionException(sm.getString("upgradeHandler.dependency.invalid",
+getConnectionId(), Integer.valueOf(streamId)), 
Http2Error.PROTOCOL_ERROR);
+}
 Stream stream = getStream(streamId, false);
 if (stream == null) {
 stream = createRemoteStream(streamId);

Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1788560=1788559=1788560=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Fri Mar 
24 23:07:16 2017
@@ -105,6 +105,7 @@ upgradeHandler.allocate.debug=Connection
 upgradeHandler.allocate.left=Connection [{0}], Stream [{1}], [{2}] bytes 
unallocated - trying to allocate to children
 upgradeHandler.allocate.recipient=Connection [{0}], Stream [{1}], potential 
recipient [{2}] with weight [{3}]
 upgradeHandler.connectionError=Connection error
+upgradeHandler.dependency.invalid=Connection [{0}], Stream [{1}], Streams may 
not depend on themselves
 upgradeHandler.goaway.debug=Connection [{0}], Goaway, Last stream [{1}], Error 
code [{2}], Debug data [{3}]
 upgradeHandler.init=Connection [{0}], State [{1}]
 upgradeHandler.initialWindowSize.invalid=Connection [{0}], Illegal value of 
[{1}] ignored for initial window size



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

svn commit: r1788559 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2UpgradeHandler.java

[markt]

Author: markt
Date: Fri Mar 24 23:01:20 2017
New Revision: 1788559

URL: http://svn.apache.org/viewvc?rev=1788559=rev
Log:
Close the connection when a goaway frame is received.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java

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

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

[markt]

Author: markt
Date: Fri Mar 24 23:00:58 2017
New Revision: 1788558

URL: http://svn.apache.org/viewvc?rev=1788558=rev
Log:
Close the connection when a goaway frame is received.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.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=1788558=1788557=1788558=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Fri Mar 
24 23:00:58 2017
@@ -344,7 +344,9 @@ class Http2UpgradeHandler extends Abstra
 break;
 }
 
-result = SocketState.UPGRADED;
+if (connectionState.get() != ConnectionState.CLOSED) {
+result = SocketState.UPGRADED;
+}
 break;
 
 case OPEN_WRITE:
@@ -1493,6 +1495,7 @@ class Http2UpgradeHandler extends Abstra
 log.debug(sm.getString("upgradeHandler.goaway.debug", connectionId,
 Integer.toString(lastStreamId), 
Long.toHexString(errorCode), debugData));
 }
+close();
 }
 
 



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

buildbot success in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

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

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1788555 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2Protocol.java java/org/apache/coyote/http2/Http2UpgradeHandler.java

[markt]

Author: markt
Date: Fri Mar 24 22:49:34 2017
New Revision: 1788555

URL: http://svn.apache.org/viewvc?rev=1788555=rev
Log:
Add an undocumented option for use when running test suites that disables 
server initiated ping frames since some test suites don't expect them .

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java

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

svn commit: r1788554 - in /tomcat/trunk/java/org/apache/coyote/http2: Http2AsyncUpgradeHandler.java Http2Protocol.java Http2UpgradeHandler.java

[markt]

Author: markt
Date: Fri Mar 24 22:47:41 2017
New Revision: 1788554

URL: http://svn.apache.org/viewvc?rev=1788554=rev
Log:
Add an undocumented option for use when running test suites that disables 
server initiated ping frames since some test suites don't expect them .

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java?rev=1788554=1788553=1788554=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java Fri 
Mar 24 22:47:41 2017
@@ -308,6 +308,9 @@ public class Http2AsyncUpgradeHandler ex
 protected class AsyncPingManager extends PingManager {
 @Override
 public void sendPing(boolean force) throws IOException {
+if (initiateDisabled) {
+return;
+}
 long now = System.nanoTime();
 if (force || now - lastPingNanoTime > pingIntervalNano) {
 lastPingNanoTime = now;

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=1788554=1788553=1788554=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java Fri Mar 24 
22:47:41 2017
@@ -69,7 +69,7 @@ public class Http2Protocol implements Up
 private int maxHeaderSize = Constants.DEFAULT_MAX_HEADER_SIZE;
 private int maxTrailerCount = Constants.DEFAULT_MAX_TRAILER_COUNT;
 private int maxTrailerSize = Constants.DEFAULT_MAX_TRAILER_SIZE;
-
+private boolean initiatePingDisabled = false;
 
 @Override
 public String getHttpUpgradeName(boolean isSSLEnabled) {
@@ -116,6 +116,7 @@ public class Http2Protocol implements Up
 result.setMaxHeaderSize(getMaxHeaderSize());
 result.setMaxTrailerCount(getMaxTrailerCount());
 result.setMaxTrailerSize(getMaxTrailerSize());
+result.setInitiatePingDisabled(initiatePingDisabled);
 return result;
 }
 
@@ -269,4 +270,9 @@ public class Http2Protocol implements Up
 public int getMaxTrailerSize() {
 return maxTrailerSize;
 }
+
+
+public void setInitiatePingDisabled(boolean initiatePingDisabled) {
+this.initiatePingDisabled = initiatePingDisabled;
+}
 }

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=1788554=1788553=1788554=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Fri Mar 
24 22:47:41 2017
@@ -1264,6 +1264,11 @@ class Http2UpgradeHandler extends Abstra
 }
 
 
+public void setInitiatePingDisabled(boolean initiatePingDisabled) {
+pingManager.initiateDisabled = initiatePingDisabled;
+}
+
+
 // --- Http2Parser.Input 
methods
 
 @Override
@@ -1512,6 +1517,8 @@ class Http2UpgradeHandler extends Abstra
 
 protected class PingManager {
 
+protected boolean initiateDisabled = false;
+
 // 10 seconds
 protected final long pingIntervalNano = 100L;
 
@@ -1529,6 +1536,9 @@ class Http2UpgradeHandler extends Abstra
  * @throws IOException If an I/O issue prevents the ping from being 
sent
  */
 public void sendPing(boolean force) throws IOException {
+if (initiateDisabled) {
+return;
+}
 long now = System.nanoTime();
 if (force || now - lastPingNanoTime > pingIntervalNano) {
 lastPingNanoTime = now;



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

buildbot failure in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1788550
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: r1788551 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/HpackDecoder.java java/org/apache/coyote/http2/LocalStrings.properties java/org/apache/coyote/http2/Stream.java webapps

[markt]

Author: markt
Date: Fri Mar 24 22:12:51 2017
New Revision: 1788551

URL: http://svn.apache.org/viewvc?rev=1788551=rev
Log:
Streams that contain duplicate pseudo headers are invalid.
Found with the h2spec tool written by Moto Ishizawa.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HpackDecoder.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

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

svn commit: r1788550 - in /tomcat/trunk: java/org/apache/coyote/http2/HpackDecoder.java java/org/apache/coyote/http2/LocalStrings.properties java/org/apache/coyote/http2/Stream.java webapps/docs/chang

[markt]

Author: markt
Date: Fri Mar 24 22:10:45 2017
New Revision: 1788550

URL: http://svn.apache.org/viewvc?rev=1788550=rev
Log:
Streams that contain duplicate pseudo headers are invalid.
Found with the h2spec tool written by Moto Ishizawa.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java?rev=1788550=1788549=1788550=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java Fri Mar 24 
22:10:45 2017
@@ -342,8 +342,10 @@ public class HpackDecoder {
  *
  * @param name  Header name
  * @param value Header value
+ * @throws HpackException If a header is received that is not compliant
+ *with the HTTP/2 specification
  */
-void emitHeader(String name, String value);
+void emitHeader(String name, String value) throws HpackException;
 
 /**
  * Are the headers pass to the recipient so far valid? The decoder 
needs
@@ -384,7 +386,7 @@ public class HpackDecoder {
 }
 
 
-private void emitHeader(String name, String value) {
+private void emitHeader(String name, String value) throws HpackException {
 // Header names are forced to lower case
 if ("cookie".equals(name)) {
 // Only count the cookie header once since HTTP/2 splits it into

Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1788550=1788549=1788550=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Fri Mar 
24 22:10:45 2017
@@ -74,6 +74,7 @@ pingManager.roundTripTime=Connection [{0
 
 stream.closed=Connection [{0}], Stream [{1}], Unable to write to stream once 
it has been closed
 stream.header.debug=Connection [{0}], Stream [{1}], HTTP header [{2}], Value 
[{3}]
+stream.header.duplicate=Connection [{0}], Stream [{1}], received multiple 
[{3}] headers
 stream.header.unexpectedPseudoHeader=Connection [{0}], Stream [{1}], Pseudo 
header [{2}] received after a regular header
 stream.header.unknownPseudoHeader=Connection [{0}], Stream [{1}], Unknown 
pseudo header [{2}] received
 stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable

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=1788550=1788549=1788550=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Fri Mar 24 22:10:45 
2017
@@ -220,7 +220,7 @@ class Stream extends AbstractStream impl
 
 
 @Override
-public final void emitHeader(String name, String value) {
+public final void emitHeader(String name, String value) throws 
HpackException {
 if (log.isDebugEnabled()) {
 log.debug(sm.getString("stream.header.debug", getConnectionId(), 
getIdentifier(),
 name, value));
@@ -247,34 +247,56 @@ class Stream extends AbstractStream impl
 
 switch(name) {
 case ":method": {
-coyoteRequest.method().setString(value);
+if (coyoteRequest.method().isNull()) {
+coyoteRequest.method().setString(value);
+} else {
+throw new 
HpackException(sm.getString("stream.header.duplicate",
+getConnectionId(), getIdentifier(), ":method" ));
+}
 break;
 }
 case ":scheme": {
-coyoteRequest.scheme().setString(value);
+if (coyoteRequest.scheme().isNull()) {
+coyoteRequest.scheme().setString(value);
+} else {
+throw new 
HpackException(sm.getString("stream.header.duplicate",
+getConnectionId(), getIdentifier(), ":scheme" ));
+}
 break;
 }
 case ":path": {
-int queryStart = value.indexOf('?');
-if (queryStart == -1) {
-coyoteRequest.requestURI().setString(value);
-
coyoteRequest.decodedURI().setString(coyoteRequest.getURLDecoder().convert(value,
 false));
+if (coyoteRequest.requestURI().isNull()) {

[Bug 60918] Process Send File releases the same Http11Processor in two threads, leading to java.lang.IllegalStateException: Unexpected state: headers already parsed. Buffer not recycled?

[bugzilla]

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

--- Comment #11 from Remy Maucherat  ---
(In reply to Andrew Garland from comment #9)
> Created attachment 34877 [details]
> Recoded RecycledProcessors
> 
> The problem does not recur using the version built from trunk!  Thanks for
> the rapid turnaround.  I guess it will be a month or two before this is part
> of an official release?
> 
> FYI, I had also prevented the problem by re-coding the RecycledProcessors
> class to check for existence before pushing onto the stack.  This was quick
> and dirty and would not scale, but food for thought.

And we're not going to do that :)

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

[Bug 60918] Process Send File releases the same Http11Processor in two threads, leading to java.lang.IllegalStateException: Unexpected state: headers already parsed. Buffer not recycled?

[bugzilla]

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

--- Comment #10 from Mark Thomas  ---
We'll probably start the release process next week. It is normally started
around the beginning of the every month but the first week of April is looking
busy for me. We could delay it but there is enough in the changelog to justify
a release.

-- 
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 60918] Process Send File releases the same Http11Processor in two threads, leading to java.lang.IllegalStateException: Unexpected state: headers already parsed. Buffer not recycled?

[bugzilla]

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

--- Comment #9 from Andrew Garland  ---
Created attachment 34877
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=34877=edit
Recoded RecycledProcessors

The problem does not recur using the version built from trunk!  Thanks for the
rapid turnaround.  I guess it will be a month or two before this is part of an
official release?

FYI, I had also prevented the problem by re-coding the RecycledProcessors class
to check for existence before pushing onto the stack.  This was quick and dirty
and would not scale, but food for thought.

-- 
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: r1788549 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Mar 24 21:26:02 2017
New Revision: 1788549

URL: http://svn.apache.org/viewvc?rev=1788549=rev
Log:
Typo

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

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

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

[markt]

Author: markt
Date: Fri Mar 24 21:16:50 2017
New Revision: 1788548

URL: http://svn.apache.org/viewvc?rev=1788548=rev
Log:
Typo

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

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1788548=1788547=1788548=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Mar 24 21:16:50 2017
@@ -134,7 +134,7 @@
   
   
 60918: Fix sendfile processing error that could lead to
-subsequent requests experiencing and 
IllegalStateException.
+subsequent requests experiencing an IllegalStateException.
 (markt)
   
 



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

[Bug 60918] Process Send File releases the same Http11Processor in two threads, leading to java.lang.IllegalStateException: Unexpected state: headers already parsed. Buffer not recycled?

[bugzilla]

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

--- Comment #8 from Mark Thomas  ---
8.0.x and earlier are not affected. This bug was introduced by the refactoring
in 8.5.x 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

[Bug 60918] Process Send File releases the same Http11Processor in two threads, leading to java.lang.IllegalStateException: Unexpected state: headers already parsed. Buffer not recycled?

[bugzilla]

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

--- Comment #7 from Andrew Garland  ---
FYI, minor typo in changelog

subsequent requests experiencing and IllegalStateException.

"and" -> "an"

-- 
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 60918] Process Send File releases the same Http11Processor in two threads, leading to java.lang.IllegalStateException: Unexpected state: headers already parsed. Buffer not recycled?

[bugzilla]

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

--- Comment #6 from Mark Thomas  ---
r1788544 (for 9.0.x)

-- 
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: r1788546 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http11/Http11Processor.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Mar 24 21:00:57 2017
New Revision: 1788546

URL: http://svn.apache.org/viewvc?rev=1788546=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60918
When sendfile processing passes to the Poller for completion and then completes 
before Http11Processor.service() exists, the Processor is recycled which clears 
sendfileData causing the Processor to return CLOSED or OPEN rather than 
SENDFILE.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

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

[Bug 60918] Process Send File releases the same Http11Processor in two threads, leading to java.lang.IllegalStateException: Unexpected state: headers already parsed. Buffer not recycled?

[bugzilla]

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

--- Comment #5 from Andrew Garland  ---
thanks for the info.

Can you point me to the commit diff?  Just curious.

-- 
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 60918] Process Send File releases the same Http11Processor in two threads, leading to java.lang.IllegalStateException: Unexpected state: headers already parsed. Buffer not recycled?

[bugzilla]

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

--- Comment #4 from Mark Thomas  ---
These are the instructions for 9.0.x
https://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?view=markup

8.5.x is very similar, just a different svn path and a different minimum Java
version.

Both 9.0.x and 8.5.x have the fix. I'm currently working on a back-port to
8.0.x.

-- 
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: r1788545 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/SocketWrapperBase.java

[markt]

Author: markt
Date: Fri Mar 24 20:53:32 2017
New Revision: 1788545

URL: http://svn.apache.org/viewvc?rev=1788545=rev
Log:
Better Javadoc

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

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

svn commit: r1788544 - in /tomcat/trunk: java/org/apache/coyote/http11/Http11Processor.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Mar 24 20:51:20 2017
New Revision: 1788544

URL: http://svn.apache.org/viewvc?rev=1788544=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60918
When sendfile processing passes to the Poller for completion and then completes 
before Http11Processor.service() exists, the Processor is recycled which clears 
sendfileData causing the Processor to return CLOSED or OPEN rather than 
SENDFILE.

Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1788544=1788543=1788544=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Fri Mar 24 
20:51:20 2017
@@ -55,6 +55,7 @@ import org.apache.tomcat.util.log.UserDa
 import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
 import org.apache.tomcat.util.net.SSLSupport;
 import org.apache.tomcat.util.net.SendfileDataBase;
+import org.apache.tomcat.util.net.SendfileState;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -368,9 +369,10 @@ public class Http11Processor extends Abs
 openSocket = false;
 readComplete = true;
 boolean keptAlive = false;
+SendfileState sendfileState = SendfileState.DONE;
 
-while (!getErrorState().isError() && keepAlive && !isAsync() &&
-upgradeToken == null && !protocol.isPaused()) {
+while (!getErrorState().isError() && keepAlive && !isAsync() && 
upgradeToken == null &&
+sendfileState == SendfileState.DONE && !protocol.isPaused()) {
 
 // Parsing the request header
 try {
@@ -561,9 +563,7 @@ public class Http11Processor extends Abs
 
 rp.setStage(org.apache.coyote.Constants.STAGE_KEEPALIVE);
 
-if (breakKeepAliveLoop(socketWrapper)) {
-break;
-}
+sendfileState = processSendfile(socketWrapper);
 }
 
 rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
@@ -575,7 +575,7 @@ public class Http11Processor extends Abs
 } else if (isUpgrade()) {
 return SocketState.UPGRADING;
 } else {
-if (sendfileData != null) {
+if (sendfileState == SendfileState.PENDING) {
 return SocketState.SENDFILE;
 } else {
 if (openSocket) {
@@ -651,7 +651,6 @@ public class Http11Processor extends Abs
 http11 = true;
 http09 = false;
 contentDelimitation = false;
-sendfileData = null;
 
 if (protocol.isSSLEnabled()) {
 request.scheme().setString("https");
@@ -858,15 +857,14 @@ public class Http11Processor extends Abs
 }
 
 // Sendfile support
-boolean sendingWithSendfile = false;
 if (protocol.getUseSendfile()) {
-sendingWithSendfile = prepareSendfile(outputFilters);
+prepareSendfile(outputFilters);
 }
 
 // Check for compression
 boolean isCompressible = false;
 boolean useCompression = false;
-if (entityBody && (protocol.getCompressionLevel() > 0) && 
!sendingWithSendfile) {
+if (entityBody && (protocol.getCompressionLevel() > 0) && sendfileData 
== null) {
 isCompressible = isCompressible();
 if (isCompressible) {
 useCompression = useCompression();
@@ -1009,10 +1007,12 @@ public class Http11Processor extends Abs
 return connection.equals(Constants.CLOSE);
 }
 
-private boolean prepareSendfile(OutputFilter[] outputFilters) {
+private void prepareSendfile(OutputFilter[] outputFilters) {
 String fileName = (String) request.getAttribute(
 org.apache.coyote.Constants.SENDFILE_FILENAME_ATTR);
-if (fileName != null) {
+if (fileName == null) {
+sendfileData = null;
+} else {
 // No entity body sent here
 outputBuffer.addActiveFilter(outputFilters[Constants.VOID_FILTER]);
 contentDelimitation = true;
@@ -1021,9 +1021,7 @@ public class Http11Processor extends Abs
 long end = ((Long) request.getAttribute(
 
org.apache.coyote.Constants.SENDFILE_FILE_END_ATTR)).longValue();
 sendfileData = socketWrapper.createSendfileData(fileName, pos, end 
- pos);
-return true;
 }
-return false;
 }
 
 /**
@@ -1304,34 +1302,31 @@ public class Http11Processor extends Abs
 
 
 /**
- * Checks to see if the keep-alive loop should be broken, performing any
- * processing (e.g. sendfile handling) that may have 

svn commit: r1788543 - /tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java

[markt]

Author: markt
Date: Fri Mar 24 20:50:37 2017
New Revision: 1788543

URL: http://svn.apache.org/viewvc?rev=1788543=rev
Log:
Better Javadoc

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1788543=1788542=1788543=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Fri Mar 
24 20:50:37 2017
@@ -738,9 +738,9 @@ public abstract class SocketWrapperBase<
 
 /**
  * Starts the sendfile process. It is expected that if the sendfile process
- * does not complete during this call that the caller will not add
- * the socket to the poller (or equivalent). That is the responsibility of
- * this method.
+ * does not complete during this call and does not report an error, that 
the
+ * caller will not add the socket to the poller (or equivalent). 
That
+ * is the responsibility of this method.
  *
  * @param sendfileData Data representing the file to send
  *



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

[Bug 60918] Process Send File releases the same Http11Processor in two threads, leading to java.lang.IllegalStateException: Unexpected state: headers already parsed. Buffer not recycled?

[bugzilla]

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

--- Comment #3 from Andrew Garland  ---
i haven't before, but I am sure I could :)

Please point me at BUILD instructions.

-- 
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 60918] Process Send File releases the same Http11Processor in two threads, leading to java.lang.IllegalStateException: Unexpected state: headers already parsed. Buffer not recycled?

[bugzilla]

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

--- Comment #2 from Mark Thomas  ---
Thanks for the report and especially the debug logs. I was able to pin-point
the root cause very quickly from those.

Are you able to build Tomcat from svn in order to confirm a fix?

-- 
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 60918] Process Send File releases the same Http11Processor in two threads, leading to java.lang.IllegalStateException: Unexpected state: headers already parsed. Buffer not recycled?

[bugzilla]

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

Andrew Garland  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Andrew Garland  ---
To me, there are two separate issues here:

1.  The logic for pushing the processor back in send file case has some flaw.

2.  RecycledProcessors should protect against the same instance being in the
stack more than once, as a defense against this flaw or any future flaws that
result in mistakenly putting the same processor in twice.

-- 
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 60918] New: Process Send File releases the same Http11Processor in two threads, leading to java.lang.IllegalStateException: Unexpected state: headers already parsed. Buffer not recycled?

[bugzilla]

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

Bug ID: 60918
   Summary: Process Send File releases the same Http11Processor in
two threads, leading to
java.lang.IllegalStateException: Unexpected state:
headers already parsed. Buffer not recycled?
   Product: Tomcat 8
   Version: 8.5.11
  Hardware: PC
Status: NEW
  Severity: major
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: andrew.garl...@sunbirddcim.com
  Target Milestone: 

Created attachment 34876
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=34876=edit
Some pieces of the full trace showing the issue

This is a similar report to
https://bz.apache.org/bugzilla/show_bug.cgi?id=58646 but whatever fix was done
in that case does not prevent this issue.

Basic outline:

1. thread http-nio-8080-exec-1 processes a request that will result in send
file.  It pops Http11Processor@8dc1458 from recycledProcessors
2. The send file action is completed in thread http-nio-8080-ClientPoller-0. 
Then that thread is done, it pushes Http11Processor@8dc1458 onto
recycledProcessors
3. A few milliseconds later, http-nio-8080-exec-1 also pushes
Http11Processor@8dc1458 onto recycledProcessors, so now that one processor is
in the list of recycledProcessors twice
4. Eventually, two nio exec threads both pop that one instance off of
recycledProcessors

4A.  The second thread to use it throws

24-Mar-2017 12:08:08.093 INFO [http-nio-8080-exec-1]
org.apache.coyote.http11.Http11Processor.service Error parsing HTTP request
header
 Note: further occurrences of HTTP header parsing errors will be logged at
DEBUG level.
 java.lang.IllegalStateException: Unexpected state: headers already parsed.
Buffer not recycled?
at
org.apache.coyote.http11.Http11InputBuffer.parseHeaders(Http11InputBuffer.java:554)
at
org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:683)


4B.  The first thread, which completes after the second one, throws

24-Mar-2017 12:08:08.833 SEVERE [http-nio-8080-exec-7]
org.apache.coyote.http11.Http11Processor.service Error processing request
 java.lang.NullPointerException
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:389)
at
org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:783)

and then

24-Mar-2017 12:08:08.849 SEVERE [http-nio-8080-exec-7]
org.apache.coyote.http11.Http11Processor.endRequest Error finishing response
 java.lang.NullPointerException
at
org.apache.coyote.http11.Http11OutputBuffer.commit(Http11OutputBuffer.java:351)
at
org.apache.coyote.http11.Http11Processor.prepareResponse(Http11Processor.java:1288)
at
org.apache.coyote.AbstractProcessor.action(AbstractProcessor.java:254)
at
org.apache.coyote.http11.Http11Processor.endRequest(Http11Processor.java:1457)
at
org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:823)

-- 
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: r1788481 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/HPackHuffman.java java/org/apache/coyote/http2/LocalStrings.properties test/org/apache/coyote/http2/TestHpack.java

[markt]

Author: markt
Date: Fri Mar 24 15:43:04 2017
New Revision: 1788481

URL: http://svn.apache.org/viewvc?rev=1788481=rev
Log:
Huffman encoded string literals must not have more than 7 bits of padding.
Identified by Moto Ishizawa's h2spec tool.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HPackHuffman.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestHpack.java

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

svn commit: r1788480 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2UpgradeHandler.java

[markt]

Author: markt
Date: Fri Mar 24 15:42:39 2017
New Revision: 1788480

URL: http://svn.apache.org/viewvc?rev=1788480=rev
Log:
Close the streams as soon as we know the connection is closing

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java

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

svn commit: r1788479 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/HpackDecoder.java java/org/apache/coyote/http2/LocalStrings.properties webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Mar 24 15:42:06 2017
New Revision: 1788479

URL: http://svn.apache.org/viewvc?rev=1788479=rev
Log:
HPACK table size updates must occur at the start of a header block.
Identified by Moto Ishizawa's h2spec tool.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HpackDecoder.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

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

svn commit: r1788473 - in /tomcat/trunk: java/org/apache/coyote/http2/HPackHuffman.java java/org/apache/coyote/http2/LocalStrings.properties test/org/apache/coyote/http2/TestHpack.java

[markt]

Author: markt
Date: Fri Mar 24 15:32:45 2017
New Revision: 1788473

URL: http://svn.apache.org/viewvc?rev=1788473=rev
Log:
Huffman encoded string literals must not have more than 7 bits of padding.
Identified by Moto Ishizawa's h2spec tool.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/trunk/test/org/apache/coyote/http2/TestHpack.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java?rev=1788473=1788472=1788473=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java Fri Mar 24 
15:32:45 2017
@@ -379,22 +379,27 @@ public class HPackHuffman {
 assert data.remaining() >= length;
 int treePos = 0;
 boolean eosBits = true;
+int eosBitCount = 0;
 for (int i = 0; i < length; ++i) {
 byte b = data.get();
 int bitPos = 7;
 while (bitPos >= 0) {
 int val = DECODING_TABLE[treePos];
 if (((1 << bitPos) & b) == 0) {
-eosBits = false;
 //bit not set, we want the lower part of the tree
 if ((val & LOW_TERMINAL_BIT) == 0) {
 treePos = val & LOW_MASK;
+eosBits = false;
+eosBitCount = 0;
 } else {
 target.append((char) (val & LOW_MASK));
 treePos = 0;
 eosBits = true;
 }
 } else {
+if (eosBits) {
+eosBitCount++;
+}
 //bit not set, we want the lower part of the tree
 if ((val & HIGH_TERMINAL_BIT) == 0) {
 treePos = (val >> 16) & LOW_MASK;
@@ -407,6 +412,10 @@ public class HPackHuffman {
 bitPos--;
 }
 }
+if (eosBitCount > 7) {
+throw new HpackException(sm.getString(
+"hpackhuffman.stringLiteralTooMuchPadding"));
+}
 if (!eosBits) {
 throw new HpackException(sm.getString(
 "hpackhuffman.huffmanEncodedHpackValueDidNotEndWithEOS"));

Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1788473=1788472=1788473=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Fri Mar 
24 15:32:45 2017
@@ -40,6 +40,7 @@ hpackdecoder.tableSizeUpdateNotAtStart=A
 hpackEncoder.encodeHeader=Encoding header [{0}] with value [{1}]
 
 hpackhuffman.huffmanEncodedHpackValueDidNotEndWithEOS=Huffman encoded value in 
HPACK headers did not end with EOS padding
+hpackhuffman.stringLiteralTooMuchPadding=More than 7 bits of EOS padding were 
provided at the end of an Huffman encoded string literal
 
 http2Parser.headerLimitCount=Connection [{0}], Stream [{1}], Too many headers
 http2Parser.headerLimitSize=Connection [{0}], Stream [{1}], Total header size 
too big

Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHpack.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHpack.java?rev=1788473=1788472=1788473=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHpack.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHpack.java Fri Mar 24 
15:32:45 2017
@@ -105,6 +105,25 @@ public class TestHpack {
 }
 }
 
+@Test(expected=HpackException.class)
+public void testExcessiveStringLiteralPadding() throws Exception {
+MimeHeaders headers = new MimeHeaders();
+headers.setValue("X-test").setString("foobar");
+ByteBuffer output = ByteBuffer.allocate(512);
+HpackEncoder encoder = new HpackEncoder();
+encoder.encode(headers, output);
+// Hack the output buffer to extend the EOS marker for the header value
+// by another byte
+output.array()[7] = (byte) -122;
+output.put((byte) -1);
+output.flip();
+MimeHeaders headers2 = new MimeHeaders();
+HpackDecoder decoder = new HpackDecoder();
+decoder.setHeaderEmitter(new HeadersListener(headers2));
+decoder.decode(output);
+}
+
+
 private void doTestHeaderValueBug60451(String filename) throws 
HpackException {
 String headerName = "Content-Disposition";

buildbot success in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

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

Build succeeded!

Sincerely,
 -The Buildbot




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

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

[markt]

Author: markt
Date: Fri Mar 24 14:43:17 2017
New Revision: 1788460

URL: http://svn.apache.org/viewvc?rev=1788460=rev
Log:
Close the streams as soon as we know the connection is closing

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.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=1788460=1788459=1788460=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Fri Mar 
24 14:43:17 2017
@@ -983,6 +983,11 @@ class Http2UpgradeHandler extends Abstra
 
 private void close() {
 connectionState.set(ConnectionState.CLOSED);
+for (Stream stream : streams.values()) {
+// The connection is closing. Close the associated streams as no
+// longer required.
+stream.receiveReset(Http2Error.CANCEL.getCode());
+}
 try {
 socketWrapper.close();
 } catch (IOException ioe) {



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

svn commit: r1788459 - in /tomcat/trunk/java/org/apache/coyote/http2: HPackHuffman.java LocalStrings.properties

[markt]

Author: markt
Date: Fri Mar 24 14:40:14 2017
New Revision: 1788459

URL: http://svn.apache.org/viewvc?rev=1788459=rev
Log:
Revert 1788458
It didn't work as intended

Modified:
tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java?rev=1788459=1788458=1788459=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java Fri Mar 24 
14:40:14 2017
@@ -406,9 +406,6 @@ public class HPackHuffman {
 }
 bitPos--;
 }
-if (bitPos < 0) {
-throw new 
HpackException(sm.getString("hpackhuffman.stringLiteralTooMuchPadding"));
-}
 }
 if (!eosBits) {
 throw new HpackException(sm.getString(

Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1788459=1788458=1788459=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Fri Mar 
24 14:40:14 2017
@@ -40,7 +40,6 @@ hpackdecoder.tableSizeUpdateNotAtStart=A
 hpackEncoder.encodeHeader=Encoding header [{0}] with value [{1}]
 
 hpackhuffman.huffmanEncodedHpackValueDidNotEndWithEOS=Huffman encoded value in 
HPACK headers did not end with EOS padding
-hpackhuffman.stringLiteralTooMuchPadding=More than 7 bits of padding were 
provided at the end of an Huffman encoded string literal
 
 http2Parser.headerLimitCount=Connection [{0}], Stream [{1}], Too many headers
 http2Parser.headerLimitSize=Connection [{0}], Stream [{1}], Total header size 
too big



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

buildbot failure in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1788458
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: r1788458 - in /tomcat/trunk/java/org/apache/coyote/http2: HPackHuffman.java LocalStrings.properties

[markt]

Author: markt
Date: Fri Mar 24 14:25:37 2017
New Revision: 1788458

URL: http://svn.apache.org/viewvc?rev=1788458=rev
Log:
Huffman encoded string literals must not have more that 7 bits of padding.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java?rev=1788458=1788457=1788458=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/HPackHuffman.java Fri Mar 24 
14:25:37 2017
@@ -406,6 +406,9 @@ public class HPackHuffman {
 }
 bitPos--;
 }
+if (bitPos < 0) {
+throw new 
HpackException(sm.getString("hpackhuffman.stringLiteralTooMuchPadding"));
+}
 }
 if (!eosBits) {
 throw new HpackException(sm.getString(

Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1788458=1788457=1788458=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Fri Mar 
24 14:25:37 2017
@@ -40,6 +40,7 @@ hpackdecoder.tableSizeUpdateNotAtStart=A
 hpackEncoder.encodeHeader=Encoding header [{0}] with value [{1}]
 
 hpackhuffman.huffmanEncodedHpackValueDidNotEndWithEOS=Huffman encoded value in 
HPACK headers did not end with EOS padding
+hpackhuffman.stringLiteralTooMuchPadding=More than 7 bits of padding were 
provided at the end of an Huffman encoded string literal
 
 http2Parser.headerLimitCount=Connection [{0}], Stream [{1}], Too many headers
 http2Parser.headerLimitSize=Connection [{0}], Stream [{1}], Total header size 
too big



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

svn commit: r1788455 - in /tomcat/trunk: java/org/apache/coyote/http2/HpackDecoder.java java/org/apache/coyote/http2/LocalStrings.properties webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Mar 24 14:16:12 2017
New Revision: 1788455

URL: http://svn.apache.org/viewvc?rev=1788455=rev
Log:
HPACK table size updates must occur at the start of a header block.
Identified by Moto Ishizawa's h2spec tool.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java?rev=1788455=1788454=1788455=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java Fri Mar 24 
14:16:12 2017
@@ -156,6 +156,9 @@ public class HpackDecoder {
 }
 
 private boolean handleMaxMemorySizeChange(ByteBuffer buffer, int 
originalPos) throws HpackException {
+if (headerCount != 0) {
+throw new 
HpackException(sm.getString("hpackdecoder.tableSizeUpdateNotAtStart"));
+}
 buffer.position(buffer.position() - 1); //unget the byte
 int size = Hpack.decodeInteger(buffer, 5);
 if (size == -1) {

Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1788455=1788454=1788455=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Fri Mar 
24 14:16:12 2017
@@ -35,6 +35,7 @@ hpack.integerEncodedOverTooManyOctets=HP
 hpack.invalidCharacter=The Unicode character [{0}] at code point [{1}] cannot 
be encoded as it is outside the permitted range of 0 to 255.
 
 hpackdecoder.zeroNotValidHeaderTableIndex=Zero is not a valid header table 
index
+hpackdecoder.tableSizeUpdateNotAtStart=Any table size update must be sent at 
the start of a header block
 
 hpackEncoder.encodeHeader=Encoding header [{0}] with value [{1}]
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1788455=1788454=1788455=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Mar 24 14:16:12 2017
@@ -128,6 +128,10 @@
 configuration attributes and internal code. Based on a pacth by Michael
 Osipov. (markt)
   
+  
+Improve HPACK specification compliance by fixing some test failures
+reported by the h2spec tool written by Moto Ishizawa. (markt)
+  
 
   
   



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

[Bug 60750] A response that uses Transfer-Encoding: chunked is missing the last zero-length chunk

[bugzilla]

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

Chuck Caldarale  changed:

   What|Removed |Added

Version|7.0.0   |7.0.70

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

Re: Host header validation

[Mark Thomas]

On 22/03/17 14:13, Konstantin Kolinko wrote:
> 2017-03-21 18:01 GMT+03:00 Mark Thomas :
>> On 21 March 2017 14:14:19 GMT+00:00, Christopher Schultz 
>>  wrote:
>>>
>>> How about an option to disable the validity-checking, in case someone
>>> in the field finds a case they need to support, or if they don't care
>>> about hostname-checking and want their "performance back"?
>>
>> I'm not too concerned about performance. The checks are at most 1% of the 
>> current processing time for a trivial servlet accessed over localhost. For 
>> real use cases it will be less.
>>
>> Some form of transition could work (eg log only) but I'm reluctant to an an 
>> option that effectively bypasses spec compliance.
> 
> This needs a definition of "spec".
> 
> I am afraid that DNS spec may evolve over time.
> 
> 
> 1) https://tools.ietf.org/html/rfc7230
> RFC 7230   HTTP/1.1 Message Syntax and Routing June 2014
> 
> Host = uri-host [ ":" port ] ; Section 2.7.1
> 
> uri-host  = 
> 
> 
> 2) https://tools.ietf.org/html/rfc3986
>  RFC 3986   URI Generic Syntax   January 2005
> 
> Updated by: 6874, 7320
> 
> host= IP-literal / IPv4address / reg-name
> 
> IP-literal = "[" ( IPv6address / IPvFuture  ) "]"
> 
> but RFC 6874 updates the syntax and changes "IP-literal" into
> 
>   IP-literal = "[" ( IPv6address / IPv6addrz / IPvFuture  ) "]"
> 
>   ZoneID = 1*( unreserved / pct-encoded )
> 
>   IPv6addrz = IPv6address "%25" ZoneID
> 
> 
> reg-name= *( unreserved / pct-encoded / sub-delims )
> 
> pct-encoded = "%" HEXDIG HEXDIG
> 
> 
> DomainParseState in r1787662 is more strict and I see no support for
> pct-encoded characters there.
> 
> IPv6addrz is not supported
> (I mentioned in my previous e-mail, and above is the formal syntax for it)
> 
> IPvFuture address - I think it is too early to implement it,
> but it can be a reason to have a flag to turn off this check,
> 
> 
> An example of IPvFuture address with HTTPd, and its response (400):
> https://bz.apache.org/bugzilla/show_bug.cgi?id=55362
> 
> So apparently Apache HTTP Server already has some validation of Host header.

I'll take a look at the spec references you quoted. The ideal would be
if we could apply a general rule now and make it more specific over
time. Not sure how possible that would be.

Mark


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

[Tomcat Wiki] Update of "SupportAndTraining" by markt

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "SupportAndTraining" page has been changed by markt:
https://wiki.apache.org/tomcat/SupportAndTraining?action=diff=64=65

Comment:
Make expected location of new entries clearer.

  
  The ASF does not endorse any of the organisations listed on this page nor any 
services that they may provide.
  
- If you would like to add your company to this page, feel free to do so. You 
will need to create a wiki account to do so. There aren't any hard and fast 
rules about what is acceptable but please keep your entry to a few lines, a 
link and a small logo. Excessive entries will be edited. Remember to add you 
company to both sections if you provide support and training.
+ If you would like to add your company to this page, feel free to do so. You 
will need to create a wiki account to do so. There aren't any hard and fast 
rules about what is acceptable but please keep your entry to a few lines, a 
link and a small logo. Excessive entries will be edited. Remember to add you 
company to both sections if you provide support and training. New entries 
should be added to the end of the relevant section.
  
  -
  = Support =

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

[Tomcat Wiki] Update of "SupportAndTraining" by markt

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "SupportAndTraining" page has been changed by markt:
https://wiki.apache.org/tomcat/SupportAndTraining?action=diff=63=64

Comment:
Review support ordering SpringSource/Pivotal was the first entry. 
OpenLogic/RougeWave was sixth. Review training ordering. OpenLogic/RougeWave 
was fourth.

  -
  = Support =
  -
+ 
[[https://www.pivotal.io/support/offerings|{{http://www.apache.org/foundation/images/pivotal-platinum.png|http://www.pivotal.io/support/offerings|width=150}}]]
+ 
+ Pivotal provides global, 24x7, 
[[http://www.pivotal.io/support/offerings|enterprise support]] for production 
users of Apache Tomcat. Pivotal employs the leading experts on Apache Tomcat to 
ensure that support customers can get their questions answered quickly and 
accurately and that bug fixes are incorporated into the open source code base.
+ 
  
[[http://www.kippdata.de|{{http://www.kippdata.de/site/themes/kippdata/img/elements/kippdata_logo.gif|http://www.kippdata.de}}]]
  
  Kippdata's [[https://www.kippdata.de/tomcat/|eSupport for Apache Tomcat]] 
features several eSupport packages starting from basic support levels up to 
mission critical enterprise support. We actively contribute to the Apache 
Tomcat project, so that our bug fixes and other code enhancements become part 
of the standard Apache Tomcat code. Kippdata is located in Bonn, Germany.
@@ -24, +28 @@

  Site: [[http://www.opengate.biz|www.opengate.biz]]<>
  eMail: i...@opengate.biz.<><>
  
- 
[[https://www.pivotal.io/support/offerings|{{http://www.apache.org/foundation/images/pivotal-platinum.png|http://www.pivotal.io/support/offerings|width=150}}]]
- 
- Pivotal provides global, 24x7, 
[[http://www.pivotal.io/support/offerings|enterprise support]] for production 
users of Apache Tomcat. Pivotal employs the leading experts on Apache Tomcat to 
ensure that support customers can get their questions answered quickly and 
accurately and that bug fixes are incorporated into the open source code base.
- 
  
[[http://www.mulesoft.com|{{https://www.mulesoft.com/sites/default/files/3C_mulesoft_logo_updated.svg|http://www.mulesoft.com|width=150}}]]
  
  !MuleSoft provides global [[http://www.mulesoft.com/tomcat-support|enterprise 
Tomcat support]] as well as free, user-contributed howto guides. A 
general-audience [[http://www.mulesoft.com/understanding-apache-tomcat|Apache 
Tomcat]] guide is meant for absolute beginners, while intermediate Tomcat users 
can benefit from guides on how to resolve 
[[http://www.mulesoft.com/tomcat-logging|Tomcat logging]] problems or how to 
use [[http://www.mulesoft.com/tomcat-eclipse|Tomcat in eclipse]]. !MuleSoft 
also provides resources on upcoming releases of Tomcat like 
[[http://www.mulesoft.com/tomcat-7|Tomcat 7]]. !MuleSoft employs leading 
experts and authors on Apache Tomcat to ensure that customers can get their 
questions answered quickly and accurately. !MuleSoft also provides 
[[http://www.mulesoft.com/free-apache-tomcat-support|Free Tomcat Assistance]].
@@ -37, +37 @@

  
  [[http://innraz.ru/|InnRaz.ru]] offers enterprise support and consulting for 
Apache Tomcat users.
  
+ 
+ 
[[http://www.roguewave.com|{{http://www.roguewave.com/CMSPages/GetAzureFile.aspx?path=~\roguewave\media\assets\logos\rw-logo.png=a8e0402f2ee46c3ac9de1b48128e0d1465ef716dde369d3cd448811ab1c55206|http://www.roguewave.com}}]]
+ 
+ [[http://www.roguewave.com/|Roguewave Tomcat Support]] / 
[[http://www.openlogic.com/|OpenLogic]] has a dedicated team of OSS experts 
offering round-the-clock Production Support with competitive SLAs for 
troubleshooting Tomcat issues and outages. 
  
  
[[http://www.savoirfairelinux.com|{{http://www.savoirfairelinux.com/image/image_gallery?img_id=53315=1287776986392|http://www.savoirfairelinux.com}}]]
  
@@ -49, +53 @@

  
  
[[http://www.it-schulungen.com|{{http://www.it-schulungen.com/images/banners/its-banner-ulmerv.gif|http://www.it-schulungen.com}}]]
  IT-Schulungen.com 
[[http://www.it-schulungen.com/seminare/opensource/index.html|Training and 
Support for Apache Tomcat]] IT-Schulungen.com is located in nurumberg, Germany.
- 
- 
[[http://www.roguewave.com|{{http://www.roguewave.com/CMSPages/GetAzureFile.aspx?path=~\roguewave\media\assets\logos\rw-logo.png=a8e0402f2ee46c3ac9de1b48128e0d1465ef716dde369d3cd448811ab1c55206|http://www.roguewave.com}}]]
- 
- [[http://www.roguewave.com/|Roguewave Tomcat Support]] / 
[[http://www.openlogic.com/|OpenLogic]] has a dedicated team of OSS experts 
offering round-the-clock Production Support with competitive SLAs for 
troubleshooting Tomcat issues and outages. 
  
  
[[https://www.rosehosting.com|{{https://media.rosehosting.com/uploads/2016/12/rosehosting-logo50.png|https://www.rosehosting.com}}]]
  
@@ -79, +79 @@

  
[[http://www.nobleprog.com|{{http://www.nobleprog.com/sites/all/themes/nexus_subtheme/logo.png|http://www.nobleprog.com}}]]
  
  !NobleProg provides 

[Tomcat Wiki] Update of "SupportAndTraining" by markt

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "SupportAndTraining" page has been changed by markt:
https://wiki.apache.org/tomcat/SupportAndTraining?action=diff=62=63

Comment:
Headings were getting lost in the logos. Add horizontal rules to make then 
stand out.

  
  If you would like to add your company to this page, feel free to do so. You 
will need to create a wiki account to do so. There aren't any hard and fast 
rules about what is acceptable but please keep your entry to a few lines, a 
link and a small logo. Excessive entries will be edited. Remember to add you 
company to both sections if you provide support and training.
  
+ -
  = Support =
+ -
  
[[http://www.kippdata.de|{{http://www.kippdata.de/site/themes/kippdata/img/elements/kippdata_logo.gif|http://www.kippdata.de}}]]
  
  Kippdata's [[https://www.kippdata.de/tomcat/|eSupport for Apache Tomcat]] 
features several eSupport packages starting from basic support levels up to 
mission critical enterprise support. We actively contribute to the Apache 
Tomcat project, so that our bug fixes and other code enhancements become part 
of the standard Apache Tomcat code. Kippdata is located in Bonn, Germany.
@@ -59, +61 @@

  === Example company name ===
  Use this example as a basis for your entry. New entries should be added just 
above this example.
  
+ -
  = Training =
+ -
+ 
  
[[http://www.kippdata.de|{{http://www.kippdata.de/site/themes/kippdata/img/elements/kippdata_logo.gif|http://www.kippdata.de}}]]
  
  Kippdata offers a 
[[http://www.kippdata.de/red/workshops/opensource/|selection of trainings for 
Apache Tomcat]]. We focus on single day trainings like „Apache Tomcat Best 
Practices“, „Java Memory Sizing and Garbage Collection Tuning“. Kippdata is 
located in Bonn, Germany.

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

[Tomcat Wiki] Update of "SupportAndTraining" by markt

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "SupportAndTraining" page has been changed by markt:
https://wiki.apache.org/tomcat/SupportAndTraining?action=diff=61=62

Comment:
Add a logo for mechsoft otherwise their entry gets lots in the text

  
  !Intertech [[http://www.intertech.com|delivers training and consulting for 
Tomcat]] in our complete line-up of open source-related training and 
consulting.  For training, students can attend courses virtually, in-person at 
Intertech's facility, or we can come to your location.  
  
- [[http://mechsoft.com.tr|Mechsoft]]
+ 
[[http://mechsoft.com.tr|{{https://www.mechsoft.com.tr/images/logo/mechsoft.jpg|http://mechsoft.com.tr}}]]
  
  !MechSoft supports the development of open source software in Turkey and the 
world. We always aim to use open source applications and tools while developing 
our enterprise applications. Besides, our highly talented developers represent 
!MechSoft and Turkey at well-known open source foundation.  !MechSoft helps 
companies to adopt open source solutions in their IT infrastructure.
  

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

[Tomcat Wiki] Update of "SupportAndTraining" by markt

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "SupportAndTraining" page has been changed by markt:
https://wiki.apache.org/tomcat/SupportAndTraining?action=diff=60=61

Comment:
Add a logo for intertech else their entry gets lost in the text

  
  Savoir-faire Linux provides 24/7 support, consulting, development and 
training services on Apache Tomcat. We provide 
[[http://www.savoirfairelinux.com/services/training/open-source-softwares/oss111-tomcat|Tomcat
 training]] in our offices in Montreal, Quebec City and Ottawa, Canada. For 
private, on-site and custom courses, contact train...@savoirfairelinux.com or 
call 1-877-735-4689.
  
- 
[[http://www.intertech.com|{{attachment:intertech.jpg|http://www.intertech.com}}]]
+ 
[[http://www.intertech.com|{{attachment:intertech.jpg|http://www.intertech.com|width=100}}]]
  
  !Intertech [[http://www.intertech.com|delivers training and consulting for 
Tomcat]] in our complete line-up of open source-related training and 
consulting.  For training, students can attend courses virtually, in-person at 
Intertech's facility, or we can come to your location.  
  

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

[Tomcat Wiki] New attachment added to page SupportAndTraining

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page "SupportAndTraining" for change 
notification. An attachment has been added to that page by markt. Following 
detailed information is available:

Attachment name: intertech.jpg
Attachment size: 6926
Attachment link: 
https://wiki.apache.org/tomcat/SupportAndTraining?action=AttachFile=get=intertech.jpg
Page link: https://wiki.apache.org/tomcat/SupportAndTraining

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

[Tomcat Wiki] Update of "SupportAndTraining" by markt

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "SupportAndTraining" page has been changed by markt:
https://wiki.apache.org/tomcat/SupportAndTraining?action=diff=59=60

  
  Savoir-faire Linux provides 24/7 support, consulting, development and 
training services on Apache Tomcat. We provide 
[[http://www.savoirfairelinux.com/services/training/open-source-softwares/oss111-tomcat|Tomcat
 training]] in our offices in Montreal, Quebec City and Ottawa, Canada. For 
private, on-site and custom courses, contact train...@savoirfairelinux.com or 
call 1-877-735-4689.
  
+ 
[[http://www.intertech.com|{{attachment:intertech.jpg|http://www.intertech.com}}]]
  
  !Intertech [[http://www.intertech.com|delivers training and consulting for 
Tomcat]] in our complete line-up of open source-related training and 
consulting.  For training, students can attend courses virtually, in-person at 
Intertech's facility, or we can come to your location.  
  

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

[Tomcat Wiki] Update of "SupportAndTraining" by markt

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "SupportAndTraining" page has been changed by markt:
https://wiki.apache.org/tomcat/SupportAndTraining?action=diff=58=59

Comment:
Fix GFU logo

  
  !LearnComputer offers instructor-led online and onsite 
[[http://www.learncomputer.com/training/tomcat/|Tomcat training]] courses for 
companies and public. We also offer beginner to advanced courses in Android, 
Apache, Hadoop, PHP, MySQL, Linux, Java and Networking.
  
- 
[[http://www.gfu.net|{{http://www.gfu.net/css/screen/images/logo.jpg|http://www.gfu.net
 - GFU Cyrus AG in Köln}}]]
+ [[http://www.gfu.net|{{attachment:gfu.jpg|http://www.gfu.net - GFU Cyrus AG 
in Köln|height=100}}]]
  
  GFU Cyrus AG offers extensive 
[[http://www.gfu.net/schulung-tomcat-grundlagen.html|seminars and inhouse 
training on Apache Tomcat]], from basic principles to advanced and intensive 
courses. Architecture, installation and configuration – in the cologne training 
centre you obtain an overview of the possibilities of the application server.
  

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

[Tomcat Wiki] New attachment added to page SupportAndTraining

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page "SupportAndTraining" for change 
notification. An attachment has been added to that page by markt. Following 
detailed information is available:

Attachment name: gfu.jpg
Attachment size: 3601
Attachment link: 
https://wiki.apache.org/tomcat/SupportAndTraining?action=AttachFile=get=gfu.jpg
Page link: https://wiki.apache.org/tomcat/SupportAndTraining

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

[Tomcat Wiki] Update of "SupportAndTraining" by markt

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "SupportAndTraining" page has been changed by markt:
https://wiki.apache.org/tomcat/SupportAndTraining?action=diff=57=58

Comment:
Remove JMatrix. Website is no longer active.

  
  !Intertech [[http://www.intertech.com|delivers training and consulting for 
Tomcat]] in our complete line-up of open source-related training and 
consulting.  For training, students can attend courses virtually, in-person at 
Intertech's facility, or we can come to your location.  
  
- 
[[http://www.jmatrix.in//|{{http://www.jmatrix.in//attachments/Logo/SS_1.GIF?template=generic}}]]
- 
- Jmatrix provides technical support for tomcat customization and migration.
- 
  [[http://mechsoft.com.tr|Mechsoft]]
  
  !MechSoft supports the development of open source software in Turkey and the 
world. We always aim to use open source applications and tools while developing 
our enterprise applications. Besides, our highly talented developers represent 
!MechSoft and Turkey at well-known open source foundation.  !MechSoft helps 
companies to adopt open source solutions in their IT infrastructure.

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

[Bug 60911] NullpointerException in CoyoteAdapter.parseSessionSslId when using secure="true" on ajp-Connector

[bugzilla]

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

Didier Gutacker  changed:

   What|Removed |Added

   Keywords||PatchAvailable, RFC
   Priority|P2  |P1

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

[Tomcat Wiki] Update of "SupportAndTraining" by markt

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "SupportAndTraining" page has been changed by markt:
https://wiki.apache.org/tomcat/SupportAndTraining?action=diff=56=57

Comment:
Fix other Mulesoft logo

  
  Kippdata bietet eine 
[[http://www.kippdata.de/red/workshops/opensource/|Auswahl an Schulungen für 
Apache Tomcat]] an. Wir haben uns auf Ein-Tages-Schulungen zu Themen wie 
„Apache Tomcat Best Practices“, „Java Memory Sizing and Garbage Collection 
Tuning“ spezialisiert. Kippdata ist in Bonn, Deutschland, ansässig.
  
- 
[[http://www.MuleSoft.com|{{http://www.mulesoft.com/sites/default/files/mulesoft-logo-final.gif|http://www.MuleSoft.com}}]]
+ 
[[http://www.mulesoft.com|{{https://www.mulesoft.com/sites/default/files/3C_mulesoft_logo_updated.svg|http://www.mulesoft.com|width=150}}]]
  
  !MuleSoft provides comprehensive 
[[http://www.mulesoft.com/mule-training|Tomcat Training]] for users of Apache 
Tomcat. !MuleSoft offers a FREE pre-recorded training course to help users to 
get started with Apache Tomcat and also intensive instructor led training 
courses on advanced topics such as 
[[http://www.mulesoft.com/tomcat-performance-tuning|Tomcat performance 
tuning]], [[http://www.mulesoft.com/tomcat-configuration-training|configuration 
management]]. The training is designed by Tomcat experts and delivered by 
experienced instructors.
  

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

[Tomcat Wiki] Update of "SupportAndTraining" by markt

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "SupportAndTraining" page has been changed by markt:
https://wiki.apache.org/tomcat/SupportAndTraining?action=diff=55=56

Comment:
Fix broken Mulesoft logo

  
  Pivotal provides global, 24x7, 
[[http://www.pivotal.io/support/offerings|enterprise support]] for production 
users of Apache Tomcat. Pivotal employs the leading experts on Apache Tomcat to 
ensure that support customers can get their questions answered quickly and 
accurately and that bug fixes are incorporated into the open source code base.
  
- 
[[http://www.mulesoft.com|{{http://www.mulesoft.com/sites/default/files/mulesoft-logo-final.gif|http://www.mulesoft.com}}]]
+ 
[[http://www.mulesoft.com|{{https://www.mulesoft.com/sites/default/files/3C_mulesoft_logo_updated.svg|http://www.mulesoft.com|width=150}}]]
  
  !MuleSoft provides global [[http://www.mulesoft.com/tomcat-support|enterprise 
Tomcat support]] as well as free, user-contributed howto guides. A 
general-audience [[http://www.mulesoft.com/understanding-apache-tomcat|Apache 
Tomcat]] guide is meant for absolute beginners, while intermediate Tomcat users 
can benefit from guides on how to resolve 
[[http://www.mulesoft.com/tomcat-logging|Tomcat logging]] problems or how to 
use [[http://www.mulesoft.com/tomcat-eclipse|Tomcat in eclipse]]. !MuleSoft 
also provides resources on upcoming releases of Tomcat like 
[[http://www.mulesoft.com/tomcat-7|Tomcat 7]]. !MuleSoft employs leading 
experts and authors on Apache Tomcat to ensure that customers can get their 
questions answered quickly and accurately. !MuleSoft also provides 
[[http://www.mulesoft.com/free-apache-tomcat-support|Free Tomcat Assistance]].
  

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

[Bug 60911] New: NullpointerException in CoyoteAdapter.parseSessionSslId when using secure="true" on ajp-Connector

[bugzilla]

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

Bug ID: 60911
   Summary: NullpointerException in
CoyoteAdapter.parseSessionSslId when using
secure="true" on ajp-Connector
   Product: Tomcat 7
   Version: 7.0.53
  Hardware: Other
OS: Linux
Status: NEW
  Severity: critical
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: gutac...@online.de
  Target Milestone: ---

Prerequisits

enable the use of SSLSessionIds on an Apache HTTPD and tomcat (connected via
ajp protocol with Apache HTTPD as TLS connection endpoint):

1. server.xml
 

2. mod_jk.conf:

JkExtractSSL On
JkSESSIONIndicator SSL_SESSION_ID

Some clients (for example safari, internet explorer 11, curl) are able to issue
get requests to our application getting a http 200 response. Some clients
(firefox 52, chrome, SoapUI 5.2.1) are getting a http 500 response.

Further investigation shows this stacktrace in our catalina.out log:
Mar 23, 2017 6:45:52 PM org.apache.coyote.ajp.AjpProcessor process
SEVERE: Error processing request
java.lang.NullPointerException
at
org.apache.catalina.connector.CoyoteAdapter.parseSessionSslId(CoyoteAdapter.java:909)
at
org.apache.catalina.connector.CoyoteAdapter.postParseRequest(CoyoteAdapter.java:692)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:403)
at org.apache.coyote.ajp.AjpProcessor.process(AjpProcessor.java:193)
at
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:607)
at
org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor.run(JIoEndpoint.java:313)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)

This is caused by a missing sslsessionId in this code:
request.setRequestedSessionId(request.getAttribute(SSLSupport.SESSION_ID_KEY).toString());

A close look with a debugger shows that the request attribute is not present
and this leads to a NullpointerException because of the toString() method call
on a null value.

Further reading in RFC 5077 section 3.4 (see
https://tools.ietf.org/html/rfc5077#section-3.4) leads us to the conclusion
that the client decides if it wants to include the session id in the request or
not.
Thus the parseSessionSslId method should be aware of the possibility that the
session id might be missing.

I think the Code in the parseSessionSslId method should look like this:
String sessionId = request.getAttribute(SSLSupport.SESSION_ID_KEY);
request.setRequestedSessionId(sessionId == null ?  sessionId :
sessionId.toString());

Deeper investigation shows that this problem exists in tomcat 8 and 9 too.

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

[Tomcat Wiki] Update of "SupportAndTraining" by markt

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "SupportAndTraining" page has been changed by markt:
https://wiki.apache.org/tomcat/SupportAndTraining?action=diff=54=55

Comment:
Reduce logo size

  Site: [[http://www.opengate.biz|www.opengate.biz]]<>
  eMail: i...@opengate.biz.<><>
  
- 
[[https://www.pivotal.io/support/offerings|{{http://www.apache.org/foundation/images/pivotal-platinum.png|http://www.pivotal.io/support/offerings}}]]
+ 
[[https://www.pivotal.io/support/offerings|{{http://www.apache.org/foundation/images/pivotal-platinum.png|http://www.pivotal.io/support/offerings|width=150}}]]
  
  Pivotal provides global, 24x7, 
[[http://www.pivotal.io/support/offerings|enterprise support]] for production 
users of Apache Tomcat. Pivotal employs the leading experts on Apache Tomcat to 
ensure that support customers can get their questions answered quickly and 
accurately and that bug fixes are incorporated into the open source code base.
  

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

[Bug 60750] A response that uses Transfer-Encoding: chunked is missing the last zero-length chunk

[bugzilla]

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

sharan  changed:

   What|Removed |Added

Version|7.0.70  |7.0.0

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

Re: [Tomcat Wiki] Update of "SupportAndTraining" by LucaVisconti

[Mark Thomas]

On 24/03/17 10:13, Apache Wiki wrote:
> Dear Wiki user,
> 
> You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for 
> change notification.
> 
> The "SupportAndTraining" page has been changed by LucaVisconti:
> https://wiki.apache.org/tomcat/SupportAndTraining?action=diff=53=54
> 
> Comment:
> Sorry Pivotal, but I've noticed only now that on "Revision 44 as of 
> 2015-02-03 20:52:47" you changed your position from line 61 to in front of 
> Open Gate. I re-established original order.

If you are going to be picky about the history then I suggest you review
the full history of that page. Pivotal (then SpringSource) was the first
entry on the page and should be at the top of both lists (until it was
removed from the training section, anyway).

I will be reverting this change.

I will also review the change history for that page to ensure that all
entries are in the correct position.

Mark




> 
>   
>   Kippdatas [[https://www.kippdata.de/tomcat/|eSupport für Apache Tomcat]] 
> bietet von Basis Level Support bis hin zu Support für unternehmenskritische 
> Anwendungen verschiedene eSupport-Pakete. Wir beteiligen uns aktiv am Apache 
> Tomcat Projekt, so dass unsere Fehlerbeseitigungen und andere Erweiterungen 
> des Codes in den Standard Apache Tomcat Code einfliessen. Kippdata ist in 
> Bonn, Deutschland, ansässig.
>   
> - 
> [[https://www.pivotal.io/support/offerings|{{http://www.apache.org/foundation/images/pivotal-platinum.png|http://www.pivotal.io/support/offerings}}]]
> - 
> - Pivotal provides global, 24x7, 
> [[http://www.pivotal.io/support/offerings|enterprise support]] for production 
> users of Apache Tomcat. Pivotal employs the leading experts on Apache Tomcat 
> to ensure that support customers can get their questions answered quickly and 
> accurately and that bug fixes are incorporated into the open source code base.
> - 
>   
> [[http://www.opengate.biz/|{{http://www.opengate.biz/wp-content/uploads/2014/02/logo_opengate_hea...@2x-300x51.png|http://www.opengate.biz/}}]]
>   
>   !OpenGate provides support for Apache Tomcat enterprise users located in 
> Italy. !OpenGate has over 13 years experience in helping customers adopting 
> Apache Tomcat and hundreds of success stories.<> !OpenGate fornisce 
> supporto in Italia per gli utenti di Apache Tomcat. !OpenGate ha più di 13 
> anni di esperienza nell'aiutare i clienti nell'adozione di Apache Tomcat e 
> centinaia di storie di successo.<>
>   <>
>   Site: [[http://www.opengate.biz|www.opengate.biz]]<>
>   eMail: i...@opengate.biz.<><>
> + 
> + 
> [[https://www.pivotal.io/support/offerings|{{http://www.apache.org/foundation/images/pivotal-platinum.png|http://www.pivotal.io/support/offerings}}]]
> + 
> + Pivotal provides global, 24x7, 
> [[http://www.pivotal.io/support/offerings|enterprise support]] for production 
> users of Apache Tomcat. Pivotal employs the leading experts on Apache Tomcat 
> to ensure that support customers can get their questions answered quickly and 
> accurately and that bug fixes are incorporated into the open source code base.
>   
>   
> [[http://www.mulesoft.com|{{http://www.mulesoft.com/sites/default/files/mulesoft-logo-final.gif|http://www.mulesoft.com}}]]
>   
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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

JDK 9 EA Build 162 is available on java.net

[Rory O'Donnell]

Hi Mark,


*JDK 9 Early Access* b162   is 
available on java.net, summary of  changes are listed here 
.


There is one fix for a bug reported by Open Source projects since the 
last availability email  :


 * b161 - JDK 8176265 Method overload resolution on a covariant base
   type doesn't work in 9

Other change that maybe of interest:

 * b162 - JDK 8176503 security-libs Disable SHA-1 TLS Server Certificates


*Better tools for adjusting to strong encapsulation -* please read Mark 
Reinhold's email on this topic [1]

*
* *Quality Outreach Report for March 2017 *is available [2], many thanks 
for your continued support

and welcome to the new projects!

***Schedule - **JDK 9 Rampdown Phase 2*: Proposal accepted [3].
The overall goal of this process is to ensure that we fix just the bugs 
that must be fixed in order to ensure a successful release.


Oracle's JRE and JDK Cryptographic Roadmap has been updated since last 
availability email [4]


Rgds,Rory

[1] http://mail.openjdk.java.net/pipermail/jigsaw-dev/2017-March/011763.html
[2] 
https://wiki.openjdk.java.net/display/quality/Quality+Outreach+report+March+2017

[3] http://mail.openjdk.java.net/pipermail/jdk9-dev/2017-March/005689.html
[4] https://www.java.com/en/jre-jdk-cryptoroadmap.html

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

[Tomcat Wiki] Update of "SupportAndTraining" by LucaVisconti

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "SupportAndTraining" page has been changed by LucaVisconti:
https://wiki.apache.org/tomcat/SupportAndTraining?action=diff=53=54

Comment:
Sorry Pivotal, but I've noticed only now that on "Revision 44 as of 2015-02-03 
20:52:47" you changed your position from line 61 to in front of Open Gate. I 
re-established original order.

  
  Kippdatas [[https://www.kippdata.de/tomcat/|eSupport für Apache Tomcat]] 
bietet von Basis Level Support bis hin zu Support für unternehmenskritische 
Anwendungen verschiedene eSupport-Pakete. Wir beteiligen uns aktiv am Apache 
Tomcat Projekt, so dass unsere Fehlerbeseitigungen und andere Erweiterungen des 
Codes in den Standard Apache Tomcat Code einfliessen. Kippdata ist in Bonn, 
Deutschland, ansässig.
  
- 
[[https://www.pivotal.io/support/offerings|{{http://www.apache.org/foundation/images/pivotal-platinum.png|http://www.pivotal.io/support/offerings}}]]
- 
- Pivotal provides global, 24x7, 
[[http://www.pivotal.io/support/offerings|enterprise support]] for production 
users of Apache Tomcat. Pivotal employs the leading experts on Apache Tomcat to 
ensure that support customers can get their questions answered quickly and 
accurately and that bug fixes are incorporated into the open source code base.
- 
  
[[http://www.opengate.biz/|{{http://www.opengate.biz/wp-content/uploads/2014/02/logo_opengate_hea...@2x-300x51.png|http://www.opengate.biz/}}]]
  
  !OpenGate provides support for Apache Tomcat enterprise users located in 
Italy. !OpenGate has over 13 years experience in helping customers adopting 
Apache Tomcat and hundreds of success stories.<> !OpenGate fornisce 
supporto in Italia per gli utenti di Apache Tomcat. !OpenGate ha più di 13 anni 
di esperienza nell'aiutare i clienti nell'adozione di Apache Tomcat e centinaia 
di storie di successo.<>
  <>
  Site: [[http://www.opengate.biz|www.opengate.biz]]<>
  eMail: i...@opengate.biz.<><>
+ 
+ 
[[https://www.pivotal.io/support/offerings|{{http://www.apache.org/foundation/images/pivotal-platinum.png|http://www.pivotal.io/support/offerings}}]]
+ 
+ Pivotal provides global, 24x7, 
[[http://www.pivotal.io/support/offerings|enterprise support]] for production 
users of Apache Tomcat. Pivotal employs the leading experts on Apache Tomcat to 
ensure that support customers can get their questions answered quickly and 
accurately and that bug fixes are incorporated into the open source code base.
  
  
[[http://www.mulesoft.com|{{http://www.mulesoft.com/sites/default/files/mulesoft-logo-final.gif|http://www.mulesoft.com}}]]
  

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

[Bug 60854] Unintended JSESSIONID value change

[bugzilla]

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

--- Comment #9 from Jan Engehausen  ---
Hi Mark,

I can confirm that alwaysUseSession="true" does make all tests of the test
project pass. In our real life setup we do have a custom authenticator and can
implement the workaround as described.

I leave it up to you guys to decide if you change anything. As I said, I find
the current behviour "unexpected" and think that if it did not happen like that
there would be less confusion with other parties in the future.

Thanks, and kind regards,
Jan

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

[Tomcat Wiki] Update of "SupportAndTraining" by markt

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "SupportAndTraining" page has been changed by markt:
https://wiki.apache.org/tomcat/SupportAndTraining?action=diff=52=53

Comment:
Pivotal no longer offers Tomcat training

  
  Kippdata bietet eine 
[[http://www.kippdata.de/red/workshops/opensource/|Auswahl an Schulungen für 
Apache Tomcat]] an. Wir haben uns auf Ein-Tages-Schulungen zu Themen wie 
„Apache Tomcat Best Practices“, „Java Memory Sizing and Garbage Collection 
Tuning“ spezialisiert. Kippdata ist in Bonn, Deutschland, ansässig.
  
- 
[[http://www.pivotal.io/support/offerings|{{http://www.pivotal.io/assets/images/Pivotal_Logo.png|http://www.pivotal.io/support/offerings}}]]
- 
- Pivotal provides comprehensive 
[[http://mylearn.vmware.com/mgrReg/plan.cfm?plan=31719=www_edu|education]] 
on enterprise Java with specific 
[[http://mylearn.vmware.com/mgrreg/courses.cfm?ui=www_edu=one_subject=23470|training]]
 for Apache Tomcat. The four-day, intensive instructor-led training provides 
practical, hands-on knowledge about installation, configuration, deployment, 
load balancing and troubleshooting for production systems using Apache Tomcat.
- 
  
[[http://www.MuleSoft.com|{{http://www.mulesoft.com/sites/default/files/mulesoft-logo-final.gif|http://www.MuleSoft.com}}]]
  
  !MuleSoft provides comprehensive 
[[http://www.mulesoft.com/mule-training|Tomcat Training]] for users of Apache 
Tomcat. !MuleSoft offers a FREE pre-recorded training course to help users to 
get started with Apache Tomcat and also intensive instructor led training 
courses on advanced topics such as 
[[http://www.mulesoft.com/tomcat-performance-tuning|Tomcat performance 
tuning]], [[http://www.mulesoft.com/tomcat-configuration-training|configuration 
management]]. The training is designed by Tomcat experts and delivered by 
experienced instructors.

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

[Tomcat Wiki] Update of "SupportAndTraining" by markt

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "SupportAndTraining" page has been changed by markt:
https://wiki.apache.org/tomcat/SupportAndTraining?action=diff=51=52

Comment:
Fix logo

  
  Kippdatas [[https://www.kippdata.de/tomcat/|eSupport für Apache Tomcat]] 
bietet von Basis Level Support bis hin zu Support für unternehmenskritische 
Anwendungen verschiedene eSupport-Pakete. Wir beteiligen uns aktiv am Apache 
Tomcat Projekt, so dass unsere Fehlerbeseitigungen und andere Erweiterungen des 
Codes in den Standard Apache Tomcat Code einfliessen. Kippdata ist in Bonn, 
Deutschland, ansässig.
  
- 
[[https://www.pivotal.io/support/offerings|{{http://www.pivotal.io/assets/images/Pivotal_Logo.png|http://www.pivotal.io/support/offerings}}]]
+ 
[[https://www.pivotal.io/support/offerings|{{http://www.apache.org/foundation/images/pivotal-platinum.png|http://www.pivotal.io/support/offerings}}]]
  
  Pivotal provides global, 24x7, 
[[http://www.pivotal.io/support/offerings|enterprise support]] for production 
users of Apache Tomcat. Pivotal employs the leading experts on Apache Tomcat to 
ensure that support customers can get their questions answered quickly and 
accurately and that bug fixes are incorporated into the open source code base.
  

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

svn commit: r1788369 - /tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java

[kfujino]

Author: kfujino
Date: Fri Mar 24 06:28:26 2017
New Revision: 1788369

URL: http://svn.apache.org/viewvc?rev=1788369=rev
Log:
Fix JavaDoc.

Modified:

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java

Modified: 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java?rev=1788369=1788368=1788369=diff
==
--- 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
 Fri Mar 24 06:28:26 2017
@@ -22,7 +22,7 @@ import java.sql.SQLException;
 
 /**
  * A DisposableConnectionFacade object is the top most interceptor that wraps 
an
- * object of type {@link PooledConnection}. The ProxyCutOffConnection 
intercepts
+ * object of type {@link PooledConnection}. The DisposableConnectionFacade 
intercepts
  * two methods:
  * 
  *   {@link java.sql.Connection#close()} - returns the connection to the



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

svn commit: r1788368 - /tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java

[kfujino]

Author: kfujino
Date: Fri Mar 24 06:27:35 2017
New Revision: 1788368

URL: http://svn.apache.org/viewvc?rev=1788368=rev
Log:
Fix JavaDoc.

Modified:

tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java

Modified: 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java?rev=1788368=1788367=1788368=diff
==
--- 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
 Fri Mar 24 06:27:35 2017
@@ -22,7 +22,7 @@ import java.sql.SQLException;
 
 /**
  * A DisposableConnectionFacade object is the top most interceptor that wraps 
an
- * object of type {@link PooledConnection}. The ProxyCutOffConnection 
intercepts
+ * object of type {@link PooledConnection}. The DisposableConnectionFacade 
intercepts
  * two methods:
  * 
  *   {@link java.sql.Connection#close()} - returns the connection to the



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

svn commit: r1788367 - /tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java

[kfujino]

Author: kfujino
Date: Fri Mar 24 06:26:56 2017
New Revision: 1788367

URL: http://svn.apache.org/viewvc?rev=1788367=rev
Log:
Fix JavaDoc.

Modified:

tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java

Modified: 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java?rev=1788367=1788366=1788367=diff
==
--- 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
 Fri Mar 24 06:26:56 2017
@@ -22,7 +22,7 @@ import java.sql.SQLException;
 
 /**
  * A DisposableConnectionFacade object is the top most interceptor that wraps 
an
- * object of type {@link PooledConnection}. The ProxyCutOffConnection 
intercepts
+ * object of type {@link PooledConnection}. The DisposableConnectionFacade 
intercepts
  * two methods:
  * 
  *   {@link java.sql.Connection#close()} - returns the connection to the



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

svn commit: r1788366 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java

[kfujino]

Author: kfujino
Date: Fri Mar 24 06:25:51 2017
New Revision: 1788366

URL: http://svn.apache.org/viewvc?rev=1788366=rev
Log:
Fix JavaDoc.

Modified:

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java?rev=1788366=1788365=1788366=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DisposableConnectionFacade.java
 Fri Mar 24 06:25:51 2017
@@ -22,7 +22,7 @@ import java.sql.SQLException;
 
 /**
  * A DisposableConnectionFacade object is the top most interceptor that wraps 
an
- * object of type {@link PooledConnection}. The ProxyCutOffConnection 
intercepts
+ * object of type {@link PooledConnection}. The DisposableConnectionFacade 
intercepts
  * two methods:
  * 
  *   {@link java.sql.Connection#close()} - returns the connection to the



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

svn commit: r1788365 - /tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java

[kfujino]

Author: kfujino
Date: Fri Mar 24 06:17:15 2017
New Revision: 1788365

URL: http://svn.apache.org/viewvc?rev=1788365=rev
Log:
Remove unnecessary ;

Modified:

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java

Modified: 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java?rev=1788365=1788364=1788365=diff
==
--- 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java
 Fri Mar 24 06:17:15 2017
@@ -129,7 +129,7 @@ public class StatementFacade extends Abs
 if (delegate == null) return null;
 }
 if (compare(ISCLOSED_VAL, method)) {
-if (delegate == null) return Boolean.TRUE;;
+if (delegate == null) return Boolean.TRUE;
 }
 
 Object result =  null;



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

svn commit: r1788364 - /tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java

[kfujino]

Author: kfujino
Date: Fri Mar 24 06:16:48 2017
New Revision: 1788364

URL: http://svn.apache.org/viewvc?rev=1788364=rev
Log:
Remove unnecessary ;

Modified:

tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java

Modified: 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java?rev=1788364=1788363=1788364=diff
==
--- 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java
 Fri Mar 24 06:16:48 2017
@@ -129,7 +129,7 @@ public class StatementFacade extends Abs
 if (delegate == null) return null;
 }
 if (compare(ISCLOSED_VAL, method)) {
-if (delegate == null) return Boolean.TRUE;;
+if (delegate == null) return Boolean.TRUE;
 }
 
 Object result =  null;



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