svn commit: r1788834 - /tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 07:19:34 2017
New Revision: 1788834

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

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

Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1788834&r1=1788833&r2=1788834&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Mon Mar 
27 07:19:34 2017
@@ -79,7 +79,7 @@ stream.header.debug=Connection [{0}], St
 stream.header.duplicate=Connection [{0}], Stream [{1}], received multiple 
[{3}] headers
 stream.header.noPath=Connection [{0}], Stream [{1}], The [:path] pseudo header 
was empty
 stream.header.required=Connection [{0}], Stream [{1}], One or more required 
headers was missing
-stream.header.te=Connection [{0}], Stream [{1}], HTTP header [te] is not 
permitted tohave the value [{2}] in an HTTP/2 request
+stream.header.te=Connection [{0}], Stream [{1}], HTTP header [te] is not 
permitted to have the value [{2}] in an HTTP/2 request
 stream.header.unexpectedPseudoHeader=Connection [{0}], Stream [{1}], Pseudo 
header [{2}] received after a regular header
 stream.header.unknownPseudoHeader=Connection [{0}], Stream [{1}], Unknown 
pseudo header [{2}] received
 stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable



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



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

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 07:20:01 2017
New Revision: 1788835

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

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

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

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

2017-03-27 Thread Mark Thomas
On 26/03/17 20:37, Martin Grigorov wrote:
>> Author: markt
>> Date: Sun Mar 26 19:31:25 2017
>> New Revision: 1788771



> Small typo in "tohave" - misses space.

Thanks for pointing that out. Fixed.

Mark

-
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

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

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

I created a patch that adds an option for sending a reason phrase with the
response.
https://github.com/apache/tomcat85/pull/7

By default a reason phrase will not be sent and also this option is marked as
deprecated and will not be available in Tomcat9.

The change is based on r1702765 and r1785641.

What do you think?

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



[Bug 60362] Missing reason phrase in response

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

--- Comment #40 from Remy Maucherat  ---
-1. It should be removed at some point, so let it be now. It turns out (given
what I see) that we're going to maintain 7.0 and 8.0 for at least as long as
8.5, so it's good enough.

-- 
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: r1788841 - in /tomcat/trunk/java/org/apache/coyote/http2: Http2UpgradeHandler.java LocalStrings.properties Stream.java StreamProcessor.java

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 08:02:38 2017
New Revision: 1788841

URL: http://svn.apache.org/viewvc?rev=1788841&view=rev
Log:
Total data sent should agree with any content-length header
Found with the h2spec tool written by Moto Ishizawa.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.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=1788841&r1=1788840&r2=1788841&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Mon Mar 
27 08:02:38 2017
@@ -1318,6 +1318,7 @@ class Http2UpgradeHandler extends Abstra
 public ByteBuffer startRequestBodyFrame(int streamId, int payloadSize) 
throws Http2Exception {
 Stream stream = getStream(streamId, true);
 stream.checkState(FrameType.DATA);
+stream.receivedData(payloadSize);
 return stream.getInputByteBuffer();
 }
 

Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1788841&r1=1788840&r2=1788841&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Mon Mar 
27 08:02:38 2017
@@ -75,6 +75,7 @@ pingManager.roundTripTime=Connection [{0
 stream.closed=Connection [{0}], Stream [{1}], Unable to write to stream once 
it has been closed
 stream.header.case=Connection [{0}], Stream [{1}], HTTP header name [{2}] must 
be in lower case
 stream.header.connection=Connection [{0}], Stream [{1}], HTTP header 
[connection] is not permitted in an HTTP/2 request
+stream.header.contentLength=Connection [{0}], Stream [{1}], The content length 
header value [{2}] does not agree with the size of the data received [{3}]
 stream.header.debug=Connection [{0}], Stream [{1}], HTTP header [{2}], Value 
[{3}]
 stream.header.duplicate=Connection [{0}], Stream [{1}], received multiple 
[{3}] headers
 stream.header.noPath=Connection [{0}], Stream [{1}], The [:path] pseudo header 
was empty

Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1788841&r1=1788840&r2=1788841&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Mon Mar 27 08:02:38 
2017
@@ -54,6 +54,7 @@ class Stream extends AbstractStream impl
 }
 
 private volatile int weight = Constants.DEFAULT_WEIGHT;
+private volatile long contentLengthReceived = 0;
 
 private final Http2UpgradeHandler handler;
 private final StreamStateMachine state;
@@ -446,7 +447,24 @@ class Stream extends AbstractStream impl
 }
 
 
-final void receivedEndOfStream() {
+final void receivedData(int payloadSize) throws ConnectionException {
+contentLengthReceived += payloadSize;
+long contentLengthHeader = coyoteRequest.getContentLengthLong();
+if (contentLengthHeader > -1 && contentLengthReceived > 
contentLengthHeader) {
+throw new 
ConnectionException(sm.getString("stream.header.contentLength",
+getConnectionId(), getIdentifier(), 
Long.valueOf(contentLengthHeader),
+Long.valueOf(contentLengthReceived)), 
Http2Error.PROTOCOL_ERROR);
+}
+}
+
+
+final void receivedEndOfStream() throws ConnectionException {
+long contentLengthHeader = coyoteRequest.getContentLengthLong();
+if (contentLengthHeader > -1 && contentLengthReceived != 
contentLengthHeader) {
+throw new 
ConnectionException(sm.getString("stream.header.contentLength",
+getConnectionId(), getIdentifier(), 
Long.valueOf(contentLengthHeader),
+Long.valueOf(contentLengthReceived)), 
Http2Error.PROTOCOL_ERROR);
+}
 state.receivedEndOfStream();
 if (inputBuffer != null) {
 inputBuffer.notifyEof();

Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1788841&r1=1788840&r2=1788841&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Str

[Bug 60362] Missing reason phrase in response

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

--- Comment #41 from Mark Thomas  ---
One of the main reasons 8.0.x is maintained is because this option isn't
available in 8.5.x. (The other is the sendfile issues which I think we are
getting to the bottom of).

The patch looks reasonable. A couple of minor whitespace issues but nothing
significant.

I think we should apply this patch with a view to reducing / halting 8.0.x
releases. I don't have a specific time-frame in mind, but certainly much
earlier than 8.5.x.

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



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

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 08:13:35 2017
New Revision: 1788843

URL: http://svn.apache.org/viewvc?rev=1788843&view=rev
Log:
Total data sent should agree with any content-length header
Found with the h2spec tool written by Moto Ishizawa.

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

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

[Bug 60362] Missing reason phrase in response

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

--- Comment #42 from Remy Maucherat  ---
Ok, I thought the 8.0 plan was long gone. But the patch is only for 8.5 then ?
If so, then I can withdraw the -1.

-- 
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 60362] Missing reason phrase in response

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

--- Comment #43 from Violeta Georgieva  ---
(In reply to Remy Maucherat from comment #42)
> Ok, I thought the 8.0 plan was long gone. But the patch is only for 8.5 then
> ? If so, then I can withdraw the -1.

The patch is only for Tomcat 8.5 and I explicitly specified in the
documentation and in the code that this option is deprecated and removed in
Tomcat 9. Also the default remains false i.e. we will not send reason phrase by
default.

-- 
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 58433] RemoteIpValve not activated on redirect from mapping

2017-03-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58433

gonzalad  changed:

   What|Removed |Added

 CC||adr_gonza...@yahoo.fr

-- 
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: r1788852 - /tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 09:14:45 2017
New Revision: 1788852

URL: http://svn.apache.org/viewvc?rev=1788852&view=rev
Log:
Header table size agreed in HPACK should never exceed limit set by HTTP/2. Use 
separate hard/soft limits to track the two.
Found with the h2spec tool written by Moto Ishizawa.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java?rev=1788852&r1=1788851&r2=1788852&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/HpackDecoder.java Mon Mar 27 
09:14:45 2017
@@ -57,9 +57,13 @@ public class HpackDecoder {
 private int currentMemorySize = 0;
 
 /**
- * The maximum allowed memory size
+ * The maximum allowed memory size set by the container.
  */
-private int maxMemorySize;
+private int maxMemorySizeHard;
+/**
+ * The maximum memory size currently in use. May be less than the hard 
limit.
+ */
+private int maxMemorySizeSoft;
 
 private int maxHeaderCount = Constants.DEFAULT_MAX_HEADER_COUNT;
 private int maxHeaderSize = Constants.DEFAULT_MAX_HEADER_SIZE;
@@ -71,7 +75,8 @@ public class HpackDecoder {
 private final StringBuilder stringBuilder = new StringBuilder();
 
 HpackDecoder(int maxMemorySize) {
-this.maxMemorySize = maxMemorySize;
+this.maxMemorySizeHard = maxMemorySize;
+this.maxMemorySizeSoft = maxMemorySize;
 headerTable = new Hpack.HeaderField[DEFAULT_RING_BUFFER_SIZE];
 }
 
@@ -165,12 +170,15 @@ public class HpackDecoder {
 buffer.position(originalPos);
 return false;
 }
-maxMemorySize = size;
-if (currentMemorySize > maxMemorySize) {
+if (size > maxMemorySizeHard) {
+throw new HpackException();
+}
+maxMemorySizeSoft = size;
+if (currentMemorySize > maxMemorySizeSoft) {
 int newTableSlots = filledTableSlots;
 int tableLength = headerTable.length;
 int newSize = currentMemorySize;
-while (newSize > maxMemorySize) {
+while (newSize > maxMemorySizeSoft) {
 int clearIndex = firstSlotPosition;
 firstSlotPosition++;
 if (firstSlotPosition == tableLength) {
@@ -287,7 +295,7 @@ public class HpackDecoder {
 }
 
 private void addEntryToHeaderTable(Hpack.HeaderField entry) {
-if (entry.size > maxMemorySize) {
+if (entry.size > maxMemorySizeSoft) {
 //it is to big to fit, so we just completely clear the table.
 while (filledTableSlots > 0) {
 headerTable[firstSlotPosition] = null;
@@ -306,7 +314,7 @@ public class HpackDecoder {
 int index = (firstSlotPosition + filledTableSlots) % tableLength;
 headerTable[index] = entry;
 int newSize = currentMemorySize + entry.size;
-while (newSize > maxMemorySize) {
+while (newSize > maxMemorySizeSoft) {
 int clearIndex = firstSlotPosition;
 firstSlotPosition++;
 if (firstSlotPosition == tableLength) {
@@ -452,7 +460,7 @@ public class HpackDecoder {
 return currentMemorySize;
 }
 
-int getMaxMemorySize() {
-return maxMemorySize;
+int getMaxMemorySizeSoft() {
+return maxMemorySizeSoft;
 }
 }



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



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

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 09:15:20 2017
New Revision: 1788853

URL: http://svn.apache.org/viewvc?rev=1788853&view=rev
Log:
Header table size agreed in HPACK should never exceed limit set by HTTP/2. Use 
separate hard/soft limits to track the two.
Found with the h2spec tool written by Moto Ishizawa.

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

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

svn commit: r1788860 - in /tomcat/trunk/java/org/apache/coyote/http2: ConnectionException.java Http2Exception.java Http2Parser.java

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 09:22:08 2017
New Revision: 1788860

URL: http://svn.apache.org/viewvc?rev=1788860&view=rev
Log:
Improve debug logging for HPACK errors.
Expose rather than swallow HpackException

Modified:
tomcat/trunk/java/org/apache/coyote/http2/ConnectionException.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionException.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionException.java?rev=1788860&r1=1788859&r2=1788860&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionException.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionException.java Mon Mar 
27 09:22:08 2017
@@ -26,4 +26,9 @@ class ConnectionException extends Http2E
 ConnectionException(String msg, Http2Error error) {
 super(msg, error);
 }
+
+
+ConnectionException(String msg, Http2Error error, Throwable cause) {
+super(msg, error, cause);
+}
 }

Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java?rev=1788860&r1=1788859&r2=1788860&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java Mon Mar 27 
09:22:08 2017
@@ -29,6 +29,12 @@ abstract class Http2Exception extends Ex
 }
 
 
+Http2Exception(String msg, Http2Error error, Throwable cause) {
+super(msg, cause);
+this.error = error;
+}
+
+
 Http2Error getError() {
 return error;
 }

Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1788860&r1=1788859&r2=1788860&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Mon Mar 27 
09:22:08 2017
@@ -420,7 +420,7 @@ class Http2Parser {
 } catch (HpackException hpe) {
 throw new ConnectionException(
 
sm.getString("http2Parser.processFrameHeaders.decodingFailed"),
-Http2Error.COMPRESSION_ERROR);
+Http2Error.COMPRESSION_ERROR, hpe);
 }
 
 // switches to write mode



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



svn commit: r1788861 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/ConnectionException.java java/org/apache/coyote/http2/Http2Exception.java java/org/apache/coyote/http2/Http2Parser.java

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 09:23:46 2017
New Revision: 1788861

URL: http://svn.apache.org/viewvc?rev=1788861&view=rev
Log:
Improve debug logging for HPACK errors.
Expose rather than swallow HpackException

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

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

buildbot failure in on tomcat-trunk

2017-03-27 Thread 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/2225

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



[Bug 60362] Missing reason phrase in response

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

--- Comment #44 from mgrigorov  ---
+1 for the change!

-- 
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 60854] Unintended JSESSIONID value change

2017-03-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60854

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |WONTFIX
 Status|NEW |RESOLVED

--- Comment #10 from Mark Thomas  ---
I think, given the options available, I am going to resolve this as WONTFIX.

If a use case was presented where alwaysUseSession="true" could not be used
then that might justify the additional complexity required to handle session
creation after authentication but, at the moment, such a use case seems pretty
unlikely.

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



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

2017-03-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60918

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #12 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.0.M19 onwards
- 8.5.x for 8.5.13 onwards

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



svn commit: r1788881 - in /tomcat/tc8.5.x/trunk: java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/org/apache/tomcat/util/http/ java/org/apache/tomcat/util/http/r

2017-03-27 Thread violetagg
Author: violetagg
Date: Mon Mar 27 10:38:29 2017
New Revision: 171

URL: http://svn.apache.org/viewvc?rev=171&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60362
Add a new Connector configuration sendReasonPhrase. When this attribute is set 
to true, a reason phrase will be sent with the response.
By default a reason phrase will not be sent. This option is deprecated and is 
not available in Tomcat 9.

Added:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/HttpMessages.java   
(with props)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/res/

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings.properties
   (with props)

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties
   (with props)

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_fr.properties
   (with props)
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/Constants.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java

tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Constants.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java

tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/systemprops.xml

Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=171&r1=170&r2=171&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Mar 
27 10:38:29 2017
@@ -207,6 +207,40 @@ public abstract class AbstractProtocolhttp://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/Constants.java?rev=171&r1=170&r2=171&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/Constants.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/Constants.java Mon Mar 27 
10:38:29 2017
@@ -49,6 +49,17 @@ public final class Constants {
 
 
 /**
+ * If true, custom HTTP status messages will be used in headers.
+ * @deprecated This option will be removed in Tomcat 9. Reason phrase will
+ * not be sent.
+ */
+@Deprecated
+public static final boolean USE_CUSTOM_STATUS_MSG_IN_HEADER =
+Boolean.valueOf(System.getProperty(
+"org.apache.coyote.USE_CUSTOM_STATUS_MSG_IN_HEADER",
+"false")).booleanValue();
+
+/**
  * The request attribute that is set to the value of {@code Boolean.TRUE}
  * if connector processing this request supports use of sendfile.
  */

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=171&r1=170&r2=171&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java 
Mon Mar 27 10:38:29 2017
@@ -182,6 +182,7 @@ public abstract class AbstractAjpProtoco
 }
 
 
+@SuppressWarnings("deprecation")
 @Override
 protected Processor createProcessor() {
 AjpProcessor processor = new AjpProcessor(getPacketSize(), 
getEndpoint());
@@ -192,6 +193,7 @@ public abstract class AbstractAjpProtoco
 processor.setRequiredSecret(requiredSecret);
 processor.setKeepAliveTimeout(getKeepAliveTimeout());
 processor.setClientCertProvider(getClientCertProvider());
+processor.setSendReasonPhrase(getSendReasonPhrase());
 return processor;
 }
 

Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=171&r1=170&r2=171&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apach

svn commit: r1788882 - /tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java

2017-03-27 Thread violetagg
Author: violetagg
Date: Mon Mar 27 10:40:42 2017
New Revision: 172

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

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java

Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=172&r1=171&r2=172&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Mar 
27 10:40:42 2017
@@ -210,7 +210,7 @@ public abstract class AbstractProtocol

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

2017-03-27 Thread violetagg
Author: violetagg
Date: Mon Mar 27 10:46:45 2017
New Revision: 173

URL: http://svn.apache.org/viewvc?rev=173&view=rev
Log:
Fixes having an issue number are sorted by their number, ascending.

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=173&r1=172&r2=173&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Mar 27 10:46:45 2017
@@ -113,11 +113,6 @@
 (markt)
   
   
-60900: Avoid a NullPointerException in the APR
-Poller if a connection is closed at the same time as new data arrives 
on
-that connection. (markt)
-  
-  
 Speed up shutdown when using multiple acceptor threads by ensuring that
 the code that unlocks the acceptor threads correctly handles the case
 where there are multiple threads. (markt)
@@ -133,6 +128,11 @@
 Osipov. (markt)
   
   
+60900: Avoid a NullPointerException in the APR
+Poller if a connection is closed at the same time as new data arrives 
on
+that connection. (markt)
+  
+  
 Improve HPACK specification compliance by fixing some test failures
 reported by the h2spec tool written by Moto Ishizawa. (markt)
   



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



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

2017-03-27 Thread violetagg
Author: violetagg
Date: Mon Mar 27 10:52:07 2017
New Revision: 174

URL: http://svn.apache.org/viewvc?rev=174&view=rev
Log:
Fixes having an issue number are sorted by their number, ascending.

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

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

svn commit: r1788890 - in /tomcat/trunk: java/org/apache/coyote/ java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ webapps/docs/

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 10:59:54 2017
New Revision: 1788890

URL: http://svn.apache.org/viewvc?rev=1788890&view=rev
Log:
Improve sendfile handling when requests are pipelined.

Added:
tomcat/trunk/java/org/apache/tomcat/util/net/SendfileKeepAliveState.java   
(with props)
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1788890&r1=179&r2=1788890&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Mar 27 
10:59:54 2017
@@ -868,10 +868,9 @@ public abstract class AbstractProtocolhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1788890&r1=179&r2=1788890&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Mar 27 
10:59:54 2017
@@ -55,6 +55,7 @@ import org.apache.tomcat.util.log.UserDa
 import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
 import org.apache.tomcat.util.net.SSLSupport;
 import org.apache.tomcat.util.net.SendfileDataBase;
+import org.apache.tomcat.util.net.SendfileKeepAliveState;
 import org.apache.tomcat.util.net.SendfileState;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 import org.apache.tomcat.util.res.StringManager;
@@ -1312,7 +1313,15 @@ public class Http11Processor extends Abs
 SendfileState result = SendfileState.DONE;
 // Do sendfile as needed: add socket to sendfile and end
 if (sendfileData != null && !getErrorState().isError()) {
-sendfileData.keepAlive = keepAlive;
+if (keepAlive) {
+if (available(false) == 0) {
+sendfileData.keepAliveState = SendfileKeepAliveState.OPEN;
+} else {
+sendfileData.keepAliveState = 
SendfileKeepAliveState.PIPELINED;
+}
+} else {
+sendfileData.keepAliveState = SendfileKeepAliveState.NONE;
+}
 result = socketWrapper.processSendfile(sendfileData);
 switch (result) {
 case ERROR:

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1788890&r1=179&r2=1788890&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Mar 27 
10:59:54 2017
@@ -2064,20 +2064,33 @@ public class AprEndpoint extends Abstrac
 state.length -= nw;
 if (state.length == 0) {
 remove(state);
-if (state.keepAlive) {
+switch (state.keepAliveState) {
+case NONE: {
+// Close the socket since this is
+// the end of the not keep-alive request.
+closeSocket(state.socket);
+break;
+}
+case PIPELINED: {
 // Destroy file descriptor pool, which 
should close the file
 Pool.destroy(state.fdpool);
-Socket.timeoutSet(state.socket,
-getConnectionTimeout() * 1000);
-// If all done put the socket back in the
-// poller for processing of further 
requests
-getPoller().add(
-state.socket, 
getKeepAliveTimeout(),
+Socket.timeoutSet(state.socket, 
getConnectionTimeout() * 1000);
+// Process the pipelined request data
+if (!processSocket(state.socket, 
SocketEvent.OPEN_READ)) {
+

buildbot success in on tomcat-trunk

2017-03-27 Thread 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/2226

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] 173
Blamelist: violetagg

Build succeeded!

Sincerely,
 -The Buildbot




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



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

2017-03-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60750

--- Comment #22 from Mark Thomas  ---
9.0.x behaves as expected and closes the connection without a final chunk.

-- 
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: r1788896 - in /tomcat/tags/TOMCAT_9_0_0_M19: ./ build.properties.default webapps/docs/changelog.xml

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 11:13:25 2017
New Revision: 1788896

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

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

Modified: tomcat/tags/TOMCAT_9_0_0_M19/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M19/build.properties.default?rev=1788896&r1=1788895&r2=1788896&view=diff
==
--- tomcat/tags/TOMCAT_9_0_0_M19/build.properties.default (original)
+++ tomcat/tags/TOMCAT_9_0_0_M19/build.properties.default Mon Mar 27 11:13:25 
2017
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=.M19-dev
+version.suffix=.M19
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed

Modified: tomcat/tags/TOMCAT_9_0_0_M19/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M19/webapps/docs/changelog.xml?rev=1788896&r1=1788895&r2=1788896&view=diff
==
--- tomcat/tags/TOMCAT_9_0_0_M19/webapps/docs/changelog.xml (original)
+++ tomcat/tags/TOMCAT_9_0_0_M19/webapps/docs/changelog.xml Mon Mar 27 11:13:25 
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



[Bug 60362] Missing reason phrase in response

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

Violeta Georgieva  changed:

   What|Removed |Added

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

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

A new Connector configuration 'sendReasonPhrase' is added. When this attribute
is set to 'true', a reason phrase will be sent with the response.
By default a reason phrase will not be sent. This option is deprecated and is
not available in Tomcat 9.

The functionality will be available in 8.5.13 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: r1788905 - /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/HttpMessages.java

2017-03-27 Thread violetagg
Author: violetagg
Date: Mon Mar 27 11:40:44 2017
New Revision: 1788905

URL: http://svn.apache.org/viewvc?rev=1788905&view=rev
Log:
Add 500 ISE to the most common reason phrases that can happen.

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/HttpMessages.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/HttpMessages.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/HttpMessages.java?rev=1788905&r1=1788904&r2=1788905&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/HttpMessages.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/HttpMessages.java Mon 
Mar 27 11:40:44 2017
@@ -48,6 +48,7 @@ public class HttpMessages {
 private String st_302 = null;
 private String st_400 = null;
 private String st_404 = null;
+private String st_500 = null;
 
 private HttpMessages(StringManager sm) {
 this.sm = sm;
@@ -89,6 +90,11 @@ public class HttpMessages {
 st_404 = sm.getString("sc.404");
 }
 return st_404;
+case 500:
+if (st_500 == null) {
+st_500 = sm.getString("sc.500");
+}
+return st_500;
 }
 return sm.getString("sc."+ status);
 }



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



svn commit: r1788908 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/http/HttpMessages.java

2017-03-27 Thread violetagg
Author: violetagg
Date: Mon Mar 27 11:49:52 2017
New Revision: 1788908

URL: http://svn.apache.org/viewvc?rev=1788908&view=rev
Log:
Add 500 ISE to the most common reason phrases that can happen.

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 27 11:49:52 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
+/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
 
/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-16845

svn commit: r1788909 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/HttpMessages.java

2017-03-27 Thread violetagg
Author: violetagg
Date: Mon Mar 27 11:52:06 2017
New Revision: 1788909

URL: http://svn.apache.org/viewvc?rev=1788909&view=rev
Log:
Add 500 ISE to the most common reason phrases that can happen.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/HttpMessages.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 27 11:52:06 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
-/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,1749375,1749668-1749669,1750016,1750057,1750976,1751000,1751062,1751098,1754112,1754144,1754282,1754312,1754614,1754726,1754806,1754878,1754889,1754894,1754900,1754945,1754954,1754958,1755891,1755944,1756040,1756412

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

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 12:52:30 2017
New Revision: 18927

Log:
Upload 9.0.0.M19 for voting

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

svn commit: r1788926 - in /tomcat/trunk: build.properties.default res/maven/mvn.properties.default

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 12:55:04 2017
New Revision: 1788926

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

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/res/maven/mvn.properties.default

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1788926&r1=1788925&r2=1788926&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Mar 27 12:55:04 2017
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=.M19-dev
+version.suffix=.M20-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=1788926&r1=1788925&r2=1788926&view=diff
==
--- tomcat/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/trunk/res/maven/mvn.properties.default Mon Mar 27 12:55:04 2017
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=9.0.0.M19
+maven.asf.release.deploy.version=9.0.0.M20
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib



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



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

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 12:55:53 2017
New Revision: 1788927

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

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=1788927&r1=1788926&r2=1788927&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Mar 27 12:55:53 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



[VOTE] Release Apache Tomcat 9.0.0.M19

2017-03-27 Thread Mark Thomas
The proposed Apache Tomcat 9.0.0.M19 release is now available for voting.

This is a milestone release for the 9.0.x branch. It should be
noted that, as a milestone release:
- Servlet 4.0 is not finalised
- The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket 1.2/2.0

The major changes compared to the 9.0.0.M18 release are:

- Various HTTP/2 improvements

- Fixes for sendfile related issues that could cause subsequent requests
  to experience IllegalStateExceptions

- Servlet 4.0 updates


Along with lots of other bug fixes and improvements

For full details, see the changelog:
http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.0.M19/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1125/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M19/

The proposed 9.0.0.M19 release is:
[ ] Broken - do not release
[ ] Alpha - go ahead and release as 9.0.0.M19

-
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

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

--- Comment #46 from Remy Maucherat  ---
Ok, it's a good compromise then if 8.0 indeed does not go on (I'll believe that
when it actually happens ;) ).

-- 
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 60750] A response that uses Transfer-Encoding: chunked is missing the last zero-length chunk

2017-03-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60750

--- Comment #23 from Mark Thomas  ---
As does 8.5.x

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



svn commit: r1788932 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/ java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ webapps/docs/

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 13:56:40 2017
New Revision: 1788932

URL: http://svn.apache.org/viewvc?rev=1788932&view=rev
Log:
Improve sendfile handling when requests are pipelined.

Added:

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SendfileKeepAliveState.java
   (with props)
Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

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

svn commit: r1788934 - in /tomcat/tc8.5.x/TOMCAT_8_5_13: ./ build.properties.default webapps/docs/changelog.xml

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 14:21:01 2017
New Revision: 1788934

URL: http://svn.apache.org/viewvc?rev=1788934&view=rev
Log:
Tag 8.5.13

Added:
tomcat/tc8.5.x/TOMCAT_8_5_13/   (props changed)
  - copied from r1788933, tomcat/tc8.5.x/trunk/
Modified:
tomcat/tc8.5.x/TOMCAT_8_5_13/build.properties.default
tomcat/tc8.5.x/TOMCAT_8_5_13/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/TOMCAT_8_5_13/
--
bugtraq:append = false

Propchange: tomcat/tc8.5.x/TOMCAT_8_5_13/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tc8.5.x/TOMCAT_8_5_13/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Mon Mar 27 14:21:01 2017
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tc8.5.x/TOMCAT_8_5_13/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/TOMCAT_8_5_13/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/TOMCAT_8_5_13/
--
--- svn:ignore (added)
+++ svn:ignore Mon Mar 27 14:21:01 2017
@@ -0,0 +1,8 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml
+temp

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

svn commit: r1788935 - in /tomcat/tc8.5.x: TOMCAT_8_5_13/ tags/TOMCAT_8_5_13/

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 14:22:35 2017
New Revision: 1788935

URL: http://svn.apache.org/viewvc?rev=1788935&view=rev
Log:
Correct tag location

Added:
tomcat/tc8.5.x/tags/TOMCAT_8_5_13/   (props changed)
  - copied from r1788934, tomcat/tc8.5.x/TOMCAT_8_5_13/
Removed:
tomcat/tc8.5.x/TOMCAT_8_5_13/

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_13/
--
bugtraq:append = false

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_13/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_13/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Mon Mar 27 14:22:35 2017
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_13/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_13/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_13/
--
--- svn:ignore (added)
+++ svn:ignore Mon Mar 27 14:22:35 2017
@@ -0,0 +1,8 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml
+temp

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

svn commit: r18928 - in /dev/tomcat/tomcat-8/v8.5.13: ./ bin/ bin/embed/ bin/extras/ src/

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 14:54:46 2017
New Revision: 18928

Log:
Upload 8.5.13 for voting

Added:
dev/tomcat/tomcat-8/v8.5.13/
dev/tomcat/tomcat-8/v8.5.13/KEYS
dev/tomcat/tomcat-8/v8.5.13/README.html
dev/tomcat/tomcat-8/v8.5.13/RELEASE-NOTES
dev/tomcat/tomcat-8/v8.5.13/bin/
dev/tomcat/tomcat-8/v8.5.13/bin/README.html
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-deployer.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-deployer.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-deployer.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-deployer.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-deployer.zip.asc
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-deployer.zip.md5
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-deployer.zip.sha1
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-fulldocs.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-fulldocs.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-windows-x64.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-windows-x64.zip.asc
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-windows-x64.zip.md5
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-windows-x64.zip.sha1
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-windows-x86.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-windows-x86.zip.asc
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-windows-x86.zip.md5
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13-windows-x86.zip.sha1
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13.exe   (with props)
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13.exe.asc
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13.exe.md5
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13.exe.sha1
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13.zip   (with props)
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13.zip.asc
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13.zip.md5
dev/tomcat/tomcat-8/v8.5.13/bin/apache-tomcat-8.5.13.zip.sha1
dev/tomcat/tomcat-8/v8.5.13/bin/embed/
dev/tomcat/tomcat-8/v8.5.13/bin/embed/apache-tomcat-8.5.13-embed.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.13/bin/embed/apache-tomcat-8.5.13-embed.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.13/bin/embed/apache-tomcat-8.5.13-embed.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.13/bin/embed/apache-tomcat-8.5.13-embed.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.13/bin/embed/apache-tomcat-8.5.13-embed.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.13/bin/embed/apache-tomcat-8.5.13-embed.zip.asc
dev/tomcat/tomcat-8/v8.5.13/bin/embed/apache-tomcat-8.5.13-embed.zip.md5
dev/tomcat/tomcat-8/v8.5.13/bin/embed/apache-tomcat-8.5.13-embed.zip.sha1
dev/tomcat/tomcat-8/v8.5.13/bin/extras/
dev/tomcat/tomcat-8/v8.5.13/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-8/v8.5.13/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-8/v8.5.13/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-8/v8.5.13/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-8/v8.5.13/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-8/v8.5.13/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-8/v8.5.13/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-8/v8.5.13/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-8/v8.5.13/src/
dev/tomcat/tomcat-8/v8.5.13/src/apache-tomcat-8.5.13-src.tar.gz   (with 
props)
dev/tomcat/tomcat-8/v8.5.13/src/apache-tomcat-8.5.13-src.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.13/src/apache-tomcat-8.5.13-src.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.13/src/apache-tomcat-8.5.13-src.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.13/src/apache-tomcat-8.5.13-src.zip   (with props)
dev/tomcat/tomcat-8/v8.5.13/src/apache-tomcat-8.5.13-src.zip.asc
dev/tomcat/tomcat-8/v8.5.13/src/apache-tomcat-8.5.13-src.zip.md5
dev/tomcat/tomcat-8/v8.5.13/src/apache-tomcat-8.5.13-src.zip.sha1

Added: dev/tomcat/tomcat-8/v8.5.13/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.13/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.13/KEYS Mon Mar 27 14:54:46 2017
@@ -0,0 +1,616 @@
+This file contains the PGP&GPG keys of various Apache d

[VOTE] Release Apache Tomcat 8.5.13

2017-03-27 Thread Mark Thomas
The proposed Apache Tomcat 8.5.13 release is now available for voting.

The major changes compared to the 8.5.12 release are:

- Various HTTP/2 improvements

- Fixes for sendfile related issues that could cause subsequent requests
  to experience IllegalStateExceptions

- Servlet 4.0 updates


It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.13/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1126/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_13/

The proposed 8.5.13 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 8.5.13

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



Re: [VOTE] Release Apache Tomcat 9.0.0.M19

2017-03-27 Thread Violeta Georgieva
Hi,

2017-03-27 15:56 GMT+03:00 Mark Thomas :
>
> The proposed Apache Tomcat 9.0.0.M19 release is now available for voting.
>
> This is a milestone release for the 9.0.x branch. It should be
> noted that, as a milestone release:
> - Servlet 4.0 is not finalised
> - The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket 1.2/2.0
>
> The major changes compared to the 9.0.0.M18 release are:
>
> - Various HTTP/2 improvements
>
> - Fixes for sendfile related issues that could cause subsequent requests
>   to experience IllegalStateExceptions
>
> - Servlet 4.0 updates
>
>
> Along with lots of other bug fixes and improvements
>
> For full details, see the changelog:
> http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.0.M19/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1125/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M19/
>
> The proposed 9.0.0.M19 release is:
> [ ] Broken - do not release
[X] Alpha - go ahead and release as 9.0.0.M19

Regards,
Violeta

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


svn commit: r1788999 - in /tomcat/tc8.0.x/trunk: java/org/apache/coyote/ java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ webapps/docs/

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 19:52:30 2017
New Revision: 1788999

URL: http://svn.apache.org/viewvc?rev=1788999&view=rev
Log:
Improve sendfile handling when requests are pipelined.

Added:

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SendfileKeepAliveState.java
   (with props)
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1788999&r1=1788998&r2=1788999&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Mar 
27 19:52:30 2017
@@ -747,10 +747,9 @@ public abstract class AbstractProtocolhttp://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1788999&r1=1788998&r2=1788999&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
Mon Mar 27 19:52:30 2017
@@ -38,6 +38,7 @@ import org.apache.tomcat.util.ExceptionU
 import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
 import org.apache.tomcat.util.net.AprEndpoint;
 import org.apache.tomcat.util.net.SSLSupport;
+import org.apache.tomcat.util.net.SendfileKeepAliveState;
 import org.apache.tomcat.util.net.SocketStatus;
 import org.apache.tomcat.util.net.SocketWrapper;
 
@@ -198,7 +199,15 @@ public class Http11AprProcessor extends
 // Do sendfile as needed: add socket to sendfile and end
 if (sendfileData != null && !getErrorState().isError()) {
 sendfileData.socket = socketWrapper.getSocket().longValue();
-sendfileData.keepAlive = keepAlive;
+if (keepAlive) {
+if (getInputBuffer().available(false) == 0) {
+sendfileData.keepAliveState = SendfileKeepAliveState.OPEN;
+} else {
+sendfileData.keepAliveState = 
SendfileKeepAliveState.PIPELINED;
+}
+} else {
+sendfileData.keepAliveState = SendfileKeepAliveState.NONE;
+}
 switch (((AprEndpoint)endpoint).getSendfile().add(sendfileData)) {
 case DONE:
 return false;

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1788999&r1=1788998&r2=1788999&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java 
Mon Mar 27 19:52:30 2017
@@ -37,6 +37,7 @@ import org.apache.tomcat.util.net.Nio2Ch
 import org.apache.tomcat.util.net.Nio2Endpoint;
 import org.apache.tomcat.util.net.SSLSupport;
 import org.apache.tomcat.util.net.SecureNio2Channel;
+import org.apache.tomcat.util.net.SendfileKeepAliveState;
 import org.apache.tomcat.util.net.SocketStatus;
 import org.apache.tomcat.util.net.SocketWrapper;
 
@@ -280,7 +281,15 @@ public class Http11Nio2Processor extends
 // Do sendfile as needed: add socket to sendfile and end
 if (sendfileData != null && !getErrorState().isError()) {
 ((Nio2Endpoint.Nio2SocketWrapper) 
socketWrapper).setSendfileData(sendfileData);
-sendfileData.keepAlive = keepAlive;
+if (keepAlive) {
+if (getInputBuffer().available(false) == 0) {
+sendfileData.keepAliveState = SendfileKeepAliveState.OPEN;
+} else {
+sendfileData.keepAliveState = 
SendfileKeepAliveState.PIPELINED;
+}
+} else {
+sendfileData.keepAliveState = SendfileKeepAliveState.NONE;
+}
 switch (((Nio2Endpoint) endpoint).processSendfile(
 (Nio2Endpoint.Nio2SocketWrapper) socketWrapper)) {
 case DONE:

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL: 

svn commit: r1789001 - in /tomcat/tc8.5.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 20:01:52 2017
New Revision: 1789001

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

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

Modified: tomcat/tc8.5.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.properties.default?rev=1789001&r1=1789000&r2=1789001&view=diff
==
--- tomcat/tc8.5.x/trunk/build.properties.default (original)
+++ tomcat/tc8.5.x/trunk/build.properties.default Mon Mar 27 20:01:52 2017
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=13
+version.build=14
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default?rev=1789001&r1=1789000&r2=1789001&view=diff
==
--- tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default Mon Mar 27 20:01:52 
2017
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=8.5.13
+maven.asf.release.deploy.version=8.5.14
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

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=1789001&r1=1789000&r2=1789001&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Mar 27 20:01:52 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



svn commit: r1789008 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/ java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ webapps/docs/

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 20:35:27 2017
New Revision: 1789008

URL: http://svn.apache.org/viewvc?rev=1789008&view=rev
Log:
Improve sendfile handling when requests are pipelined.

Added:

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SendfileKeepAliveState.java
  - copied unchanged from r1788999, 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SendfileKeepAliveState.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 27 20:35:27 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
+/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,16402

svn commit: r1789024 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ webapps/docs/

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 22:02:50 2017
New Revision: 1789024

URL: http://svn.apache.org/viewvc?rev=1789024&view=rev
Log:
Improve sendfile handling when requests are pipelined.

Added:

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SendfileKeepAliveState.java
  - copied unchanged from r1789008, 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SendfileKeepAliveState.java
Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 27 22:02:50 2017
@@ -1,4 +1,4 @@
-/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1498342,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1560812,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1564417,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001
 
,1664176,1665087,1666762,1666968,1666989,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1704482,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1759
 
567,1761631,1761748,1762772,1763236,1763415,1763580,1765593,1765598,1767374,1767675-1767676,1771211,1772177,1772262,1772270,1773421,1774139,1774252,1774321,1774323,1774325,1774345,1777016,1779353,1779659,1781602,1786147,1786149-1786150
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666759,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1715866,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803,1725929,1725963-1725965,1725970,1725974,1726172,1726175,1726179-1726182,1726195-1726198,1726200,1726203,1726226,1726576,1726630,1727029,1727037,1727671,1727900,1728449,1729362,1731009,1731955,1731977,1732360,1732672,1733941,1734115,1734133,1734531,1737967,1738173,1739777,1741217,1743647,1744152,1756018,1759565,1767653,1767656,1776543,1777015,1779330,1784188
+/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1498342,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1560812,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1564417,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1

buildbot failure in on tomcat-6-trunk

2017-03-27 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-6-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-6-trunk/builds/215

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-6-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc6.0.x/trunk] 1789024
Blamelist: markt

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




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



[Bug 60925] New: Running with SecurityManager - Property 'serverInfo' not found on type org.apache.catalina.core.ApplicationContextFacade

2017-03-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60925

Bug ID: 60925
   Summary: Running with SecurityManager - Property 'serverInfo'
not found on type
org.apache.catalina.core.ApplicationContextFacade
   Product: Tomcat 8
   Version: 8.5.12
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: EL
  Assignee: dev@tomcat.apache.org
  Reporter: knst.koli...@gmail.com
  Target Milestone: 

Created attachment 34884
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=34884&action=edit
localhost.2017-03-28.log

Noted when smoke-testing 8.5.13 RC, but this is reproducible with released
8.5.12 as well, so it is not a regression.

Steps to reproduce:
1. Start Tomcat 8.5 with security manager enabled
catalina.bat start -security

2. Access the root page,
http://localhost:8080/

It fails with error 500.
Stacktrace from 8.5.13:

javax.el.PropertyNotFoundException: Property 'serverInfo' not found on type
org.apache.catalina.core.ApplicationContextFacade
 at javax.el.BeanELResolver$BeanProperties.get(BeanELResolver.java:259)
 at javax.el.BeanELResolver$BeanProperties.access$300(BeanELResolver.java:212)
 at javax.el.BeanELResolver.property(BeanELResolver.java:346)
 at javax.el.BeanELResolver.getValue(BeanELResolver.java:92)
 at org.apache.jasper.el.JasperELResolver.getValue(JasperELResolver.java:110)
 at org.apache.el.parser.AstValue.getValue(AstValue.java:169)
 at org.apache.el.ValueExpressionImpl.getValue(ValueExpressionImpl.java:184)
 at
org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate(PageContextImpl.java:944)
 at org.apache.jsp.index_jsp._jspService(index_jsp.java:155)

See attached file with full stacktrace.


Notes:
1. This does not happen when running without SecurityManager.
2. This does not depends on version of java (occurs both with 7u80 and 8u121).


I have seen similar errors when we were fixing CVE-2014-7810
(see thread from 2014-11-17), but it should have been fixed by r1644017
that improved javax.el.BeanELResolver.

-- 
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 60925] Running with SecurityManager - Property 'serverInfo' not found on type org.apache.catalina.core.ApplicationContextFacade

2017-03-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60925

Konstantin Kolinko  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Konstantin Kolinko  ---
Tomcat 8.5.11 does not have this issue. The root page displays successfully.

-- 
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 60926] New: Servlet 4 method ApplicationContextFacade.setSessionTimeout() calls wrong method

2017-03-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60926

Bug ID: 60926
   Summary: Servlet 4 method
ApplicationContextFacade.setSessionTimeout() calls
wrong method
   Product: Tomcat 8
   Version: 8.5.12
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: knst.koli...@gmail.com
  Target Milestone: 

Noted when reviewing r1784768 while investigating a different bug:

in org.apache.catalina.core.ApplicationContextFacade:

@Override
public void setSessionTimeout(int sessionTimeout) {
if (SecurityUtil.isPackageProtectionEnabled()) {
doPrivileged("getSessionTimeout", new Object[] {
Integer.valueOf(sessionTimeout) });
} else  {
context.setSessionTimeout(sessionTimeout);
}
}

calls a wrong method when running with SecurityManager:

s/"getSessionTimeout"/"setSessionTimeout"/

-- 
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 60925] Running with SecurityManager - Property 'serverInfo' not found on type org.apache.catalina.core.ApplicationContextFacade

2017-03-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60925

--- Comment #2 from Konstantin Kolinko  ---
I think that this is triggered by the change in r1784768,
that changed inheritance hierarchy in ApplicationContextFacade

and the cause is that the solution implemented in r1644017 is incomplete:
method BeanELResolver.populateFromInterfaces() does not enumerate parent
interfaces of an interface.

-- 
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: r1789031 - /tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java

2017-03-27 Thread markt
Author: markt
Date: Mon Mar 27 23:41:46 2017
New Revision: 1789031

URL: http://svn.apache.org/viewvc?rev=1789031&view=rev
Log:
Formatting

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java?rev=1789031&r1=1789030&r2=1789031&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java 
Mon Mar 27 23:41:46 2017
@@ -21,4 +21,5 @@ import org.apache.tomcat.util.res.String
 
 public abstract class AbstractInputBuffer implements InputBuffer {
 
-protected static final StringManager sm = 
StringManager.getManager(AbstractInputBuffer.class);}
+protected static final StringManager sm = 
StringManager.getManager(AbstractInputBuffer.class);
+}



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



svn commit: r1789051 - /tomcat/trunk/webapps/docs/config/systemprops.xml

2017-03-27 Thread violetagg
Author: violetagg
Date: Tue Mar 28 06:45:23 2017
New Revision: 1789051

URL: http://svn.apache.org/viewvc?rev=1789051&view=rev
Log:
A "space" in the property name is used in order to keep the "Property" column 
at some specified width.

Modified:
tomcat/trunk/webapps/docs/config/systemprops.xml

Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1789051&r1=1789050&r2=1789051&view=diff
==
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Tue Mar 28 06:45:23 2017
@@ -606,7 +606,7 @@
   If not specified, the default value of 200 will be 
used.
 
 
-
+
   The character to use to separate the WAR file and WAR content parts of
   a WAR URL using the custom WAR scheme provided by Tomcat. This is
   equivalent to how ! is used in JAR URLs.



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



svn commit: r1789052 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/config/systemprops.xml

2017-03-27 Thread violetagg
Author: violetagg
Date: Tue Mar 28 06:52:18 2017
New Revision: 1789052

URL: http://svn.apache.org/viewvc?rev=1789052&view=rev
Log:
A "space" in the property name is used in order to keep the "Property" column 
at some specified width.

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

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

[Bug 60927] New: JMX domain name for embed tomcat is inconsistent with standard tomcat

2017-03-27 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60927

Bug ID: 60927
   Summary: JMX domain name for embed tomcat is inconsistent with
standard tomcat
   Product: Tomcat 9
   Version: 9.0.0.M18
  Hardware: All
OS: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: huxing.zh...@gmail.com
  Target Milestone: -

Background:

Tomcat provides the org.apache.catalina.startup.Tomcat class to easily build
embedded web applications. By default, it set the name "Tomcat" for both
Service and Engine component.

However, for a "standard" tomcat instance, the default name is "Catalina",
which is configured via server.xml.

Because the name is part of the object name for JMX, external programs will
suffer from inconsistent object names when monitoring tomcat under such two
scenarios. For example, a spring-boot application uses embedded tomcat as
default servlet container, to query the tomcat version exposed by
StandardServer, one must use 'Tomcat:type=Server' as object name.


Proposal:

Ensure the object name of all internal components are consistent for both
standard and embedded tomcat scenarios.

Details improvements includes:
1. Change the default name of embedded tomcat to 'Catalina', to achieve this, I
think we just need to remove the explicit call to 'setName( "Tomcat" )' since
'Catalina' is the default name.
2. Provide a programmable interface for org.apache.catalina.startup.Tomcat (
via both constructor and setter) so that the name of Tomcat can be configurable
rather that hard-coded 'Tomcat'.

Any thoughts?

I would like to provide a patch if it is agreed to do so.

-- 
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: r1789054 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/config/systemprops.xml

2017-03-27 Thread violetagg
Author: violetagg
Date: Tue Mar 28 06:59:15 2017
New Revision: 1789054

URL: http://svn.apache.org/viewvc?rev=1789054&view=rev
Log:
A "space" in the property name is used in order to keep the "Property" column 
at some specified width.

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 28 06:59:15 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
-/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,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,16