Re: Release plans

[Mark Thomas]

On 04/05/17 07:35, Violeta Georgieva wrote:
> 2017-05-04 9:33 GMT+03:00 Violeta Georgieva :
>>
>> Hi,
>>
>> 2017-05-04 1:10 GMT+03:00 Mark Thomas :
>>>
>>> On 02/05/17 18:03, Mark Thomas wrote:
 Hi all,

 A new month has started so I'm intending to do a 9.0.x and 8.5.x
> release
 fairly soon. There are a couple of issues that I think need to be
 resolved first:

 - https://bz.apache.org/bugzilla/show_bug.cgi?id=61057 (ECJ)
 - https://bz.apache.org/bugzilla/show_bug.cgi?id=61003 (WebSocket)
>>
>> I can handle these bug reports if you did start to fix them.
> 
> I meant "didn't start ..."

That would be great. I haven't started on those at all yet.

Mark


> 
>>
>> Regards,
>> Violeta
>>
 - Trailer header support (Servlet 4.0)

 I'm currently expecting to be able to tag some time in the next 12 to
> 48
 hours depending on how work on those issues progresses.
>>>
>>> FYI, response trailer header support and HTTP/2 is taking me a little
>>> longer than expected. I'm trying to reduce some code duplication so we
>>> don't end up with 6 copies of nearly identical code.
>>>
>>> Mark
>>>
>>>
>>> -
>>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>>
> 


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

Re: Release plans

[Violeta Georgieva]

2017-05-04 10:23 GMT+03:00 Mark Thomas :
>
> On 04/05/17 07:35, Violeta Georgieva wrote:
> > 2017-05-04 9:33 GMT+03:00 Violeta Georgieva :
> >>
> >> Hi,
> >>
> >> 2017-05-04 1:10 GMT+03:00 Mark Thomas :
> >>>
> >>> On 02/05/17 18:03, Mark Thomas wrote:
>  Hi all,
> 
>  A new month has started so I'm intending to do a 9.0.x and 8.5.x
> > release
>  fairly soon. There are a couple of issues that I think need to be
>  resolved first:
> 
>  - https://bz.apache.org/bugzilla/show_bug.cgi?id=61057 (ECJ)
>  - https://bz.apache.org/bugzilla/show_bug.cgi?id=61003 (WebSocket)
> >>
> >> I can handle these bug reports if you did start to fix them.
> >
> > I meant "didn't start ..."
>
> That would be great. I haven't started on those at all yet.

ok

>
>
> Mark
>
>
> >
> >>
> >> Regards,
> >> Violeta
> >>
>  - Trailer header support (Servlet 4.0)
> 
>  I'm currently expecting to be able to tag some time in the next 12 to
> > 48
>  hours depending on how work on those issues progresses.
> >>>
> >>> FYI, response trailer header support and HTTP/2 is taking me a little
> >>> longer than expected. I'm trying to reduce some code duplication so we
> >>> don't end up with 6 copies of nearly identical code.
> >>>
> >>> Mark
> >>>
> >>>
> >>> -
> >>> 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
>

svn commit: r1793744 - in /tomcat/trunk: java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu May  4 08:00:01 2017
New Revision: 1793744

URL: http://svn.apache.org/viewvc?rev=1793744&view=rev
Log:
When sending an HTTP/2 push promise with the NIO2 connector, the pushed stream 
ID should only be included with the initial push promise frame and not any 
subsequent continuation frames.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
tomcat/trunk/webapps/docs/changelog.xml

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=1793744&r1=1793743&r2=1793744&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java Thu 
May  4 08:00:01 2017
@@ -205,7 +205,9 @@ public class Http2AsyncUpgradeHandler ex
 while (state != State.COMPLETE) {
 byte[] header = new byte[9];
 ByteBuffer target = ByteBuffer.allocate(payloadSize);
-target.put(pushedStreamIdBytes);
+if (first) {
+target.put(pushedStreamIdBytes);
+}
 state = getHpackEncoder().encode(coyoteRequest.getMimeHeaders(), 
target);
 target.flip();
 if (state == State.COMPLETE || target.limit() > 0) {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1793744&r1=1793743&r2=1793744&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May  4 08:00:01 2017
@@ -130,6 +130,11 @@
 Do not include a Date header in HTTP/2 reponses with 
status
 codes less than 200. (markt)
   
+  
+When sending an HTTP/2 push promise with the NIO2 connector, the pushed
+stream ID should only be included with the initial push promise frame
+and not any subsequent continuation frames. (markt)
+  
 
   
   



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

svn commit: r1793746 - in /tomcat/trunk: ./ res/ide-support/eclipse/ res/ide-support/netbeans/ res/maven/ webapps/docs/

[violetagg]

Author: violetagg
Date: Thu May  4 08:07:10 2017
New Revision: 1793746

URL: http://svn.apache.org/viewvc?rev=1793746&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61057
Update to Eclipse JDT Compiler 4.6.3.

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties
tomcat/trunk/res/ide-support/netbeans/project.xml
tomcat/trunk/res/maven/tomcat-embed-jasper.pom
tomcat/trunk/res/maven/tomcat-jasper.pom
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1793746&r1=1793745&r2=1793746&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu May  4 08:07:10 2017
@@ -117,8 +117,8 @@ wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j
 
 # - Eclipse JDT, version 4.5.1 or later -#
 # See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
-jdt.version=4.6.1
-jdt.release=R-4.6.1-201609071200
+jdt.version=4.6.3
+jdt.release=R-4.6.3-201703010400
 jdt.home=${base.path}/ecj-${jdt.version}
 jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
 # The download will be moved to the archive area eventually. We are taking 
care of that in advance.

Modified: tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1793746&r1=1793745&r2=1793746&view=diff
==
--- tomcat/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/trunk/res/ide-support/eclipse/eclipse.classpath Thu May  4 08:07:10 
2017
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 

Modified: tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties?rev=1793746&r1=1793745&r2=1793746&view=diff
==
--- tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties (original)
+++ tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties Thu May  4 
08:07:10 2017
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.6.1/ecj-4.6.1.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 

Modified: tomcat/trunk/res/ide-support/netbeans/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/netbeans/project.xml?rev=1793746&r1=1793745&r2=1793746&view=diff
==
--- tomcat/trunk/res/ide-support/netbeans/project.xml (original)
+++ tomcat/trunk/res/ide-support/netbeans/project.xml Thu May  4 08:07:10 2017
@@ -178,7 +178,7 @@
 -->
 
 java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.2/wsdl4j-1.6.2.jar:${base.path}/ecj-4.6.1/ecj-4.6.1.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.2/wsdl4j-1.6.2.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${ant.includes}/
 1.7
 
 

Modified: tomcat/trunk/res/maven/tomcat-embed-jasper.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-jasper.pom?rev=1793746&r1=1793745&r2=1793746&view=diff
==
--- tomcat/trunk/res/maven/tomcat-embed-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-jasper.pom Thu May  4 08:07:10 2017
@@ -43,9 +43,9 @@
   compile
 
 
-  org.eclipse.jdt.core.compiler
+  org.eclipse.jdt
   ecj
-  4.6.1
+  3.12.3
 
   
 

Modified: tomcat/trunk/res/maven/tomcat-jasper.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jasper.pom?rev=1793746&r1=1793745&r2=1793746&view=diff
==
--- tomcat/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/t

svn commit: r1793747 - in /tomcat/tc8.5.x/trunk: ./ res/ide-support/eclipse/ res/ide-support/netbeans/ res/maven/ webapps/docs/

[violetagg]

Author: violetagg
Date: Thu May  4 08:11:23 2017
New Revision: 1793747

URL: http://svn.apache.org/viewvc?rev=1793747&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61057
Update to Eclipse JDT Compiler 4.6.3.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/build.properties.default
tomcat/tc8.5.x/trunk/res/ide-support/eclipse/eclipse.classpath
tomcat/tc8.5.x/trunk/res/ide-support/netbeans/nb-tomcat-build.properties
tomcat/tc8.5.x/trunk/res/ide-support/netbeans/project.xml
tomcat/tc8.5.x/trunk/res/maven/tomcat-embed-jasper.pom
tomcat/tc8.5.x/trunk/res/maven/tomcat-jasper.pom
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

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

svn commit: r1793748 - in /tomcat/tc8.0.x/trunk: ./ res/ide-support/eclipse/ res/ide-support/netbeans/ res/maven/ webapps/docs/

[violetagg]

Author: violetagg
Date: Thu May  4 08:14:31 2017
New Revision: 1793748

URL: http://svn.apache.org/viewvc?rev=1793748&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61057
Update to Eclipse JDT Compiler 4.6.3.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/build.properties.default
tomcat/tc8.0.x/trunk/res/ide-support/eclipse/eclipse.classpath
tomcat/tc8.0.x/trunk/res/ide-support/netbeans/nb-tomcat-build.properties
tomcat/tc8.0.x/trunk/res/ide-support/netbeans/project.xml
tomcat/tc8.0.x/trunk/res/maven/tomcat-embed-jasper.pom
tomcat/tc8.0.x/trunk/res/maven/tomcat-jasper.pom
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  4 08:14:31 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779

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

[violetagg]

Author: violetagg
Date: Thu May  4 08:20:08 2017
New Revision: 1793750

URL: http://svn.apache.org/viewvc?rev=1793750&view=rev
Log:
Fix typo

Modified:
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1793750&r1=1793749&r2=1793750&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu May  4 08:20:08 2017
@@ -153,7 +153,7 @@
 repository. (markt)
   
   
-Review i18n property files, remove unencessary escaping and 
consistently
+Review i18n property files, remove unnecessary escaping and 
consistently
 use [...] to delimit inserted values. (markt)
   
 



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

[Bug 61057] Tomcat JDT 4.6.1 Issues.

[bugzilla]

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

Violeta Georgieva  changed:

   What|Removed |Added

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

--- Comment #4 from Violeta Georgieva  ---
Hi,

Thanks for the report.
The fix was committed in:
- trunk for 9.0.0.M21 onwards
- 8.5.x for 8.5.15 onwards
- 8.0.x for 8.0.44 onwards

Regards,
Violeta

-- 
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: r1793758 - in /tomcat/trunk/java/org/apache/coyote/http2: Http2AsyncUpgradeHandler.java Http2UpgradeHandler.java Stream.java

[markt]

Author: markt
Date: Thu May  4 09:22:45 2017
New Revision: 1793758

URL: http://svn.apache.org/viewvc?rev=1793758&view=rev
Log:
Refactor to reduce duplication prior to adding trailer header support.

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

Modified: 
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java?rev=1793758&r1=1793757&r2=1793758&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java Thu 
May  4 09:22:45 2017
@@ -25,8 +25,8 @@ import java.util.concurrent.TimeUnit;
 import org.apache.coyote.Adapter;
 import org.apache.coyote.ProtocolException;
 import org.apache.coyote.Request;
-import org.apache.coyote.Response;
 import org.apache.coyote.http2.HpackEncoder.State;
+import org.apache.tomcat.util.http.MimeHeaders;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 import org.apache.tomcat.util.net.SocketWrapperBase.BlockingMode;
 
@@ -133,88 +133,49 @@ public class Http2AsyncUpgradeHandler ex
 
 
 @Override
-void writeHeaders(Stream stream, Response coyoteResponse, boolean 
endOfStream, int payloadSize)
-throws IOException {
+void writeHeaders(Stream stream, int pushedStreamId, MimeHeaders 
mimeHeaders,
+boolean endOfStream, int payloadSize) throws IOException {
+
 if (log.isDebugEnabled()) {
 log.debug(sm.getString("upgradeHandler.writeHeaders", connectionId,
-stream.getIdentifier()));
+stream.getIdentifier(), Integer.valueOf(pushedStreamId),
+Boolean.valueOf(endOfStream)));
 }
 
 if (!stream.canWrite()) {
 return;
 }
 
-boolean first = true;
-State state = null;
-ArrayList bufs = new ArrayList<>();
-// This ensures the Stream processing thread has control of the socket.
-while (state != State.COMPLETE) {
-byte[] header = new byte[9];
-ByteBuffer target = ByteBuffer.allocate(payloadSize);
-state = getHpackEncoder().encode(coyoteResponse.getMimeHeaders(), 
target);
-target.flip();
-if (state == State.COMPLETE || target.limit() > 0) {
-ByteUtil.setThreeBytes(header, 0, target.limit());
-if (first) {
-first = false;
-header[3] = FrameType.HEADERS.getIdByte();
-if (endOfStream) {
-header[4] = FLAG_END_OF_STREAM;
-}
-} else {
-header[3] = FrameType.CONTINUATION.getIdByte();
-}
-if (state == State.COMPLETE) {
-header[4] += FLAG_END_OF_HEADERS;
-}
-if (log.isDebugEnabled()) {
-log.debug(target.limit() + " bytes");
-}
-ByteUtil.set31Bits(header, 5, 
stream.getIdentifier().intValue());
-bufs.add(ByteBuffer.wrap(header));
-bufs.add(target);
-} else if (state == State.UNDERFLOW) {
-payloadSize = payloadSize * 2;
-}
-}
-socketWrapper.write(BlockingMode.SEMI_BLOCK, getWriteTimeout(), 
TimeUnit.MILLISECONDS,
-null, SocketWrapperBase.COMPLETE_WRITE, 
applicationErrorCompletion,
-bufs.toArray(BYTEBUFFER_ARRAY));
-handleAsyncException();
-}
-
-
-@Override
-protected void writePushHeaders(Stream stream, int pushedStreamId, Request 
coyoteRequest, int payloadSize)
-throws IOException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("upgradeHandler.writePushHeaders", 
connectionId,
-stream.getIdentifier(), Integer.toString(pushedStreamId)));
-}
-
-if (!stream.canWrite()) {
-return;
+byte[] pushedStreamIdBytes = null;
+if (pushedStreamId > 0) {
+pushedStreamIdBytes = new byte[4];
+ByteUtil.set31Bits(pushedStreamIdBytes, 0, pushedStreamId);
 }
 
 boolean first = true;
 State state = null;
 ArrayList bufs = new ArrayList<>();
-byte[] pushedStreamIdBytes = new byte[4];
-ByteUtil.set31Bits(pushedStreamIdBytes, 0, pushedStreamId);
-// This ensures the Stream processing thread has control of the socket.
+
 while (state != State.COMPLETE) {
 byte[] header = new byte[9];
-ByteBuffer target = ByteBuffer.allocate(payloadSize);
-if

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

[markt]

Author: markt
Date: Thu May  4 10:11:24 2017
New Revision: 1793763

URL: http://svn.apache.org/viewvc?rev=1793763&view=rev
Log:
More refactoring to reduce duplication prior to adding trailer header support.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.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=1793763&r1=1793762&r2=1793763&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java Thu 
May  4 10:11:24 2017
@@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit;
 import org.apache.coyote.Adapter;
 import org.apache.coyote.ProtocolException;
 import org.apache.coyote.Request;
-import org.apache.coyote.http2.HpackEncoder.State;
 import org.apache.tomcat.util.http.MimeHeaders;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 import org.apache.tomcat.util.net.SocketWrapperBase.BlockingMode;
@@ -135,67 +134,13 @@ public class Http2AsyncUpgradeHandler ex
 @Override
 void writeHeaders(Stream stream, int pushedStreamId, MimeHeaders 
mimeHeaders,
 boolean endOfStream, int payloadSize) throws IOException {
+doWriteHeaders(stream, pushedStreamId, mimeHeaders, endOfStream, 
payloadSize);
+}
 
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("upgradeHandler.writeHeaders", connectionId,
-stream.getIdentifier(), Integer.valueOf(pushedStreamId),
-Boolean.valueOf(endOfStream)));
-}
-
-if (!stream.canWrite()) {
-return;
-}
-
-byte[] pushedStreamIdBytes = null;
-if (pushedStreamId > 0) {
-pushedStreamIdBytes = new byte[4];
-ByteUtil.set31Bits(pushedStreamIdBytes, 0, pushedStreamId);
-}
 
-boolean first = true;
-State state = null;
-ArrayList bufs = new ArrayList<>();
-
-while (state != State.COMPLETE) {
-byte[] header = new byte[9];
-ByteBuffer payload = ByteBuffer.allocate(payloadSize);
-if (first && pushedStreamIdBytes != null) {
-payload.put(pushedStreamIdBytes);
-}
-state = getHpackEncoder().encode(mimeHeaders, payload);
-payload.flip();
-if (state == State.COMPLETE || payload.limit() > 0) {
-ByteUtil.setThreeBytes(header, 0, payload.limit());
-if (first) {
-first = false;
-if (pushedStreamIdBytes == null) {
-header[3] = FrameType.HEADERS.getIdByte();
-} else {
-header[3] = FrameType.PUSH_PROMISE.getIdByte();
-}
-if (endOfStream) {
-header[4] = FLAG_END_OF_STREAM;
-}
-} else {
-header[3] = FrameType.CONTINUATION.getIdByte();
-}
-if (state == State.COMPLETE) {
-header[4] += FLAG_END_OF_HEADERS;
-}
-if (log.isDebugEnabled()) {
-log.debug(payload.limit() + " bytes");
-}
-ByteUtil.set31Bits(header, 5, 
stream.getIdentifier().intValue());
-bufs.add(ByteBuffer.wrap(header));
-bufs.add(payload);
-} else if (state == State.UNDERFLOW) {
-payloadSize = payloadSize * 2;
-}
-}
-socketWrapper.write(BlockingMode.SEMI_BLOCK, getWriteTimeout(), 
TimeUnit.MILLISECONDS,
-null, SocketWrapperBase.COMPLETE_WRITE, 
applicationErrorCompletion,
-bufs.toArray(BYTEBUFFER_ARRAY));
-handleAsyncException();
+@Override
+protected HeaderFrameBuffers getHeaderFrameBuffers(int initialPayloadSize) 
{
+return new AsyncHeaderFrameBuffers(initialPayloadSize);
 }
 
 
@@ -315,4 +260,53 @@ public class Http2AsyncUpgradeHandler ex
 
 }
 
+
+private class AsyncHeaderFrameBuffers implements HeaderFrameBuffers {
+
+int payloadSize;
+
+private byte[] header;
+private ByteBuffer payload;
+
+private final ArrayList bufs = new ArrayList<>();
+
+public AsyncHeaderFrameBuffers(int initialPayloadSize) {
+this.payloadSize = initialPayloadSize;
+}
+
+@Override
+public void startFrame() {
+header = new byte[9];
+payload = ByteBuffer.allocate(payloadSize);
+}
+
+@Override
+public void endFrame() throws IOException {
+bufs.add(ByteBuffer.wr

Re: Release plans

[Mark Thomas]

I'm going to hold off on the implementation of the response trailer
support. There is some EG discussion that looks like it is going to
change the API.

I should be able to tag 9.0.x and 8.5.x later today.

Mark


On 04/05/17 08:28, Violeta Georgieva wrote:
> 2017-05-04 10:23 GMT+03:00 Mark Thomas :
>>
>> On 04/05/17 07:35, Violeta Georgieva wrote:
>>> 2017-05-04 9:33 GMT+03:00 Violeta Georgieva :

 Hi,

 2017-05-04 1:10 GMT+03:00 Mark Thomas :
>
> On 02/05/17 18:03, Mark Thomas wrote:
>> Hi all,
>>
>> A new month has started so I'm intending to do a 9.0.x and 8.5.x
>>> release
>> fairly soon. There are a couple of issues that I think need to be
>> resolved first:
>>
>> - https://bz.apache.org/bugzilla/show_bug.cgi?id=61057 (ECJ)
>> - https://bz.apache.org/bugzilla/show_bug.cgi?id=61003 (WebSocket)

 I can handle these bug reports if you did start to fix them.
>>>
>>> I meant "didn't start ..."
>>
>> That would be great. I haven't started on those at all yet.
> 
> ok
> 
>>
>>
>> Mark
>>
>>
>>>

 Regards,
 Violeta

>> - Trailer header support (Servlet 4.0)
>>
>> I'm currently expecting to be able to tag some time in the next 12 to
>>> 48
>> hours depending on how work on those issues progresses.
>
> FYI, response trailer header support and HTTP/2 is taking me a little
> longer than expected. I'm trying to reduce some code duplication so we
> don't end up with 6 copies of nearly identical code.
>
> Mark
>
>
> -
> 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
>>
> 


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

svn commit: r1793771 - in /tomcat/trunk: java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Thu May  4 11:16:02 2017
New Revision: 1793771

URL: http://svn.apache.org/viewvc?rev=1793771&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61003
Ensure the flags for reading/writing are correctly reset even if some 
exceptions occurred during processing.

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java?rev=1793771&r1=1793770&r2=1793771&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java 
Thu May  4 11:16:02 2017
@@ -236,6 +236,7 @@ public class AsyncChannelWrapperSecure i
 "asyncChannelWrapperSecure.wrongStateWrite")));
 }
 } catch (Exception e) {
+writing.set(false);
 future.fail(e);
 }
 }
@@ -335,6 +336,7 @@ public class AsyncChannelWrapperSecure i
 "asyncChannelWrapperSecure.wrongStateRead")));
 }
 } catch (Exception e) {
+reading.set(false);
 future.fail(e);
 }
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1793771&r1=1793770&r2=1793771&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May  4 11:16:02 2017
@@ -161,6 +161,11 @@
 o.a.tomcat.websocket.WsSession#resume that can be used to
 suspend/resume reading of the incoming messages. (violetagg)
   
+  
+61003: Ensure the flags for reading/writing in
+o.a.t.websocket.AsyncChannelWrapperSecure are correctly
+reset even if some exceptions occurred during processing. (violetagg)
+  
 
   
   



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

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

[violetagg]

Author: violetagg
Date: Thu May  4 11:18:23 2017
New Revision: 1793774

URL: http://svn.apache.org/viewvc?rev=1793774&view=rev
Log:
update changelog

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=1793774&r1=1793773&r2=1793774&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May  4 11:18:23 2017
@@ -164,7 +164,7 @@
   
 61003: Ensure the flags for reading/writing in
 o.a.t.websocket.AsyncChannelWrapperSecure are correctly
-reset even if some exceptions occurred during processing. (violetagg)
+reset even if some exceptions occurred during processing. 
(markt/violetagg)
   
 
   



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

svn commit: r1793775 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Thu May  4 11:21:24 2017
New Revision: 1793775

URL: http://svn.apache.org/viewvc?rev=1793775&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61003
Ensure the flags for reading/writing are correctly reset even if some 
exceptions occurred during processing.

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

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

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

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

[markt]

Author: markt
Date: Thu May  4 11:24:33 2017
New Revision: 1793776

URL: http://svn.apache.org/viewvc?rev=1793776&view=rev
Log: (empty)

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=1793776&r1=1793775&r2=1793776&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May  4 11:24:33 2017
@@ -127,8 +127,8 @@
 (markt)
   
   
-Do not include a Date header in HTTP/2 reponses with 
status
-codes less than 200. (markt)
+Do not include a Date header in HTTP/2 responses with
+status codes less than 200. (markt)
   
   
 When sending an HTTP/2 push promise with the NIO2 connector, the pushed



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

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

[markt]

Author: markt
Date: Thu May  4 11:24:56 2017
New Revision: 1793777

URL: http://svn.apache.org/viewvc?rev=1793777&view=rev
Log:
Format
No functional change

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=1793777&r1=1793776&r2=1793777&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Thu May  
4 11:24:56 2017
@@ -173,10 +173,12 @@ class Http2UpgradeHandler extends Abstra
 }
 }
 
+
 protected PingManager getPingManager() {
 return new PingManager();
 }
 
+
 @Override
 public void init(WebConnection webConnection) {
 if (log.isDebugEnabled()) {
@@ -254,6 +256,7 @@ class Http2UpgradeHandler extends Abstra
 }
 }
 
+
 private void processStreamOnContainerThread(Stream stream) {
 StreamProcessor streamProcessor = new StreamProcessor(this, stream, 
adapter, socketWrapper);
 streamProcessor.setSslSupport(sslSupport);



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

svn commit: r1793778 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2UpgradeHandler.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu May  4 11:25:35 2017
New Revision: 1793778

URL: http://svn.apache.org/viewvc?rev=1793778&view=rev
Log:
Do not include a Date header in HTTP/2 responses with status codes less than 
200.

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/webapps/docs/changelog.xml

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

svn commit: r1793781 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/coyote/http2/TestHttp2Section_8_1.java

[markt]

Author: markt
Date: Thu May  4 11:26:46 2017
New Revision: 1793781

URL: http://svn.apache.org/viewvc?rev=1793781&view=rev
Log:
100-Continue response no longer has a date header

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

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

svn commit: r1793782 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Thu May  4 11:27:09 2017
New Revision: 1793782

URL: http://svn.apache.org/viewvc?rev=1793782&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61003
Ensure the flags for reading/writing are correctly reset even if some 
exceptions occurred during processing.

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

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

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

svn commit: r1793784 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Thu May  4 11:29:31 2017
New Revision: 1793784

URL: http://svn.apache.org/viewvc?rev=1793784&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61003
Ensure the flags for reading/writing are correctly reset even if some 
exceptions occurred during processing.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  4 11:29:31 2017
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702
 
742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1
 
726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559
 
/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,1740981,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,1743118,1743126,1743139-1743140,1743718,1743722,1743724,1744059,1744127,1744151,1744232,1744377,1744687,1744698,1744706,1745228,1746940,1748548,1748716,1749288,1749

Re: Release plans

[Violeta Georgieva]

2017-05-04 14:02 GMT+03:00 Mark Thomas :
>
> I'm going to hold off on the implementation of the response trailer
> support. There is some EG discussion that looks like it is going to
> change the API.
>
> I should be able to tag 9.0.x and 8.5.x later today.

I committed the fixes that I wanted.

Violeta

>
> Mark
>
>
> On 04/05/17 08:28, Violeta Georgieva wrote:
> > 2017-05-04 10:23 GMT+03:00 Mark Thomas :
> >>
> >> On 04/05/17 07:35, Violeta Georgieva wrote:
> >>> 2017-05-04 9:33 GMT+03:00 Violeta Georgieva :
> 
>  Hi,
> 
>  2017-05-04 1:10 GMT+03:00 Mark Thomas :
> >
> > On 02/05/17 18:03, Mark Thomas wrote:
> >> Hi all,
> >>
> >> A new month has started so I'm intending to do a 9.0.x and 8.5.x
> >>> release
> >> fairly soon. There are a couple of issues that I think need to be
> >> resolved first:
> >>
> >> - https://bz.apache.org/bugzilla/show_bug.cgi?id=61057 (ECJ)
> >> - https://bz.apache.org/bugzilla/show_bug.cgi?id=61003 (WebSocket)
> 
>  I can handle these bug reports if you did start to fix them.
> >>>
> >>> I meant "didn't start ..."
> >>
> >> That would be great. I haven't started on those at all yet.
> >
> > ok
> >
> >>
> >>
> >> Mark
> >>
> >>
> >>>
> 
>  Regards,
>  Violeta
> 
> >> - Trailer header support (Servlet 4.0)
> >>
> >> I'm currently expecting to be able to tag some time in the next 12
to
> >>> 48
> >> hours depending on how work on those issues progresses.
> >
> > FYI, response trailer header support and HTTP/2 is taking me a
little
> > longer than expected. I'm trying to reduce some code duplication so
we
> > don't end up with 6 copies of nearly identical code.
> >
> > Mark
> >
> >
> >
-
> > 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
> >>
> >
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

[Bug 61003] Secure Websocket client hides Exception on error, and throws an IllegalStateException instead

[bugzilla]

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

Violeta Georgieva  changed:

   What|Removed |Added

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

--- Comment #3 from Violeta Georgieva  ---
Hi,

Thanks for the report.
The fix was committed in:
- trunk for 9.0.0.M21 onwards
- 8.5.x for 8.5.15 onwards
- 8.0.x for 8.0.44 onwards
- 7.0.x for 7.0.78 onwards

Regards,
Violeta

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

buildbot failure in on tomcat-8-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

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

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

[Bug 61069] New: able to see more than 10 threads, maxThread configuration to 10

[bugzilla]

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

Bug ID: 61069
   Summary: able to see more than 10 threads, maxThread
configuration to 10
   Product: Tomcat 6
   Version: 6.0.0
  Hardware: PC
Status: NEW
  Severity: critical
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: shailu@gmail.com
  Target Milestone: default

Created attachment 34973
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=34973&action=edit
server.xml

We have updated the maxThread configuration to 10 at below place in server.xml
of DEV environment. However I was able to see more than 10 threads. I have also
attached the server.xml

I need your help to understand if I am doing something wrong or it is an
expected behaviour?


 A "Connector" represents an endpoint by which requests are received
 and responses are returned. Documentation at :
 Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
 Java AJP  Connector: /docs/config/ajp.html
 APR (HTTP/AJP) Connector: /docs/apr.html
 Define a non-SSL HTTP/1.1 Connector on port 8080

-->



-- 
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 61069] able to see more than 10 threads, maxThread configuration to 10

[bugzilla]

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

shailesh jain  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from shailesh jain  ---
We have updated the maxThread configuration to 10 at below place in server.xml
of DEV environment. However I was able to see more than 10 threads in jConsole
. I have also attached the server.xml

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

scanning in embedded mode

[Romain Manni-Bucau]

Hi guys,

on java 9 in embedded mode the app loader is no more a URLClassLoader so
StandardScanner "fails" silently. Is it plan to read java.class.path as a
fallback or something else?

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | JavaEE Factory

[Bug 61069] able to see more than 10 threads, maxThread configuration to 10

[bugzilla]

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

Violeta Georgieva  changed:

   What|Removed |Added

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

--- Comment #2 from Violeta Georgieva  ---
Hi,

Bugzilla is not a support forum. Ask you question on the users mailing list.
http://tomcat.apache.org/lists.html#tomcat-users

Please note that Apache Tomcat 6.0.x has reached end of life.
http://tomcat.apache.org/tomcat-60-eol.html

Regards,
Violeta

-- 
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: scanning in embedded mode

[Mark Thomas]

On 04/05/17 13:54, Romain Manni-Bucau wrote:
> Hi guys,
> 
> on java 9 in embedded mode the app loader is no more a URLClassLoader so
> StandardScanner "fails" silently. Is it plan to read java.class.path as a
> fallback or something else?

TBD at this point.

Following up on this with the Java 9 team is on my TODO list. See the EA
build 167 thread.

Mark


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

Tomcat 6 now closed to new bugs in Bugzilla

[Mark Thomas]

FYI,

I've just configured the Tomcat 6 project in Bugzilla not to accept new
bugs.

Once the existing open Tomcat 6 bugs have been reviewed, we can make the
project read only. We could just move them all to Tomcat 7 but I had
intended to review them in more detail.

Mark

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

svn commit: r1793798 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/manager/ java/org/apache/catalina/servlets/ java/org/apache/catalin

[markt]

Author: markt
Date: Thu May  4 13:29:20 2017
New Revision: 1793798

URL: http://svn.apache.org/viewvc?rev=1793798&view=rev
Log:
More work towards using Charset rather than String internally to reduce the 
number of calls required to B2CConverter.getCharset() or equivalent during a 
request.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java
tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/Resolver.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java

tomcat/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcher.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1793798&r1=1793797&r2=1793798&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu May  
4 13:29:20 2017
@@ -18,6 +18,7 @@ package org.apache.catalina.connector;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.EnumSet;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -771,7 +772,8 @@ public class CoyoteAdapter implements Ad
 // Possible redirect
 MessageBytes redirectPathMB = request.getMappingData().redirectPath;
 if (!redirectPathMB.isNull()) {
-String redirectPath = 
URLEncoder.DEFAULT.encode(redirectPathMB.toString(), "UTF-8");
+String redirectPath = URLEncoder.DEFAULT.encode(
+redirectPathMB.toString(), StandardCharsets.UTF_8);
 String query = request.getQueryString();
 if (request.isRequestedSessionIdFromURL()) {
 // This is not optimal, but as this is not very common, it

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1793798&r1=1793797&r2=1793798&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu May  4 
13:29:20 2017
@@ -24,6 +24,7 @@ import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.security.Principal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -1359,9 +1360,9 @@ public class Request implements HttpServ
 if (context.getDispatchersUseEncodedPaths()) {
 if (pos >= 0) {
 relative = URLEncoder.DEFAULT.encode(
-requestPath.substring(0, pos + 1), "UTF-8") + path;
+requestPath.substring(0, pos + 1), 
StandardCharsets.UTF_8) + path;
 } else {
-relative = URLEncoder.DEFAULT.encode(requestPath, "UTF-8") + 
path;
+relative = URLEncoder.DEFAULT.encode(requestPath, 
StandardCharsets.UTF_8) + path;
 }
 } else {
 if (pos >= 0) {

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1793798&r1=1793797&r2=1793798&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Thu May  
4 13:29:20 2017
@@ -22,6 +22,7 @@ import java.lang.reflect.InvocationTarge
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
@@ -486,7 +487,7 @@ public class ApplicationContext implemen
 
 mappingData.recycle();
 
-String encodedUri = URLEncoder.DEFAULT.

svn commit: r1793799 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/manager/ java/org/apache/catalina/servlets/ java/org/apa

[markt]

Author: markt
Date: Thu May  4 13:30:01 2017
New Revision: 1793799

URL: http://svn.apache.org/viewvc?rev=1793799&view=rev
Log:
More work towards using Charset rather than String internally to reduce the 
number of calls required to B2CConverter.getCharset() or equivalent during a 
request.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/URLEncoder.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/Resolver.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java

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

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

svn commit: r1793801 - in /tomcat/trunk/java/org/apache/catalina: util/URLEncoder.java valves/rewrite/Resolver.java valves/rewrite/ResolverImpl.java

[markt]

Author: markt
Date: Thu May  4 13:32:29 2017
New Revision: 1793801

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

Modified:
tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/Resolver.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java

Modified: tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java?rev=1793801&r1=1793800&r2=1793801&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java Thu May  4 
13:32:29 2017
@@ -19,12 +19,9 @@ package org.apache.catalina.util;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.util.BitSet;
 
-import org.apache.tomcat.util.buf.B2CConverter;
-
 /**
  *
  * This class is very similar to the java.net.URLEncoder class.
@@ -130,28 +127,6 @@ public class URLEncoder {
 }
 
 
-/**
- * URL encodes the provided path using the given encoding.
- *
- * @param path  The path to encode
- * @param encoding  The encoding to use to convert the path to bytes
- *
- * @return The encoded path
- *
- * @deprecated This will be removed in Tomcat 9.0.x
- */
-@Deprecated
-public String encode(String path, String encoding) {
-Charset charset;
-try {
-charset = B2CConverter.getCharset(encoding);
-} catch (UnsupportedEncodingException e) {
-charset = Charset.defaultCharset();
-}
-return encode(path, charset);
-}
-
-
 /**
  * URL encodes the provided path using the given character set.
  *

Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/Resolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/Resolver.java?rev=1793801&r1=1793800&r2=1793801&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/Resolver.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/Resolver.java Thu May  
4 13:32:29 2017
@@ -36,13 +36,5 @@ public abstract class Resolver {
 
 public abstract boolean resolveResource(int type, String name);
 
-/**
- * @return The name of the encoding to use to %nn encode URIs
- *
- * @deprecated This will be removed in Tomcat 9.0.x
- */
-@Deprecated
-public abstract String getUriEncoding();
-
 public abstract Charset getUriCharset();
 }

Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java?rev=1793801&r1=1793800&r2=1793801&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java Thu 
May  4 13:32:29 2017
@@ -179,12 +179,6 @@ public class ResolverImpl extends Resolv
 }
 
 @Override
-@Deprecated
-public String getUriEncoding() {
-return request.getConnector().getURIEncoding();
-}
-
-@Override
 public Charset getUriCharset() {
 return request.getConnector().getURICharset();
 }



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

[Bug 61070] New: able to see more than 10 threads, maxThread configuration to 10

[bugzilla]

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

Bug ID: 61070
   Summary: able to see more than 10 threads, maxThread
configuration to 10
   Product: Tomcat 7
   Version: 7.0.0
  Hardware: All
Status: NEW
  Severity: critical
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: shailu@gmail.com
  Target Milestone: ---

Created attachment 34974
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=34974&action=edit
xml file

we have updated the maxThread configuration to 10 at below place in server.xml
of DEV environment. However I was able to see more than 10 threads. I have also
attached the server.xml

I need your help to understand if I am doing something wrong or it is an
expected behaviour?


 A "Connector" represents an endpoint by which requests are received
 and responses are returned. Documentation at :
 Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
 Java AJP  Connector: /docs/config/ajp.html
 APR (HTTP/AJP) Connector: /docs/apr.html
 Define a non-SSL HTTP/1.1 Connector on port 8080

-- 
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 61070] able to see more than 10 threads, maxThread configuration to 10

[bugzilla]

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

shailesh jain  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from shailesh jain  ---
we have updated the maxThread configuration to 10 at below place in server.xml
of DEV environment. However I was able to see more than 10 threads. I have also
attached the server.xml

I need your help to understand if I am doing something wrong or it is an
expected behaviour?


 A "Connector" represents an endpoint by which requests are received
 and responses are returned. Documentation at :
 Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
 Java AJP  Connector: /docs/config/ajp.html
 APR (HTTP/AJP) Connector: /docs/apr.html
 Define a non-SSL HTTP/1.1 Connector on port 8080

-- 
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 61070] able to see more than 10 threads, maxThread configuration to 10

[bugzilla]

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

Chuck Caldarale  changed:

   What|Removed |Added

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

--- Comment #2 from Chuck Caldarale  ---
As you were told before, bugzilla is not a support forum.  Post your query on
the Tomcat users' mailing list.

-- 
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: r1793802 - /tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java

[markt]

Author: markt
Date: Thu May  4 13:57:00 2017
New Revision: 1793802

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

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

Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1793802&r1=1793801&r2=1793802&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Thu May  4 
13:57:00 2017
@@ -387,6 +387,12 @@ public class InputBuffer extends Reader
 // - Chars Handling Methods
 
 
+/**
+ * @param s New encoding value
+ *
+ * @deprecated This method will be removed in Tomcat 9.0.x
+ */
+@Deprecated
 public void setEncoding(String s) {
 enc = s;
 }



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

svn commit: r1793805 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/InputBuffer.java

[markt]

Author: markt
Date: Thu May  4 14:00:49 2017
New Revision: 1793805

URL: http://svn.apache.org/viewvc?rev=1793805&view=rev
Log:
Deprcate unused code

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

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  4 14:00: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,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747
 
536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1
 
756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216
 
8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,17638

svn commit: r1793806 - /tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java

[markt]

Author: markt
Date: Thu May  4 14:03:09 2017
New Revision: 1793806

URL: http://svn.apache.org/viewvc?rev=1793806&view=rev
Log:
Remove unused deprecated code

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

Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1793806&r1=1793805&r2=1793806&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Thu May  4 
14:03:09 2017
@@ -386,18 +386,6 @@ public class InputBuffer extends Reader
 
 // - Chars Handling Methods
 
-
-/**
- * @param s New encoding value
- *
- * @deprecated This method will be removed in Tomcat 9.0.x
- */
-@Deprecated
-public void setEncoding(String s) {
-enc = s;
-}
-
-
 public int realReadChars() throws IOException {
 checkConverter();
 



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

svn commit: r1793811 - /tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java

[markt]

Author: markt
Date: Thu May  4 14:28:57 2017
New Revision: 1793811

URL: http://svn.apache.org/viewvc?rev=1793811&view=rev
Log:
Refactor - simplify

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

Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1793811&r1=1793810&r2=1793811&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Thu May  4 
14:28:57 2017
@@ -101,12 +101,6 @@ public class InputBuffer extends Reader
 
 
 /**
- * Encoding to use.
- */
-private String enc;
-
-
-/**
  * Current byte to char converter.
  */
 protected B2CConverter conv;
@@ -205,8 +199,6 @@ public class InputBuffer extends Reader
 encoders.get(conv.getCharset()).push(conv);
 conv = null;
 }
-
-enc = null;
 }
 
 
@@ -550,13 +542,11 @@ public class InputBuffer extends Reader
 
 
 public void checkConverter() throws IOException {
-if (conv == null) {
-setConverter();
+if (conv != null) {
+return;
 }
-}
-
 
-private void setConverter() throws IOException {
+String enc = null;
 if (coyoteRequest != null) {
 enc = coyoteRequest.getCharacterEncoding();
 }



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

svn commit: r1793812 - /tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java

[markt]

Author: markt
Date: Thu May  4 14:37:39 2017
New Revision: 1793812

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

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

Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1793812&r1=1793811&r2=1793812&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Thu May  
4 14:37:39 2017
@@ -529,6 +529,12 @@ public class OutputBuffer extends Writer
 }
 
 
+/**
+ * @param s New encoding value
+ *
+ * @deprecated This method will be removed in Tomcat 9.0.x
+ */
+@Deprecated
 public void setEncoding(String s) {
 enc = s;
 }



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

svn commit: r1793814 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/OutputBuffer.java

[markt]

Author: markt
Date: Thu May  4 14:40:29 2017
New Revision: 1793814

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

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

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

svn commit: r1793815 - /tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java

[markt]

Author: markt
Date: Thu May  4 14:40:49 2017
New Revision: 1793815

URL: http://svn.apache.org/viewvc?rev=1793815&view=rev
Log:
Remove unused deprecated code

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

Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1793815&r1=1793814&r2=1793815&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Thu May  
4 14:40:49 2017
@@ -529,17 +529,6 @@ public class OutputBuffer extends Writer
 }
 
 
-/**
- * @param s New encoding value
- *
- * @deprecated This method will be removed in Tomcat 9.0.x
- */
-@Deprecated
-public void setEncoding(String s) {
-enc = s;
-}
-
-
 public void checkConverter() throws IOException {
 if (conv == null) {
 setConverter();



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

svn commit: r1793816 - /tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java

[markt]

Author: markt
Date: Thu May  4 14:42:17 2017
New Revision: 1793816

URL: http://svn.apache.org/viewvc?rev=1793816&view=rev
Log:
Refactor - simplify

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

Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1793816&r1=1793815&r2=1793816&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Thu May  
4 14:42:17 2017
@@ -103,12 +103,6 @@ public class OutputBuffer extends Writer
 
 
 /**
- * Encoding to use.
- */
-private String enc;
-
-
-/**
  * Current char to byte converter.
  */
 protected C2BConverter conv;
@@ -204,8 +198,6 @@ public class OutputBuffer extends Writer
 conv.recycle();
 conv = null;
 }
-
-enc = null;
 }
 
 
@@ -530,13 +522,11 @@ public class OutputBuffer extends Writer
 
 
 public void checkConverter() throws IOException {
-if (conv == null) {
-setConverter();
+if (conv != null) {
+return;
 }
-}
-
 
-private void setConverter() throws IOException {
+String enc = null;
 
 if (coyoteResponse != null) {
 enc = coyoteResponse.getCharacterEncoding();
@@ -631,7 +621,6 @@ public class OutputBuffer extends Writer
 conv.recycle();
 }
 conv = null;
-enc = null;
 }
 initial = true;
 }



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

svn commit: r1793819 - in /tomcat/trunk: java/org/apache/catalina/ssi/SSIServletExternalResolver.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu May  4 14:54:58 2017
New Revision: 1793819

URL: http://svn.apache.org/viewvc?rev=1793819&view=rev
Log:
Correct the logic that selects the encoding to use to decode the query string 
in the SSIServletExternalResolver so that the useBodyEncodingForURI attribute 
of the Connector is correctly taken into account.

Modified:
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java?rev=1793819&r1=1793818&r2=1793819&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java 
Thu May  4 14:54:58 2017
@@ -33,6 +33,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.catalina.connector.Connector;
 import org.apache.catalina.connector.Request;
 import org.apache.coyote.Constants;
 import org.apache.tomcat.util.buf.B2CConverter;
@@ -243,10 +244,6 @@ public class SSIServletExternalResolver
 } else if (nameParts[2].equals("UNESCAPED")) {
 requiredParts = 3;
 if (queryString != null) {
-// Use default as a last resort
-String queryStringEncoding =
-Constants.DEFAULT_CHARACTER_ENCODING;
-
 String uriEncoding = null;
 boolean useBodyEncodingForURI = false;
 
@@ -254,24 +251,25 @@ public class SSIServletExternalResolver
 // possible
 String requestEncoding = req.getCharacterEncoding();
 if (req instanceof Request) {
-uriEncoding =
-((Request)req).getConnector().getURIEncoding();
-useBodyEncodingForURI = ((Request)req)
-.getConnector().getUseBodyEncodingForURI();
+Connector connector =  
((Request)req).getConnector();
+uriEncoding = connector.getURIEncoding();
+useBodyEncodingForURI = 
connector.getUseBodyEncodingForURI();
 }
 
+String queryStringEncoding;
+
 // If valid, apply settings from request / connector
-if (uriEncoding != null) {
+if (useBodyEncodingForURI && requestEncoding != null) {
+queryStringEncoding = requestEncoding;
+} else if (uriEncoding != null) {
 queryStringEncoding = uriEncoding;
-} else if(useBodyEncodingForURI) {
-if (requestEncoding != null) {
-queryStringEncoding = requestEncoding;
-}
+} else {
+// Use default as a last resort
+queryStringEncoding = 
Constants.DEFAULT_CHARACTER_ENCODING;
 }
 
 try {
-retVal = URLDecoder.decode(queryString,
-queryStringEncoding);
+retVal = URLDecoder.decode(queryString, 
queryStringEncoding);
 } catch (UnsupportedEncodingException e) {
 retVal = queryString;
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1793819&r1=1793818&r2=1793819&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May  4 14:54:58 2017
@@ -112,6 +112,12 @@
 61047: Add MIME mapping for woff2 fonts in the default
 web.xml. Patch provided by Justin Williamson. (violetagg)
   
+  
+Correct the logic that selects the encoding to use to decode the query
+string in the SSIServletExternalResolver so that the
+useBodyEncodingForURI attribute of the
+Connector is correctly taken into account. (markt)
+  
 
   
   



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

svn commit: r1793822 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/ssi/SSIServletExternalResolver.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu May  4 15:17:55 2017
New Revision: 1793822

URL: http://svn.apache.org/viewvc?rev=1793822&view=rev
Log:
Correct the logic that selects the encoding to use to decode the query string 
in the SSIServletExternalResolver so that the useBodyEncodingForURI attribute 
of the Connector is correctly taken into account.

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

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

svn commit: r1793823 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/ssi/SSIServletExternalResolver.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu May  4 15:23:10 2017
New Revision: 1793823

URL: http://svn.apache.org/viewvc?rev=1793823&view=rev
Log:
Correct the logic that selects the encoding to use to decode the query string 
in the SSIServletExternalResolver so that the useBodyEncodingForURI attribute 
of the Connector is correctly taken into account.

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

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

svn commit: r1793824 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ssi/SSIServletExternalResolver.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu May  4 15:27:42 2017
New Revision: 1793824

URL: http://svn.apache.org/viewvc?rev=1793824&view=rev
Log:
Correct the logic that selects the encoding to use to decode the query string 
in the SSIServletExternalResolver so that the useBodyEncodingForURI attribute 
of the Connector is correctly taken into account.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  4 15:27:42 2017
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702
 
742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1
 
726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559
-/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,1740981,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,1743118,1743126,1743139-1743140,1743718,1743722,1743724,1744059,1744127,1744151,1744232,1744377,1744687,1744698,1744706,1745228,174

buildbot success in on tomcat-8-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1793823
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

[Bug 60362] Missing reason phrase in response

[bugzilla]

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

--- Comment #63 from Christopher Schultz  ---
First of all, let's all settle down. Reasonable people can disagree about
whether this change is a Good Thing or a Bad Thing and whether options should
exist to re-enable it. With that in mind, let's continue the conversation...

(In reply to Ralph Moser from comment #61)
> You have the code to add the reason phrase. It's in contrast to headers not
> easily fixable in most reverse proxies. Why aren't you just keeping the
> option to add it?

This is a conversation. There hasn't been a "last word" on this quite yet.

> We have 3000 devices out there which rely on the reason
> phrase.

Note that there is no supported stable version of Tomcat where the reason
phrase isn't available.

> Yes we could update them but it's cumbersome. You know embedded
> developers? They don't read standards. They just tailor their firmware to
> the servers. 

I see this change as motivation for embedded developers to tailor their
firmware to standards-compliant servers. This is very similar to the SSL vs TLS
chicken-in-an-egg scenario we had several years ago: no servers were
implementing TLS because no clients supported it yet and no clients were
supporting it because no servers had support, either. Someone must move first.

> Your next argument is that you are going to provide maintenance forever for
> 8.5. That's great but we may want to use new features. Also we regularly
> upgrade our spring boot version which also updates Tomcat.

If Spring Boot suddenly gives you a new major version of Tomcat without asking
or being configured explicitly to do so, I think you should re-think your use
of that technology.

My position has been that 8.5 should not have removed the reason phrase, so I
was motivated to lobby for the introduction of a setting that would restore
that feature. I have no such feelings about Tomcat 9.0 which won't be released
as stable until Servlet 4.0 is finalized which could be anytime between now and
when I die of old age.

We have plenty of time to discuss whether the HTTP reason phrase is something
worth continuing to support in Tomcat 9 and later.

We should probably move this conversation back to the dev list, because this
enhancement was filed against Tomcat 8.5 and, in fact, fixed. Let's leave this
BZ issue in peace and re-locate to dev@ until we can decide whether Tomcat 9
should also be changed.

-- 
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: r1793844 - in /tomcat/trunk/java/org/apache/catalina: authenticator/FormAuthenticator.java connector/CoyoteAdapter.java connector/Request.java core/ApplicationHttpRequest.java

[markt]

Author: markt
Date: Thu May  4 18:29:49 2017
New Revision: 1793844

URL: http://svn.apache.org/viewvc?rev=1793844&view=rev
Log:
Review of Parameters and query string encoding
Clean-up / clarification
No functional change

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1793844&r1=1793843&r2=1793844&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java 
Thu May  4 18:29:49 2017
@@ -590,8 +590,6 @@ public class FormAuthenticator
 }
 
 request.getCoyoteRequest().getParameters().recycle();
-request.getCoyoteRequest().getParameters().setQueryStringEncoding(
-request.getConnector().getURIEncoding());
 
 ByteChunk body = saved.getBody();
 

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1793844&r1=1793843&r2=1793844&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu May  
4 18:29:49 2017
@@ -447,8 +447,7 @@ public class CoyoteAdapter implements Ad
 res.setNote(ADAPTER_NOTES, response);
 
 // Set query string encoding
-req.getParameters().setQueryStringEncoding
-(connector.getURIEncoding());
+
req.getParameters().setQueryStringEncoding(connector.getURIEncoding());
 }
 
 try {

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1793844&r1=1793843&r2=1793844&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu May  4 
18:29:49 2017
@@ -3134,13 +3134,14 @@ public class Request implements HttpServ
 parameters.setQueryStringEncoding(enc);
 }
 } else {
-parameters.setEncoding
-(org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING);
+
parameters.setEncoding(org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING);
 if (useBodyEncodingForURI) {
-parameters.setQueryStringEncoding
-
(org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING);
+parameters.setQueryStringEncoding(
+
org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING);
 }
 }
+// Note: If !useBodyEncodingForURI, the query string encoding is
+//   that set towards the start of CoyoyeAdapter.service()
 
 parameters.handleQueryParameters();
 

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1793844&r1=1793843&r2=1793844&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Thu 
May  4 18:29:49 2017
@@ -871,6 +871,12 @@ class ApplicationHttpRequest extends Htt
 MessageBytes queryMB = MessageBytes.newInstance();
 queryMB.setString(queryParamString);
 
+// TODO
+// - Should only use body encoding if useBodyEncodingForURI is true
+// - Otherwise, should use URIEncoding
+// - The problem is that the connector is not available...
+// - To add to the fun, the URI default changed in Servlet 4.0 to UTF-8
+
 String encoding = getCharacterEncoding();
 // No need to process null value, as ISO-8859-1 is the default encoding
 // in MessageBytes.toBytes().
@@ -878,7 +884,8 @@ class ApplicationHttpRequest extends Htt
 try {
 queryMB.setCharset(B2CConverter.getCharset(encoding));
 } catch (UnsupportedEncodingException ignored) {
-// Fall-back to ISO-8

svn commit: r1793854 - in /tomcat/trunk/java/org/apache: catalina/connector/ catalina/security/ catalina/ssi/ coyote/

[markt]

Author: markt
Date: Thu May  4 19:00:35 2017
New Revision: 1793854

URL: http://svn.apache.org/viewvc?rev=1793854&view=rev
Log:
More work towards using Charset rather than String internally to reduce the 
number of calls required to B2CConverter.getCharset() or equivalent during a 
request.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
tomcat/trunk/java/org/apache/coyote/Constants.java
tomcat/trunk/java/org/apache/coyote/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/Request.java
tomcat/trunk/java/org/apache/coyote/Response.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1793854&r1=1793853&r2=1793854&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Thu May  4 
19:00:35 2017
@@ -546,16 +546,15 @@ public class InputBuffer extends Reader
 return;
 }
 
-String enc = null;
+Charset charset = null;
 if (coyoteRequest != null) {
-enc = coyoteRequest.getCharacterEncoding();
+charset = coyoteRequest.getCharset();
 }
 
-if (enc == null) {
-enc = org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING;
+if (charset == null) {
+charset = org.apache.coyote.Constants.DEFAULT_BODY_CHARSET;
 }
 
-Charset charset = B2CConverter.getCharset(enc);
 SynchronizedStack stack = encoders.get(charset);
 if (stack == null) {
 stack = new SynchronizedStack<>();

Modified: 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1793854&r1=1793853&r2=1793854&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Thu 
May  4 19:00:35 2017
@@ -58,6 +58,7 @@ coyoteRequest.maxPostSizeExceeded=The mu
 coyoteRequest.noAsync=Unable to start async because the following classes in 
the processing chain do not support async [{0}]
 coyoteRequest.noMultipartConfig=Unable to process parts as no multi-part 
configuration has been provided
 
+coyoteResponse.encoding.invalid=The encoding [{0}] is not recognised by the JRE
 coyoteResponse.getOutputStream.ise=getWriter() has already been called for 
this response
 coyoteResponse.getWriter.ise=getOutputStream() has already been called for 
this response
 coyoteResponse.reset.ise=Cannot call reset() after response has been committed

Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1793854&r1=1793853&r2=1793854&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Thu May  
4 19:00:35 2017
@@ -34,7 +34,6 @@ import javax.servlet.http.HttpServletRes
 import org.apache.catalina.Globals;
 import org.apache.coyote.ActionCode;
 import org.apache.coyote.Response;
-import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.buf.C2BConverter;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -526,17 +525,16 @@ public class OutputBuffer extends Writer
 return;
 }
 
-String enc = null;
+Charset charset = null;
 
 if (coyoteResponse != null) {
-enc = coyoteResponse.getCharacterEncoding();
+charset = coyoteResponse.getCharset();
 }
 
-if (enc == null) {
-enc = org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING;
+if (charset == null) {
+charset = org.apache.coyote.Constants.DEFAULT_BODY_CHARSET;
 }
 
-final Charset charset = getCharset(enc);
 conv = encoders.get(charset);
 
 if (conv == null) {
@@ -546,24 +544,6 @@ public class OutputBuffer extends Writer
 }
 
 
-private static Charset getCharset(final String encoding) throws 
IOException {
-   

svn commit: r1793855 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/

[markt]

Author: markt
Date: Thu May  4 19:02:11 2017
New Revision: 1793855

URL: http://svn.apache.org/viewvc?rev=1793855&view=rev
Log:
Review of Parameters and query string encoding
Clean-up / clarification
No functional change

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java

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

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

svn commit: r1793856 - in /tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector: InputBuffer.java OutputBuffer.java

[markt]

Author: markt
Date: Thu May  4 19:08:39 2017
New Revision: 1793856

URL: http://svn.apache.org/viewvc?rev=1793856&view=rev
Log:
Refactor - simplify
(variation of r1793816)

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1793856&r1=1793855&r2=1793856&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java 
Thu May  4 19:08:39 2017
@@ -562,13 +562,10 @@ public class InputBuffer extends Reader
 
 
 public void checkConverter() throws IOException {
-if (conv == null) {
-setConverter();
+if (conv != null) {
+return;
 }
-}
 
-
-private void setConverter() throws IOException {
 if (coyoteRequest != null) {
 enc = coyoteRequest.getCharacterEncoding();
 }

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1793856&r1=1793855&r2=1793856&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java 
Thu May  4 19:08:39 2017
@@ -555,13 +555,9 @@ public class OutputBuffer extends Writer
 
 
 public void checkConverter() throws IOException {
-if (conv == null) {
-setConverter();
+if (conv != null) {
+return;
 }
-}
-
-
-private void setConverter() throws IOException {
 
 if (coyoteResponse != null) {
 enc = coyoteResponse.getCharacterEncoding();



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

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] 1793854
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: r1793858 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/ssi/ java/org/apache/coyote/

[markt]

Author: markt
Date: Thu May  4 19:25:01 2017
New Revision: 1793858

URL: http://svn.apache.org/viewvc?rev=1793858&view=rev
Log:
More work towards using Charset rather than String internally to reduce the 
number of calls required to B2CConverter.getCharset() or equivalent during a 
request.

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

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/Constants.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/coyote/Request.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/Response.java

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

svn commit: r1793860 - in /tomcat/trunk/java/org/apache/coyote: Constants.java Request.java Response.java

[markt]

Author: markt
Date: Thu May  4 19:28:26 2017
New Revision: 1793860

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

Modified:
tomcat/trunk/java/org/apache/coyote/Constants.java
tomcat/trunk/java/org/apache/coyote/Request.java
tomcat/trunk/java/org/apache/coyote/Response.java

Modified: tomcat/trunk/java/org/apache/coyote/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Constants.java?rev=1793860&r1=1793859&r2=1793860&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Constants.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Constants.java Thu May  4 19:28:26 2017
@@ -26,12 +26,6 @@ import java.nio.charset.StandardCharsets
  */
 public final class Constants {
 
-/**
- * @deprecated This will be removed in Tomcat 9.0.x onwards.
- */
-@Deprecated
-public static final String DEFAULT_CHARACTER_ENCODING="ISO-8859-1";
-
 public static final Charset DEFAULT_URI_CHARSET = StandardCharsets.UTF_8;
 public static final Charset DEFAULT_BODY_CHARSET = 
StandardCharsets.ISO_8859_1;
 

Modified: tomcat/trunk/java/org/apache/coyote/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=1793860&r1=1793859&r2=1793860&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Thu May  4 19:28:26 2017
@@ -284,32 +284,13 @@ public final class Request {
 this.localPort = port;
 }
 
-//  encoding/type 
-
-
-/**
- * Get the character encoding used for this request.
- *
- * @return The value set via {@link #setCharacterEncoding(String)} or if no
- * call has been made to that method try to obtain if from the
- * content type.
- *
- * @deprecated This method will be removed in Tomcat 9.0.x
- */
-@Deprecated
-public String getCharacterEncoding() {
-Charset charset = getCharset();
-if (charset == null) {
-return null;
-}
-return charset.name();
-}
 
+//  encoding/type 
 
 /**
  * Get the character encoding used for this request.
  *
- * @return The value set via {@link #setCharacterEncoding(String)} or if no
+ * @return The value set via {@link #setCharset(Charset)} or if no
  * call has been made to that method try to obtain if from the
  * content type.
  */
@@ -324,23 +305,11 @@ public final class Request {
 }
 
 
-/**
- * @param enc The new encoding
- *
- * @throws UnsupportedEncodingException If the encoding is invalid
- *
- * @deprecated This method will be removed in Tomcat 9.0.x
- */
-@Deprecated
-public void setCharacterEncoding(String enc) throws 
UnsupportedEncodingException {
-setCharset(B2CConverter.getCharset(enc));
-}
-
-
 public void setCharset(Charset charset) {
 this.charset = charset;
 }
 
+
 public void setContentLength(long len) {
 this.contentLength = len;
 }

Modified: tomcat/trunk/java/org/apache/coyote/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Response.java?rev=1793860&r1=1793859&r2=1793860&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Response.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Response.java Thu May  4 19:28:26 2017
@@ -395,28 +395,6 @@ public final class Response {
 return contentLanguage;
 }
 
-/**
- * Overrides the name of the character encoding used in the body
- * of the response. This method must be called prior to writing output
- * using getWriter().
- *
- * @param charset String containing the name of the character encoding.
- *
- * @deprecated This method will be removed in Tomcat 9.0.x
- */
-@Deprecated
-public void setCharacterEncoding(String charset) {
-if (charset == null) {
-return;
-}
-
-try {
-setCharset(B2CConverter.getCharset(charset));
-} catch (UnsupportedEncodingException e) {
-log.warn(sm.getString("response.encoding.invalid", charset), e);
-}
-}
-
 
 /**
  * Overrides the character encoding used in the body of the response. This
@@ -437,21 +415,6 @@ public final class Response {
 }
 
 
-/**
- * @return The name of the current encoding
- *
- * @deprecated This method will be removed in Tomcat 9.0.x
- */
-@Deprecated
-public String getCharacterEncoding() {
-Charset charset = getCharset();
-if (charset == null) {
-return null;

svn commit: r1793887 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/tomcat/util/http/ test/org/apache/tomcat/util/http/

[markt]

Author: markt
Date: Thu May  4 20:19:52 2017
New Revision: 1793887

URL: http://svn.apache.org/viewvc?rev=1793887&view=rev
Log:
More work towards using Charset rather than String internally to reduce the 
number of calls required to B2CConverter.getCharset() or equivalent during a 
request.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java

tomcat/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1793887&r1=1793886&r2=1793887&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu May  
4 20:19:52 2017
@@ -318,7 +318,7 @@ public class CoyoteAdapter implements Ad
 res.setNote(ADAPTER_NOTES, response);
 
 // Set query string encoding
-
req.getParameters().setQueryStringEncoding(connector.getURIEncoding());
+
req.getParameters().setQueryStringCharset(connector.getURICharset());
 }
 
 if (connector.getXpoweredBy()) {
@@ -447,7 +447,7 @@ public class CoyoteAdapter implements Ad
 res.setNote(ADAPTER_NOTES, response);
 
 // Set query string encoding
-
req.getParameters().setQueryStringEncoding(connector.getURIEncoding());
+
req.getParameters().setQueryStringCharset(connector.getURICharset());
 }
 
 try {

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1793887&r1=1793886&r2=1793887&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu May  4 
20:19:52 2017
@@ -985,6 +985,26 @@ public class Request implements HttpServ
 }
 
 
+private Charset getCharset() {
+Charset charset = coyoteRequest.getCharset();
+if (charset != null) {
+return charset;
+}
+
+Context context = getContext();
+if (context != null) {
+String encoding = context.getRequestCharacterEncoding();
+try {
+return B2CConverter.getCharset(encoding);
+} catch (UnsupportedEncodingException e) {
+// Ignore
+}
+}
+
+return org.apache.coyote.Constants.DEFAULT_BODY_CHARSET;
+}
+
+
 /**
  * @return the content length for this Request.
  */
@@ -2796,15 +2816,7 @@ public class Request implements HttpServ
 upload.parseRequest(new ServletRequestContext(this));
 int maxPostSize = getConnector().getMaxPostSize();
 int postSize = 0;
-String enc = getCharacterEncoding();
-Charset charset = null;
-if (enc != null) {
-try {
-charset = B2CConverter.getCharset(enc);
-} catch (UnsupportedEncodingException e) {
-// Ignore
-}
-}
+Charset charset = getCharset();
 for (FileItem item : items) {
 ApplicationPart part = new ApplicationPart(item, location);
 parts.add(part);
@@ -2812,31 +2824,15 @@ public class Request implements HttpServ
 String name = part.getName();
 String value = null;
 try {
-String encoding = parameters.getEncoding();
-if (encoding == null) {
-if (enc == null) {
-encoding = Parameters.DEFAULT_ENCODING;
-} else {
-encoding = enc;
-}
-}
-value = part.getString(encoding);
+Charset paramCharset = parameters.getCharset();
+value = part.getString(paramCharset.name());
 } catch (UnsupportedEncodingException uee) {
-try {
-value = 
part.getString(Parameters.DEFAULT_ENCODING);
-  

svn commit: r1793889 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/tomcat/util/http/ test/org/apache/tomcat/util/http/

[markt]

Author: markt
Date: Thu May  4 20:20:36 2017
New Revision: 1793889

URL: http://svn.apache.org/viewvc?rev=1793889&view=rev
Log:
More work towards using Charset rather than String internally to reduce the 
number of calls required to B2CConverter.getCharset() or equivalent during a 
request.

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestParameters.java

tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java

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

svn commit: r1793890 - /tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java

[markt]

Author: markt
Date: Thu May  4 20:22:39 2017
New Revision: 1793890

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

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1793890&r1=1793889&r2=1793890&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Thu May  4 
20:22:39 2017
@@ -17,7 +17,6 @@
 package org.apache.tomcat.util.http;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -28,7 +27,6 @@ import java.util.Map;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.buf.StringUtils;
@@ -84,30 +82,10 @@ public final class Parameters {
 this.limit = limit;
 }
 
-/**
- * @return The current encoding
- *
- * @deprecated This method will be removed in Tomcat 9.0.x
- */
-@Deprecated
-public String getEncoding() {
-return charset.name();
-}
-
 public Charset getCharset() {
 return charset;
 }
 
-/**
- * @param s The new encoding
- *
- * @deprecated This method will be removed in Tomcat 9.0.x
- */
-@Deprecated
-public void setEncoding(String s) {
-setCharset(getCharset(s, DEFAULT_BODY_CHARSET));
-}
-
 public void setCharset(Charset charset) {
 if (charset == null) {
 charset = DEFAULT_BODY_CHARSET;
@@ -118,16 +96,6 @@ public final class Parameters {
 }
 }
 
-/**
- * @param s The new query string encoding
- *
- * @deprecated This method will be removed in Tomcat 9
- */
-@Deprecated
-public void setQueryStringEncoding(String s) {
-setQueryStringCharset(getCharset(s, DEFAULT_URI_CHARSET));
-}
-
 public void setQueryStringCharset(Charset queryStringCharset) {
 if (queryStringCharset == null) {
 queryStringCharset = DEFAULT_URI_CHARSET;
@@ -516,17 +484,6 @@ public final class Parameters {
 urlDec.convert(bc, true);
 }
 
-/**
- * @param data  Parameter data
- * @param encoding  Encoding to use for encoded bytes
- *
- * @deprecated This method will be removed in Tomcat 9.0.x
- */
-@Deprecated
-public void processParameters(MessageBytes data, String encoding) {
-processParameters(data, getCharset(encoding, DEFAULT_BODY_CHARSET));
-}
-
 public void processParameters(MessageBytes data, Charset charset) {
 if( data==null || data.isNull() || data.getLength() <= 0 ) {
 return;
@@ -539,17 +496,6 @@ public final class Parameters {
 processParameters(bc.getBytes(), bc.getOffset(), bc.getLength(), 
charset);
 }
 
-private Charset getCharset(String encoding, Charset defaultCharset) {
-if (encoding == null) {
-return defaultCharset;
-}
-try {
-return B2CConverter.getCharset(encoding);
-} catch (UnsupportedEncodingException e) {
-return defaultCharset;
-}
-}
-
 /**
  * Debug purpose
  */



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

svn commit: r1793891 - /tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java

[markt]

Author: markt
Date: Thu May  4 20:23:11 2017
New Revision: 1793891

URL: http://svn.apache.org/viewvc?rev=1793891&view=rev
Log:
Deprecate unused code

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1793891&r1=1793890&r2=1793891&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Thu May  4 
20:23:11 2017
@@ -229,6 +229,10 @@ public final class Parameters {
 private final ByteChunk tmpValue=new ByteChunk();
 private final ByteChunk origName=new ByteChunk();
 private final ByteChunk origValue=new ByteChunk();
+/**
+ * @deprecated This will be removed in Tomcat 9.0.x
+ */
+@Deprecated
 public static final String DEFAULT_ENCODING = "ISO-8859-1";
 private static final Charset DEFAULT_BODY_CHARSET = 
StandardCharsets.ISO_8859_1;
 private static final Charset DEFAULT_URI_CHARSET = StandardCharsets.UTF_8;



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

svn commit: r1793893 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/http/Parameters.java

[markt]

Author: markt
Date: Thu May  4 20:23:45 2017
New Revision: 1793893

URL: http://svn.apache.org/viewvc?rev=1793893&view=rev
Log:
Deprecate unused code

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

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

svn commit: r1793896 - /tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java

[markt]

Author: markt
Date: Thu May  4 20:24:03 2017
New Revision: 1793896

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

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1793896&r1=1793895&r2=1793896&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Thu May  4 
20:24:03 2017
@@ -229,11 +229,6 @@ public final class Parameters {
 private final ByteChunk tmpValue=new ByteChunk();
 private final ByteChunk origName=new ByteChunk();
 private final ByteChunk origValue=new ByteChunk();
-/**
- * @deprecated This will be removed in Tomcat 9.0.x
- */
-@Deprecated
-public static final String DEFAULT_ENCODING = "ISO-8859-1";
 private static final Charset DEFAULT_BODY_CHARSET = 
StandardCharsets.ISO_8859_1;
 private static final Charset DEFAULT_URI_CHARSET = StandardCharsets.UTF_8;
 



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

svn commit: r1793898 - in /tomcat/trunk/java/org/apache/catalina/connector: CoyoteAdapter.java LocalStrings.properties

[markt]

Author: markt
Date: Thu May  4 20:33:13 2017
New Revision: 1793898

URL: http://svn.apache.org/viewvc?rev=1793898&view=rev
Log:
Simplify.
Use Charset in preference to String

Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1793898&r1=1793897&r2=1793898&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu May  
4 20:33:13 2017
@@ -1055,42 +1055,24 @@ public class CoyoteAdapter implements Ad
 CharChunk cc = uri.getCharChunk();
 cc.allocate(length, -1);
 
-String enc = connector.getURIEncoding();
-if (enc != null) {
-B2CConverter conv = request.getURIConverter();
-try {
-if (conv == null) {
-conv = new B2CConverter(B2CConverter.getCharset(enc), 
true);
-request.setURIConverter(conv);
-} else {
-conv.recycle();
-}
-} catch (IOException e) {
-log.error(sm.getString("coyoteAdapter.invalidEncoding"));
-connector.setURIEncoding(null);
-}
-if (conv != null) {
-try {
-conv.convert(bc, cc, true);
-uri.setChars(cc.getBuffer(), cc.getStart(), 
cc.getLength());
-return;
-} catch (IOException ioe) {
-// Should never happen as B2CConverter should replace
-// problematic characters
-request.getResponse().sendError(
-HttpServletResponse.SC_BAD_REQUEST);
-}
-}
+Charset charset = connector.getURICharset();
+
+B2CConverter conv = request.getURIConverter();
+if (conv == null) {
+conv = new B2CConverter(charset, true);
+request.setURIConverter(conv);
+} else {
+conv.recycle();
 }
 
-// Default encoding: fast conversion for ISO-8859-1
-byte[] bbuf = bc.getBuffer();
-char[] cbuf = cc.getBuffer();
-int start = bc.getStart();
-for (int i = 0; i < length; i++) {
-cbuf[i] = (char) (bbuf[i + start] & 0xff);
+try {
+conv.convert(bc, cc, true);
+uri.setChars(cc.getBuffer(), cc.getStart(), cc.getLength());
+} catch (IOException ioe) {
+// Should never happen as B2CConverter should replace
+// problematic characters
+
request.getResponse().sendError(HttpServletResponse.SC_BAD_REQUEST);
 }
-uri.setChars(cbuf, 0, length);
 }
 
 

Modified: 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1793898&r1=1793897&r2=1793898&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Thu 
May  4 20:33:13 2017
@@ -19,7 +19,6 @@ coyoteAdapter.authorize=Authorizing user
 coyoteAdapter.checkRecycled.request=Encountered a non-recycled request and 
recycled it forcedly.
 coyoteAdapter.checkRecycled.response=Encountered a non-recycled response and 
recycled it forcedly.
 coyoteAdapter.debug=The variable [{0}] has value [{1}]
-coyoteAdapter.invalidEncoding=Invalid URI encoding, using HTTP default
 coyoteAdapter.parsePathParam=Unable to parse the path parameters using 
encoding [{0}]. The path parameters in the URL will be ignored.
 
 coyoteConnector.invalidEncoding=The encoding [{0}] is not recognised by the 
JRE. The Connector will continue to use [{1}]



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

svn commit: r1793901 - in /tomcat/trunk: java/org/apache/catalina/filters/ExpiresFilter.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu May  4 20:44:25 2017
New Revision: 1793901

URL: http://svn.apache.org/viewvc?rev=1793901&view=rev
Log:
Within the Expires filter, make the content type value specified with the 
ExpiresByType parameter, case insensitive.

Modified:
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1793901&r1=1793900&r2=1793901&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Thu May  4 
20:44:25 2017
@@ -1267,6 +1267,9 @@ public class ExpiresFilter extends Filte
  */
 protected Date getExpirationDate(XHttpServletResponse response) {
 String contentType = response.getContentType();
+if (contentType != null) {
+contentType = contentType.toLowerCase(Locale.ENGLISH);
+}
 
 // lookup exact content-type match (e.g.
 // "text/html; charset=iso-8859-1")
@@ -1396,7 +1399,7 @@ public class ExpiresFilter extends Filte
 try {
 if (name.startsWith(PARAMETER_EXPIRES_BY_TYPE)) {
 String contentType = name.substring(
-PARAMETER_EXPIRES_BY_TYPE.length()).trim();
+
PARAMETER_EXPIRES_BY_TYPE.length()).trim().toLowerCase(Locale.ENGLISH);
 ExpiresConfiguration expiresConfiguration = 
parseExpiresConfiguration(value);
 this.expiresConfigurationByContentType.put(contentType,
 expiresConfiguration);

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1793901&r1=1793900&r2=1793901&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May  4 20:44:25 2017
@@ -118,6 +118,10 @@
 useBodyEncodingForURI attribute of the
 Connector is correctly taken into account. (markt)
   
+  
+Within the Expires filter, make the content type value specified with 
the
+ExpiresByType parameter, case insensitive. (markt)
+  
 
   
   



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

svn commit: r1793902 - /tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java

[markt]

Author: markt
Date: Thu May  4 20:46:25 2017
New Revision: 1793902

URL: http://svn.apache.org/viewvc?rev=1793902&view=rev
Log:
Make test case insensitive

Modified:
tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java

Modified: 
tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java?rev=1793902&r1=1793901&r2=1793902&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java Thu 
May  4 20:46:25 2017
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.servlet.ServletException;
@@ -119,8 +120,8 @@ public class TestAddCharSetFilter extend
 
 List ctHeaders = headers.get("Content-Type");
 assertEquals(1, ctHeaders.size());
-String ct = ctHeaders.get(0);
-assertEquals("text/plain;charset=" + expected, ct);
+String ct = ctHeaders.get(0).toLowerCase(Locale.ENGLISH);
+assertEquals("text/plain;charset=" + 
expected.toLowerCase(Locale.ENGLISH), ct);
 }
 
 private static class CharsetServlet extends HttpServlet {



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

svn commit: r1793904 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/filters/ExpiresFilter.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu May  4 20:53:14 2017
New Revision: 1793904

URL: http://svn.apache.org/viewvc?rev=1793904&view=rev
Log:
Within the Expires filter, make the content type value specified with the 
ExpiresByType parameter, case insensitive.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  4 20:53: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,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747
 
536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1
 
756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216
 
8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-

svn commit: r1793905 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/catalina/filters/TestAddCharSetFilter.java

[markt]

Author: markt
Date: Thu May  4 20:53:40 2017
New Revision: 1793905

URL: http://svn.apache.org/viewvc?rev=1793905&view=rev
Log:
Make test case insensitive

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

tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java

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

svn commit: r1793907 - /tomcat/trunk/java/org/apache/catalina/connector/Request.java

[markt]

Author: markt
Date: Thu May  4 21:03:37 2017
New Revision: 1793907

URL: http://svn.apache.org/viewvc?rev=1793907&view=rev
Log:
Fix NPE

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

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1793907&r1=1793906&r2=1793907&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu May  4 
21:03:37 2017
@@ -994,10 +994,12 @@ public class Request implements HttpServ
 Context context = getContext();
 if (context != null) {
 String encoding = context.getRequestCharacterEncoding();
-try {
-return B2CConverter.getCharset(encoding);
-} catch (UnsupportedEncodingException e) {
-// Ignore
+if (encoding != null) {
+try {
+return B2CConverter.getCharset(encoding);
+} catch (UnsupportedEncodingException e) {
+// Ignore
+}
 }
 }
 



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

svn commit: r1793908 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/Request.java

[markt]

Author: markt
Date: Thu May  4 21:04:18 2017
New Revision: 1793908

URL: http://svn.apache.org/viewvc?rev=1793908&view=rev
Log:
Fix NPE

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

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

svn commit: r1793910 - in /tomcat/trunk/java/org/apache: catalina/connector/Request.java tomcat/util/http/Parameters.java

[markt]

Author: markt
Date: Thu May  4 21:17:55 2017
New Revision: 1793910

URL: http://svn.apache.org/viewvc?rev=1793910&view=rev
Log:
Fix NPEs

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1793910&r1=1793909&r2=1793910&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu May  4 
21:17:55 2017
@@ -2826,8 +2826,7 @@ public class Request implements HttpServ
 String name = part.getName();
 String value = null;
 try {
-Charset paramCharset = parameters.getCharset();
-value = part.getString(paramCharset.name());
+value = part.getString(charset.name());
 } catch (UnsupportedEncodingException uee) {
 // Not possible
 }

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1793910&r1=1793909&r2=1793910&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Thu May  4 
21:17:55 2017
@@ -129,7 +129,7 @@ public final class Parameters {
 parameterCount = 0;
 paramHashValues.clear();
 didQueryParameters = false;
-charset = null;
+charset = DEFAULT_BODY_CHARSET;
 decodedQuery.recycle();
 parseFailedReason = null;
 }



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

svn commit: r1793911 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/Request.java java/org/apache/tomcat/util/http/Parameters.java

[markt]

Author: markt
Date: Thu May  4 21:18:23 2017
New Revision: 1793911

URL: http://svn.apache.org/viewvc?rev=1793911&view=rev
Log:
Fix NPEs

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/Parameters.java

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

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

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] 1793910
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: r1793917 - in /tomcat/tags/TOMCAT_9_0_0_M21: ./ build.properties.default webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu May  4 22:40:45 2017
New Revision: 1793917

URL: http://svn.apache.org/viewvc?rev=1793917&view=rev
Log:
Tag 9.0.0.M21

Added:
tomcat/tags/TOMCAT_9_0_0_M21/
  - copied from r1793915, tomcat/trunk/
Modified:
tomcat/tags/TOMCAT_9_0_0_M21/build.properties.default
tomcat/tags/TOMCAT_9_0_0_M21/webapps/docs/changelog.xml

Modified: tomcat/tags/TOMCAT_9_0_0_M21/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M21/build.properties.default?rev=1793917&r1=1793915&r2=1793917&view=diff
==
--- tomcat/tags/TOMCAT_9_0_0_M21/build.properties.default (original)
+++ tomcat/tags/TOMCAT_9_0_0_M21/build.properties.default Thu May  4 22:40:45 
2017
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=.M21-dev
+version.suffix=.M21
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed

Modified: tomcat/tags/TOMCAT_9_0_0_M21/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M21/webapps/docs/changelog.xml?rev=1793917&r1=1793915&r2=1793917&view=diff
==
--- tomcat/tags/TOMCAT_9_0_0_M21/webapps/docs/changelog.xml (original)
+++ tomcat/tags/TOMCAT_9_0_0_M21/webapps/docs/changelog.xml Thu May  4 22:40:45 
2017
@@ -44,7 +44,7 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   



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

svn commit: r19470 - in /dev/tomcat/tomcat-9/v9.0.0.M21: ./ bin/ bin/embed/ bin/extras/ src/

[markt]

Author: markt
Date: Thu May  4 23:03:51 2017
New Revision: 19470

Log:
Upload 9.0.0.M21 for voting

Added:
dev/tomcat/tomcat-9/v9.0.0.M21/
dev/tomcat/tomcat-9/v9.0.0.M21/KEYS
dev/tomcat/tomcat-9/v9.0.0.M21/README.html
dev/tomcat/tomcat-9/v9.0.0.M21/RELEASE-NOTES
dev/tomcat/tomcat-9/v9.0.0.M21/bin/
dev/tomcat/tomcat-9/v9.0.0.M21/bin/README.html
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-deployer.tar.gz  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-deployer.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-deployer.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-deployer.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-deployer.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-deployer.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-deployer.zip.md5
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-deployer.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-fulldocs.tar.gz  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-fulldocs.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-fulldocs.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-windows-x64.zip  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-windows-x64.zip.asc

dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-windows-x64.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-windows-x64.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-windows-x86.zip  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-windows-x86.zip.asc

dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-windows-x86.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21-windows-x86.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21.exe   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21.exe.asc
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21.exe.md5
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21.exe.sha1
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21.tar.gz   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21.tar.gz.md5
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21.zip.md5
dev/tomcat/tomcat-9/v9.0.0.M21/bin/apache-tomcat-9.0.0.M21.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M21/bin/embed/

dev/tomcat/tomcat-9/v9.0.0.M21/bin/embed/apache-tomcat-9.0.0.M21-embed.tar.gz   
(with props)

dev/tomcat/tomcat-9/v9.0.0.M21/bin/embed/apache-tomcat-9.0.0.M21-embed.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.0.M21/bin/embed/apache-tomcat-9.0.0.M21-embed.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M21/bin/embed/apache-tomcat-9.0.0.M21-embed.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M21/bin/embed/apache-tomcat-9.0.0.M21-embed.zip  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M21/bin/embed/apache-tomcat-9.0.0.M21-embed.zip.asc

dev/tomcat/tomcat-9/v9.0.0.M21/bin/embed/apache-tomcat-9.0.0.M21-embed.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M21/bin/embed/apache-tomcat-9.0.0.M21-embed.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M21/bin/extras/
dev/tomcat/tomcat-9/v9.0.0.M21/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M21/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M21/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M21/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M21/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-9/v9.0.0.M21/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M21/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M21/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M21/src/
dev/tomcat/tomcat-9/v9.0.0.M21/src/apache-tomcat-9.0.0.M21-src.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M21/src/apache-tomcat-9.0.0.M21-src.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.0.M21/src/apache-tomcat-9.0.0.M21-src.tar.gz.md5
dev/tomcat/tomcat-9/v9.0.0.M21/src/apache-tomcat-9.0.0.M21-src.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M21/src/apache-tomcat-9.0.0.M21-src.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M21/src/apache-tomcat-9.0.0.M21-src.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M21/src/apache-tomcat-9.0.0.M21-src.zip.md5
dev/tomc

svn commit: r1793936 - in /tomcat/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu May  4 23:42:59 2017
New Revision: 1793936

URL: http://svn.apache.org/viewvc?rev=1793936&view=rev
Log:
Increment version for next development iteration

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/res/maven/mvn.properties.default
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1793936&r1=1793935&r2=1793936&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu May  4 23:42:59 2017
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=.M21-dev
+version.suffix=.M22-dev
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed

Modified: tomcat/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1793936&r1=1793935&r2=1793936&view=diff
==
--- tomcat/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/trunk/res/maven/mvn.properties.default Thu May  4 23:42:59 2017
@@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=9.0.0.M21
+maven.asf.release.deploy.version=9.0.0.M22
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1793936&r1=1793935&r2=1793936&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May  4 23:42:59 2017
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   



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

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

[Bill Barker]

To whom it may engage...

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

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


Full details are available at:

http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html

That said, some information snippets are provided here.

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



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

[Bug 61072] New: SessionIdGeneratorBase will not use platform default SecureRandom algorithm for empty secureRandomAlgorithm attribute

[bugzilla]

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

Bug ID: 61072
   Summary: SessionIdGeneratorBase will not use platform default
SecureRandom algorithm for empty secureRandomAlgorithm
attribute
   Product: Tomcat 9
   Version: 9.0.0.M20
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: simon.bjor...@gmail.com
  Target Milestone: -

Setting secureRandomAlgorithm to an empty string and not specifying
secureRandomProvider still seems to lead to SessionIdGeneratorBase creating its
SecureRandom instance using SecureRandom.getInstance("SHA1PRNG"), which is
contrary to the wording in the documentation saying "To specify that the
platform default should be used, do not set the secureRandomProvider attribute
and set this attribute to the empty string.". See the implementation of
SessionIdGeneratorBase.createSecureRandom(), where the "result = new
SecureRandom()" line doesn't seem to be triggered for this case
(secureRandomProvider=null, secureRandomAlgorithm="").

Getting the platform default SecureRandom algorithm is wanted on Linux systems
where /dev/random blocks or is slow, either due to misconfiguration or
exhaustion. See the latest comment on
http://bugs.java.com/view_bug.do?bug_id=4705093 for a description of the
current SecureRandom behavior. Regardless of that problem, and the motivation
it provides for being able to easily get a default algorithm SecureRandom, I
believe the former paragraph describes either a documentation or implementation
bug in itself, so unless requested I don't think it's necessary to prove in
this bug entry that Tomcat hangs on such a system. (Though it could be argued
that platform default SecureRandom would be a better default to make Tomcat
never block on /dev/random out-of-the-box.)

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