Re: [VOTE] Release Apache Tomcat 8.5.14
2017-04-13 22:12 GMT+09:00 Mark Thomas : > The proposed Apache Tomcat 8.5.14 release is now available for voting. > > The major changes compared to the 8.5.13 release are: > > - Correct a regression that broke JMX operations (including the Manager > web application) if the operation took parameters > > - Add JMX support for Tribes components > > This has not back-ported into Tomcat8.5 yet. > - Calls to isReady() no longer throw exceptions after timeouts for async > servlets > > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.14/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1132/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_14/ > > The proposed 8.5.14 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.5.14 > > +1 Tested on my handmade app.(use BackupManager). > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- > Keiichi.Fujino >
Re: [VOTE] Release Apache Tomcat 9.0.0.M20
2017-04-13 5:11 GMT+09:00 Mark Thomas : > The proposed Apache Tomcat 9.0.0.M20 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.M19 release are: > > - Correct a regression that broke JMX operations (including the Manager > web application) if the operation took parameters > > - Add JMX support for Tribes components > > - Calls to isReady() no longer throw exceptions after timeouts for async > servlets > > > 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.M20/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1131/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M20/ > > The proposed 9.0.0.M20 release is: > [ ] Broken - do not release > [X] Alpha - go ahead and release as 9.0.0.M20 > > +1 Tested on my handmade app.(use BackupManager). > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- > Keiichi.Fujino >
[Bug 60769] Problem with Jsp character encoding configuration
https://bz.apache.org/bugzilla/show_bug.cgi?id=60769 --- Comment #4 from Mark Thomas --- I've done some further testing and fixed an unrelated bug but as for as unusual encodings go, they have to be specified in the prolog else the JRE's XML parser doesn't have enough information to be able to reliably determine the encoding. -- 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: r1791300 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/compiler/EncodingDetector.java webapps/docs/changelog.xml
Author: markt Date: Thu Apr 13 19:38:09 2017 New Revision: 1791300 URL: http://svn.apache.org/viewvc?rev=1791300&view=rev Log: When no BOM is present and an encoding is detected, do not skip the bytes used to detect the encoding since they are not part of a BOM. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/EncodingDetector.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 13 19:38:09 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,176
svn commit: r1791298 - in /tomcat/trunk: java/org/apache/jasper/compiler/EncodingDetector.java webapps/docs/changelog.xml
Author: markt
Date: Thu Apr 13 19:37:39 2017
New Revision: 1791298
URL: http://svn.apache.org/viewvc?rev=1791298&view=rev
Log:
When no BOM is present and an encoding is detected, do not skip the bytes used
to detect the encoding since they are not part of a BOM.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java?rev=1791298&r1=1791297&r2=1791298&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java Thu Apr
13 19:37:39 2017
@@ -162,41 +162,41 @@ class EncodingDetector {
return new BomResult("UTF-8", 0);
}
-// other encodings
+// Other encodings. No BOM. Try and ID encoding.
int b3 = b4[3] & 0xFF;
if (b0 == 0x00 && b1 == 0x00 && b2 == 0x00 && b3 == 0x3C) {
// UCS-4, big endian (1234)
-return new BomResult("ISO-10646-UCS-4", 4);
+return new BomResult("ISO-10646-UCS-4", 0);
}
if (b0 == 0x3C && b1 == 0x00 && b2 == 0x00 && b3 == 0x00) {
// UCS-4, little endian (4321)
-return new BomResult("ISO-10646-UCS-4", 4);
+return new BomResult("ISO-10646-UCS-4", 0);
}
if (b0 == 0x00 && b1 == 0x00 && b2 == 0x3C && b3 == 0x00) {
// UCS-4, unusual octet order (2143)
// REVISIT: What should this be?
-return new BomResult("ISO-10646-UCS-4", 4);
+return new BomResult("ISO-10646-UCS-4", 0);
}
if (b0 == 0x00 && b1 == 0x3C && b2 == 0x00 && b3 == 0x00) {
// UCS-4, unusual octect order (3412)
// REVISIT: What should this be?
-return new BomResult("ISO-10646-UCS-4", 4);
+return new BomResult("ISO-10646-UCS-4", 0);
}
if (b0 == 0x00 && b1 == 0x3C && b2 == 0x00 && b3 == 0x3F) {
// UTF-16, big-endian, no BOM
// (or could turn out to be UCS-2...
// REVISIT: What should this be?
-return new BomResult("UTF-16BE", 4);
+return new BomResult("UTF-16BE", 0);
}
if (b0 == 0x3C && b1 == 0x00 && b2 == 0x3F && b3 == 0x00) {
// UTF-16, little-endian, no BOM
// (or could turn out to be UCS-2...
-return new BomResult("UTF-16LE", 4);
+return new BomResult("UTF-16LE", 0);
}
if (b0 == 0x4C && b1 == 0x6F && b2 == 0xA7 && b3 == 0x94) {
// EBCDIC
// a la xerces1, return CP037 instead of EBCDIC here
-return new BomResult("CP037", 4);
+return new BomResult("CP037", 0);
}
// default encoding
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1791298&r1=1791297&r2=1791298&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Apr 13 19:37:39 2017
@@ -45,6 +45,15 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+When no BOM is present and an encoding is detected, do not skip the
+bytes used to detect the encoding since they are not part of a BOM.
+(markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.14
2017-04-13 16:12 GMT+03:00 Mark Thomas : > > The proposed Apache Tomcat 8.5.14 release is now available for voting. > > The major changes compared to the 8.5.13 release are: > > - Correct a regression that broke JMX operations (including the Manager > web application) if the operation took parameters > > - Add JMX support for Tribes components > > - Calls to isReady() no longer throw exceptions after timeouts for async > servlets > > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.14/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1132/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_14/ > > The proposed 8.5.14 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.5.14 Regards, Violeta > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
Re: [VOTE] Release Apache Tomcat 8.5.14
2017-04-13 15:12 GMT+02:00 Mark Thomas : > The proposed Apache Tomcat 8.5.14 release is now available for voting. > > The major changes compared to the 8.5.13 release are: > > - Correct a regression that broke JMX operations (including the Manager > web application) if the operation took parameters > > - Add JMX support for Tribes components > > - Calls to isReady() no longer throw exceptions after timeouts for async > servlets > > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.14/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1132/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_14/ > > The proposed 8.5.14 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.5.14 > > Rémy
Re: [VOTE] Release Apache Tomcat 8.5.14
On 13/04/17 14:12, Mark Thomas wrote: > The proposed Apache Tomcat 8.5.14 release is now available for voting. > The proposed 8.5.14 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.5.14 Unit tests pass for NIO, NIO2 and APR/native with 1.2.12 on Windows, OSX and Linux. Mark - 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.M20
On 12/04/17 21:11, Mark Thomas wrote: > The proposed Apache Tomcat 9.0.0.M20 release is now available for voting. > The proposed 9.0.0.M20 release is: > [ ] Broken - do not release > [X] Alpha - go ahead and release as 9.0.0.M20 Unit tests pass for NIO, NIO2 and APR/native with 1.2.12 on Windows, OSX and Linux. Mark - 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.M20
2017-04-12 22:11 GMT+02:00 Mark Thomas : > The proposed Apache Tomcat 9.0.0.M20 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.M19 release are: > > - Correct a regression that broke JMX operations (including the Manager > web application) if the operation took parameters > > - Add JMX support for Tribes components > > - Calls to isReady() no longer throw exceptions after timeouts for async > servlets > > > 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.M20/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1131/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M20/ > > The proposed 9.0.0.M20 release is: > [ ] Broken - do not release > [X] Alpha - go ahead and release as 9.0.0.M20 > > Rémy
Re: [VOTE] Release Apache Tomcat 9.0.0.M20
2017-04-12 23:11 GMT+03:00 Mark Thomas : > > The proposed Apache Tomcat 9.0.0.M20 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.M19 release are: > > - Correct a regression that broke JMX operations (including the Manager > web application) if the operation took parameters > > - Add JMX support for Tribes components > > - Calls to isReady() no longer throw exceptions after timeouts for async > servlets > > > 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.M20/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1131/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M20/ > > The proposed 9.0.0.M20 release is: > [ ] Broken - do not release > [X] Alpha - go ahead and release as 9.0.0.M20 Regards, Violeta > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
svn commit: r1791253 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AbstractEndpoint.java Acceptor.java AprEndpoint.java Nio2Endpoint.java NioEndpoint.java
Author: markt
Date: Thu Apr 13 13:50:22 2017
New Revision: 1791253
URL: http://svn.apache.org/viewvc?rev=1791253&view=rev
Log:
Fix a theoretical problem where the connection count could exceed the limit
during shutdown.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Acceptor.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
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1791253&r1=1791252&r2=1791253&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Apr
13 13:50:22 2017
@@ -986,6 +986,7 @@ public abstract class AbstractEndpointhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Acceptor.java?rev=1791253&r1=1791252&r2=1791253&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Acceptor.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Acceptor.java Thu Apr 13
13:50:22 2017
@@ -82,6 +82,12 @@ public class Acceptor implements Runn
//if we have reached max connections, wait
endpoint.countUpOrAwaitConnection();
+// Endpoint might have been paused while waiting for latch
+// If that is the case, don't accept new connections
+if (endpoint.isPaused()) {
+continue;
+}
+
U socket = null;
try {
// Accept the next incoming connection from the server
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=1791253&r1=1791252&r2=1791253&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu Apr 13
13:50:22 2017
@@ -625,7 +625,6 @@ public class AprEndpoint extends Abstrac
*/
@Override
public void stopInternal() {
-releaseConnectionLatch();
if (!paused) {
pause();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1791253&r1=1791252&r2=1791253&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu Apr 13
13:50:22 2017
@@ -190,7 +190,6 @@ public class Nio2Endpoint extends Abstra
*/
@Override
public void stopInternal() {
-releaseConnectionLatch();
if (!paused) {
pause();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1791253&r1=1791252&r2=1791253&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu Apr 13
13:50:22 2017
@@ -267,7 +267,6 @@ public class NioEndpoint extends Abstrac
*/
@Override
public void stopInternal() {
-releaseConnectionLatch();
if (!paused) {
pause();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1791252 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AbstractEndpoint.java Nio2Endpoint.java NioEndpoint.java
Author: markt
Date: Thu Apr 13 13:37:08 2017
New Revision: 1791252
URL: http://svn.apache.org/viewvc?rev=1791252&view=rev
Log:
Remove unnecessary calls to unlockAccept()
The prior call to pause() will take care of this.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1791252&r1=1791251&r2=1791252&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Apr
13 13:37:08 2017
@@ -756,9 +756,9 @@ public abstract class AbstractEndpoint acceptor : acceptors) {
@@ -980,7 +980,8 @@ public abstract class AbstractEndpointhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1791252&r1=1791251&r2=1791252&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu Apr 13
13:37:08 2017
@@ -196,7 +196,6 @@ public class Nio2Endpoint extends Abstra
}
if (running) {
running = false;
-unlockAccept();
// Use the executor to avoid binding the main thread if something
bad
// occurs and unbind will also wait for a bit for it to complete
getExecutor().execute(new Runnable() {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1791252&r1=1791251&r2=1791252&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu Apr 13
13:37:08 2017
@@ -273,7 +273,6 @@ public class NioEndpoint extends Abstrac
}
if (running) {
running = false;
-unlockAccept();
for (int i=0; pollers!=null && i
svn commit: r1791249 - in /tomcat/tc8.5.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
Author: markt Date: Thu Apr 13 13:21:28 2017 New Revision: 1791249 URL: http://svn.apache.org/viewvc?rev=1791249&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=1791249&r1=1791248&r2=1791249&view=diff == --- tomcat/tc8.5.x/trunk/build.properties.default (original) +++ tomcat/tc8.5.x/trunk/build.properties.default Thu Apr 13 13:21:28 2017 @@ -25,7 +25,7 @@ # - Version Control Flags - version.major=8 version.minor=5 -version.build=14 +version.build=15 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=1791249&r1=1791248&r2=1791249&view=diff == --- tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default Thu Apr 13 13:21:28 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.14 +maven.asf.release.deploy.version=8.5.15 #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=1791249&r1=1791248&r2=1791249&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Apr 13 13:21:28 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: r19137 - in /dev/tomcat/tomcat-8/v8.5.14: ./ bin/ bin/embed/ bin/extras/ src/
Author: markt Date: Thu Apr 13 13:16:45 2017 New Revision: 19137 Log: Upload 8.5.14 for voting Added: dev/tomcat/tomcat-8/v8.5.14/ dev/tomcat/tomcat-8/v8.5.14/KEYS dev/tomcat/tomcat-8/v8.5.14/README.html dev/tomcat/tomcat-8/v8.5.14/RELEASE-NOTES dev/tomcat/tomcat-8/v8.5.14/bin/ dev/tomcat/tomcat-8/v8.5.14/bin/README.html dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-deployer.tar.gz (with props) dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-deployer.tar.gz.asc dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-deployer.tar.gz.md5 dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-deployer.tar.gz.sha1 dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-deployer.zip (with props) dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-deployer.zip.asc dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-deployer.zip.md5 dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-deployer.zip.sha1 dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-fulldocs.tar.gz (with props) dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-fulldocs.tar.gz.asc dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-fulldocs.tar.gz.md5 dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-fulldocs.tar.gz.sha1 dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-windows-x64.zip (with props) dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-windows-x64.zip.asc dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-windows-x64.zip.md5 dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-windows-x64.zip.sha1 dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-windows-x86.zip (with props) dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-windows-x86.zip.asc dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-windows-x86.zip.md5 dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14-windows-x86.zip.sha1 dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14.exe (with props) dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14.exe.asc dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14.exe.md5 dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14.exe.sha1 dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14.tar.gz (with props) dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14.tar.gz.asc dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14.tar.gz.md5 dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14.tar.gz.sha1 dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14.zip (with props) dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14.zip.asc dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14.zip.md5 dev/tomcat/tomcat-8/v8.5.14/bin/apache-tomcat-8.5.14.zip.sha1 dev/tomcat/tomcat-8/v8.5.14/bin/embed/ dev/tomcat/tomcat-8/v8.5.14/bin/embed/apache-tomcat-8.5.14-embed.tar.gz (with props) dev/tomcat/tomcat-8/v8.5.14/bin/embed/apache-tomcat-8.5.14-embed.tar.gz.asc dev/tomcat/tomcat-8/v8.5.14/bin/embed/apache-tomcat-8.5.14-embed.tar.gz.md5 dev/tomcat/tomcat-8/v8.5.14/bin/embed/apache-tomcat-8.5.14-embed.tar.gz.sha1 dev/tomcat/tomcat-8/v8.5.14/bin/embed/apache-tomcat-8.5.14-embed.zip (with props) dev/tomcat/tomcat-8/v8.5.14/bin/embed/apache-tomcat-8.5.14-embed.zip.asc dev/tomcat/tomcat-8/v8.5.14/bin/embed/apache-tomcat-8.5.14-embed.zip.md5 dev/tomcat/tomcat-8/v8.5.14/bin/embed/apache-tomcat-8.5.14-embed.zip.sha1 dev/tomcat/tomcat-8/v8.5.14/bin/extras/ dev/tomcat/tomcat-8/v8.5.14/bin/extras/catalina-jmx-remote.jar (with props) dev/tomcat/tomcat-8/v8.5.14/bin/extras/catalina-jmx-remote.jar.asc dev/tomcat/tomcat-8/v8.5.14/bin/extras/catalina-jmx-remote.jar.md5 dev/tomcat/tomcat-8/v8.5.14/bin/extras/catalina-jmx-remote.jar.sha1 dev/tomcat/tomcat-8/v8.5.14/bin/extras/catalina-ws.jar (with props) dev/tomcat/tomcat-8/v8.5.14/bin/extras/catalina-ws.jar.asc dev/tomcat/tomcat-8/v8.5.14/bin/extras/catalina-ws.jar.md5 dev/tomcat/tomcat-8/v8.5.14/bin/extras/catalina-ws.jar.sha1 dev/tomcat/tomcat-8/v8.5.14/src/ dev/tomcat/tomcat-8/v8.5.14/src/apache-tomcat-8.5.14-src.tar.gz (with props) dev/tomcat/tomcat-8/v8.5.14/src/apache-tomcat-8.5.14-src.tar.gz.asc dev/tomcat/tomcat-8/v8.5.14/src/apache-tomcat-8.5.14-src.tar.gz.md5 dev/tomcat/tomcat-8/v8.5.14/src/apache-tomcat-8.5.14-src.tar.gz.sha1 dev/tomcat/tomcat-8/v8.5.14/src/apache-tomcat-8.5.14-src.zip (with props) dev/tomcat/tomcat-8/v8.5.14/src/apache-tomcat-8.5.14-src.zip.asc dev/tomcat/tomcat-8/v8.5.14/src/apache-tomcat-8.5.14-src.zip.md5 dev/tomcat/tomcat-8/v8.5.14/src/apache-tomcat-8.5.14-src.zip.sha1 Added: dev/tomcat/tomcat-8/v8.5.14/KEYS == --- dev/tomcat/tomcat-8/v8.5.14/KEYS (added) +++ dev/tomcat/tomcat-8/v8.5.14/KEYS Thu Apr 13 13:16:45 2017 @@ -0,0 +1,616 @@ +This file contains the PGP&GPG keys of various Apache d
[VOTE] Release Apache Tomcat 8.5.14
The proposed Apache Tomcat 8.5.14 release is now available for voting. The major changes compared to the 8.5.13 release are: - Correct a regression that broke JMX operations (including the Manager web application) if the operation took parameters - Add JMX support for Tribes components - Calls to isReady() no longer throw exceptions after timeouts for async servlets It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.14/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1132/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_14/ The proposed 8.5.14 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 8.5.14 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1791243 - in /tomcat/tc8.5.x/tags/TOMCAT_8_5_14: ./ build.properties.default webapps/docs/changelog.xml
Author: markt Date: Thu Apr 13 12:35:07 2017 New Revision: 1791243 URL: http://svn.apache.org/viewvc?rev=1791243&view=rev Log: Tag 8.5.14 Added: tomcat/tc8.5.x/tags/TOMCAT_8_5_14/ (props changed) - copied from r1791239, tomcat/tc8.5.x/trunk/ Modified: tomcat/tc8.5.x/tags/TOMCAT_8_5_14/build.properties.default tomcat/tc8.5.x/tags/TOMCAT_8_5_14/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_14/ -- bugtraq:append = false Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_14/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_14/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Apr 13 12:35:07 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_14/ -- bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_14/ -- bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_14/ -- --- svn:ignore (added) +++ svn:ignore Thu Apr 13 12:35:07 2017 @@ -0,0 +1,8 @@ +.* +build.properties +logs +nbproject +output +work +*.iml +temp Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_14/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Apr 13 12:35:07 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,1
svn commit: r1791242 - /tomcat/tc8.5.x/tags/TOMCAT_8_0_14/
Author: markt Date: Thu Apr 13 12:34:56 2017 New Revision: 1791242 URL: http://svn.apache.org/viewvc?rev=1791242&view=rev Log: Incorrect tag name Removed: tomcat/tc8.5.x/tags/TOMCAT_8_0_14/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1791241 - in /tomcat/tc8.5.x/tags/TOMCAT_8_0_14: ./ build.properties.default webapps/docs/changelog.xml
Author: markt Date: Thu Apr 13 12:33:23 2017 New Revision: 1791241 URL: http://svn.apache.org/viewvc?rev=1791241&view=rev Log: Tag 8.5.14 Added: tomcat/tc8.5.x/tags/TOMCAT_8_0_14/ (props changed) - copied from r1791239, tomcat/tc8.5.x/trunk/ Modified: tomcat/tc8.5.x/tags/TOMCAT_8_0_14/build.properties.default tomcat/tc8.5.x/tags/TOMCAT_8_0_14/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_0_14/ -- bugtraq:append = false Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_0_14/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_0_14/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Apr 13 12:33:23 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_0_14/ -- bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_0_14/ -- bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_0_14/ -- --- svn:ignore (added) +++ svn:ignore Thu Apr 13 12:33:23 2017 @@ -0,0 +1,8 @@ +.* +build.properties +logs +nbproject +output +work +*.iml +temp Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_0_14/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Apr 13 12:33:23 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,1
svn commit: r1791240 - in /tomcat/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
Author: markt Date: Thu Apr 13 12:32:15 2017 New Revision: 1791240 URL: http://svn.apache.org/viewvc?rev=1791240&view=rev Log: Increment version for next development cycle Modified: tomcat/trunk/build.properties.default tomcat/trunk/res/maven/mvn.properties.default tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1791240&r1=1791239&r2=1791240&view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Thu Apr 13 12:32:15 2017 @@ -27,7 +27,7 @@ version.major=9 version.minor=0 version.build=0 version.patch=0 -version.suffix=.M20-dev +version.suffix=.M21-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=1791240&r1=1791239&r2=1791240&view=diff == --- tomcat/trunk/res/maven/mvn.properties.default (original) +++ tomcat/trunk/res/maven/mvn.properties.default Thu Apr 13 12:32:15 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.M20 +maven.asf.release.deploy.version=9.0.0.M21 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1791240&r1=1791239&r2=1791240&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Apr 13 12:32:15 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
Re: Host header validation
On 10/04/17 07:42, Katya Todorova wrote: > On Wed, Apr 5, 2017 at 3:57 PM, Mark Thomas wrote: > >> On 05/04/2017 07:50, Katya Todorova wrote: >> >>> Applied. Many thanks. If you'd like to work on this further then can I suggest you take a look at Konstantin's comments: http://markmail.org/message/vp5voob7elspflax >>> >>> >>> I looked at the comments and it seems there are things to be clarified >>> before going in this direction: >>> - should we introduce a flag for turn on/off validation and in which cases >>> >> >> Currently, the validation isn't used at the point where the header is >> parsed. >> >> I'd prefer not to add an option to disable this check. It just seems like >> the wrong thing to do. >> >> I'm currently thinking that we could add the validation and log failures >> (rather than return a 400 response) warning that a future release will >> start rejecting the requests. That should prompt users to contact us with >> any false positives. > > > I think logging failure instead of returning 400 at that point is a good > approach. How much time do you think would be enough to simply log before > enforcing these checks? (asking out of curiosity) Also, would it be > possible to have this functionality in tomcat 7/8? Probably 3 to 6 months. A lot will depend on the volume of the false positive reports we get and whether or not this identifies any broken clients that are sending invalid host headers. My guess is that back-porting to 8.5.x is likely whereas back-porting to 7.0.x might happen depending on what we see with 9.0.x and 8.5.x. >> - zone id support in IPv6 addresses >>> >> >> - IPvFuture support (for this one Konstantin has already proposed to be >>> postponed for a while) >>> >> >> Looking at the spec, I think we can parse IPvFuture now. We should >> probably log any IPvFuture values with a request to report the use case to >> us so we can update the parser to handle specific instances rather tan the >> general case. >> >> If you think this is the right time to work on the first two, let me know >>> and I can prepare a patch. >>> >> >> I think that would be great. BUT. That isn't my decision to make. One of >> the key principles of the Apache Way is that contributors choose what they >> want to work on. There isn't a project leader or a management team >> assigning tasks. If you want to work on this then absolutely, go ahead. If >> there is some other aspect you'd rather be working on then by all means >> work on that. >> >> The Tomcat community is always willing to provide some pointers to >> suitable tasks where people new to Tomcat can get started but that >> shouldn't be see as assigning areas to work on. > > > Thank you for clarifying the process. I decided to look at these things > because they are related to what I've already done and would, in a way, > complete the effort around host parsing. I was asking about IPvFuture in > particular because it seems the specification will evolve and host parsing > code would need to be adapted accordingly, probably incrementally. While > the rest of the host definition seems pretty stable and in use. > That said, I'm not interested in particular in IPvFuture implementation - I > thought it would help me getting to know Tomcat better - if there's > anything else that is more important/urgent and is suitable for someone new > to Tomcat, please share some pointers. I don't see this as task assignment > but more as providing the context/priority information that I currently > lack. Great. I just wanted to make sure you - and any other potential contributors - didn't get the wrong impression. Kind regards, Mark > > Kind regards, > Katya > > Other possibilities are: >>> - performance improvements for the Host header validation - improving code coverage generally for any of the HTTP parsing code - any that attracts your interest >>> >>> >>> I'm looking at the code coverage and will take a look at host validation >>> performance. >>> >> >> Fantastic. (With the caveat of you'd rather do something else then that >> would be fantastic too.) >> >> >> Kind regards, >> >> Mark >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> >> > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1791220 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Author: violetagg Date: Thu Apr 13 07:43:38 2017 New Revision: 1791220 URL: http://svn.apache.org/viewvc?rev=1791220&view=rev Log: Fixes having an issue number are sorted by their number, ascending. Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1791220&r1=1791219&r2=1791220&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Apr 13 07:43:38 2017 @@ -48,6 +48,11 @@ +59825: Log a message that lists the components in the +processing chain that do not support async processing when a call to +ServletRequest.startAsync() fails. (markt) + + 60926: Ensure o.a.c.core.ApplicationContextFacade#setSessionTimeout will invoke the correct method when running Tomcat with security manager. @@ -67,11 +72,6 @@ running HTTP connector where TLS is not enabled. (markt) -59825: Log a message that lists the components in the -processing chain that do not support async processing when a call to -ServletRequest.startAsync() fails. (markt) - - 60940: Improve the handling of the META-INF/ and META-INF/MANIFEST.MF entries for Jar files located in /WEB-INF/lib when running a web application from a packed - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
