svn commit: r1830050 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http11/Http11Processor.java java/org/apache/coyote/http11/LocalStrings.properties

[markt]

Author: markt
Date: Wed Apr 25 08:11:26 2018
New Revision: 1830050

URL: http://svn.apache.org/viewvc?rev=1830050&view=rev
Log:
Better i18n in request target processing

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

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

svn commit: r1830051 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java

[markt]

Author: markt
Date: Wed Apr 25 08:24:31 2018
New Revision: 1830051

URL: http://svn.apache.org/viewvc?rev=1830051&view=rev
Log:
Optimise
Patch provided by Sebastian Staudt

Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1830051&r1=1830050&r2=1830051&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Wed Apr 25 
08:24:31 2018
@@ -1656,13 +1656,14 @@ public class HostConfig implements Lifec
  * now unused (have no active sessions) and undeploy any that are found.
  */
 public synchronized void checkUndeploy() {
+if (deployed.size() < 2) {
+return;
+}
+
 // Need ordered set of names
 SortedSet sortedAppNames = new TreeSet<>();
 sortedAppNames.addAll(deployed.keySet());
 
-if (sortedAppNames.size() < 2) {
-return;
-}
 Iterator iter = sortedAppNames.iterator();
 
 ContextName previous = new ContextName(iter.next(), false);



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

svn commit: r1830053 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/HostConfig.java

[markt]

Author: markt
Date: Wed Apr 25 08:25:11 2018
New Revision: 1830053

URL: http://svn.apache.org/viewvc?rev=1830053&view=rev
Log:
Optimise
Patch provided by Sebastian Staudt

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 25 08:25:11 2018
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207,1822186,1823164,1823497,1824960,1826872-1826873,1827862,1829310,1829777,1829796,1829935
-/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,

svn commit: r1830052 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/startup/HostConfig.java

[markt]

Author: markt
Date: Wed Apr 25 08:24:50 2018
New Revision: 1830052

URL: http://svn.apache.org/viewvc?rev=1830052&view=rev
Log:
Optimise
Patch provided by Sebastian Staudt

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

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

svn commit: r1830054 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/HostConfig.java

[markt]

Author: markt
Date: Wed Apr 25 08:25:49 2018
New Revision: 1830054

URL: http://svn.apache.org/viewvc?rev=1830054&view=rev
Log:
Optimise
Patch provided by Sebastian Staudt

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 25 08:25:49 2018
@@ -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,1644525,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,1702
 
739,1702742,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,1
 
725974,1726171-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,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1821365,1822235,1823165,1823341,1823490,1823493,1823498,1824299,1824313,1825715,1825874,1826367,1826379,1826690,1826830,1826874-1826

[GitHub] tomcat issue #108: Improve undeployment in parallel deployment scenario

[markt-asf]

Github user markt-asf commented on the issue:

https://github.com/apache/tomcat/pull/108
  
I have applied the optimisation commit (thanks) but not the ordering 
changes.

The patch changes the order for undeploy without changing the order for 
version mapping. This will lead to unexpected behaviour.

The current simple `String` based ordering was selected as a trade off 
between performance and usability. The type of ordering proposed in this patch 
was considered too expensive to incur on every request when multiple versions 
are deployed. To consider such a change, we'd need to see evidence of the 
performance impact (including GC) on the mapping process of switching to this 
ordering mechanism. Be aware that mapping code is highly optimised for `String`.

Reviewing the proposed patch I see several things that would need to be 
fixed in additional to the more architectural issue described above:
 - imports from sun.* are not allowed
 - the code is Java 8 specific - any fix needs to be available to 
back-ported to 7.0.x will has to run on Java 6
 - the patch does not compile
 - `Pattern` instances should be pre-compiled

Finally, the patch only considers purely numeric versions. Many projects 
include a test string (e.g. RELEASE) in the version number. It would be nice to 
handle these as well.


---

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

svn commit: r1830068 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/tomcat/util/buf/ java/org/apache/tomcat/util/http/parser/ test/org/apache/catalina/core/

[markt]

Author: markt
Date: Wed Apr 25 12:03:32 2018
New Revision: 1830068

URL: http://svn.apache.org/viewvc?rev=1830068&view=rev
Log:
First step in addressing https://bz.apache.org/bugzilla/show_bug.cgi?id=62273
This commit actually tightens up the parsing by validating each part of the 
request target individually. Subsequent commits will introduce options to 
separately relax the parsing of the path segments and the query string.

Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java?rev=1830068&r1=1830067&r2=1830068&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java Wed Apr 
25 12:03:32 2018
@@ -456,7 +456,13 @@ public class Http11InputBuffer implement
 end = pos;
 } else if (chr == Constants.QUESTION && parsingRequestLineQPos 
== -1) {
 parsingRequestLineQPos = pos;
+} else if (parsingRequestLineQPos != -1 && 
!HttpParser.isQuery(chr)) {
+// %nn decoding will be checked at the point of decoding
+throw new 
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
 } else if (HttpParser.isNotRequestTarget(chr)) {
+// This is a general check that aims to catch problems 
early
+// Detailed checking of each part of the request target 
will
+// happen in Http11Processor#prepareRequest()
 throw new 
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
 }
 }

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1830068&r1=1830067&r2=1830068&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Wed Apr 25 
12:03:32 2018
@@ -51,6 +51,7 @@ import org.apache.tomcat.util.buf.ByteCh
 import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
 import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.http.parser.HttpParser;
 import org.apache.tomcat.util.log.UserDataHelper;
 import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
 import org.apache.tomcat.util.net.SSLSupport;
@@ -652,32 +653,63 @@ public class Http11Processor extends Abs
 }
 }
 
-// Check for a full URI (including protocol://host:port/)
+// Check for an absolute-URI less the query string which has already
+// been removed during the parsing of the request line
 ByteChunk uriBC = request.requestURI().getByteChunk();
+byte[] uriB = uriBC.getBytes();
 if (uriBC.startsWithIgnoreCase("http", 0)) {
-
-int pos = uriBC.indexOf("://", 0, 3, 4);
-int uriBCStart = uriBC.getStart();
-int slashPos = -1;
-if (pos != -1) {
+int pos = 4;
+// Check for https
+if (uriBC.startsWithIgnoreCase("s", pos)) {
+pos++;
+}
+// Next 3 characters must be "://"
+if (uriBC.startsWith("://", pos)) {
 pos += 3;
-byte[] uriB = uriBC.getBytes();
-slashPos = uriBC.indexOf('/', pos);
+int uriBCStart = uriBC.getStart();
+
+// '/' does not appear in the authority so use the first
+// instance to split the authority and the path segments
+int slashPos = uriBC.indexOf('/', pos);
+// '@' in the authority delimits the userinfo
 int atPos = uriBC.indexOf('@', pos);
+if (slashPos > -1 && atPos > slashPos) {
+// First '@' is in the path segments so no userinfo
+atPos = -1;
+}
+
 if (slashPos == -1) {
 slashPos = uriBC.getLength();
-// Set URI as "/"
-request.requestURI().setBytes
-(uriB, uriBCStart + pos - 2, 1);
+  

[GitHub] tomcat issue #108: Improve undeployment in parallel deployment scenario

[ChristopherSchultz]

Github user ChristopherSchultz commented on the issue:

https://github.com/apache/tomcat/pull/108
  
The performance of this strategy can be significantly improved by 
converting the "version number" into a value that can more easily be compared 
against other values. This can be done in several ways, some building on others 
(i.e. smaller changes) and some with significant changes.

The most obvious performance optimization is to cache the compiled regex 
`Pattern` objects: you will be doing a lot of tokenizing on `/\./`, so compile 
it once and use it many times.

The second most obvious performance optimization is to stop using regular 
expressions entirely. When searching for a single character, it's much faster 
to write your own tokenizer because regular expressions inherently have more 
overhead (because they are so flexible). The code is not as straightforward 
(and I'm happy to see that you provided an easy-to-follow patch, here) but in 
this case, speed is in fact important as Mark notes: this code will be executed 
for every request whose URL might match the context.

The third most obvious performance improvement would be to store the 
tokenized version number as an array and, in `compareTo` simply compare the 
individual elements of the arrays in each object. Then you don't have to 
tokenize during each compare.

Finally, instead of re-computing the "version" difference every time, a 
representative value could be built for the version number that can be quickly 
compared against another value. For example, let's take the versions `1.0.9` 
and `1.0.10` for example. One strategy would be to normalize each part of the 
version number to have some kind of "maximum number of digits." Let's pick 
4-digits and see how to do this:

1. Tokenize `1.0.9` into [1, 0, 9]
2. Convert to string with 4-digits for each version component: 
`00010009`
3. Tokenize `1.0.10` into [1, 0, 10]
4. Convert to string with 4-digits for each version component: 
`00010010`
5. Compare the strings alphabetically (`String.compareTo`)

Now, simply more steps 1-2 into the constructor of the `ContextName` class 
and then `ContextName.compareTo` becomes a simple comparison of the normalized 
version number.

One can also do this with integral values instead of `Strings` and the 
comparison becomes even faster, but you run the risk of running out of digits 
if the padding is too wide (e.g. 4-digit padding with a version number like 
`1.0.9.1` yields `1000200030001` which is `>` `Integer.MAX_VALUE` so you'd have 
to switch to a `long` value. Comparing `long` values is faster than comparing 
`String` values, but at some point you run out of digits in a `long` value as 
well.

Anyway, there is lots of room for improvement, here, and I think it *does* 
make sense to support "traditional" version numbering. Note that this will 
represent a backward-*in*compatible change, and those relying upon the current 
alphabetical-ordering will need to adjust their expectations.


---

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

Improvements to Cipher.java

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

I have a few proposals for o.a.t.u.net.openssl.ciphers.Ciphers.java:

1. Remove the isExport method. It is unused anywhere, and practically
already covered by other information about the ciphers (e.g.
"strength", the "EXPORT" alias, etc.).

2. Replace bare-boolean values in (calls to) Cipher constructor with
named constants e.g. FIPS_COMPATIBLE (true) and FIPS_INCOMPATIBLE
(false) for improved readability of the code. This should have zero
impact on the compiled .class file.

Side note: do we even need the "FIPS-compatible flag"? We don't use it
anywhere. When running in FIPS-mode, those crypto promitives that are
unsupported will simply be ignored by the crypto engine.

3. Remove "alg bits". It's not used anywhere and doesn't seem useful.
(Unless there was a future plan for it.)

Any objections?

Thanks,
- -chris
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlrghPgACgkQHPApP6U8
pFi7Dg/9Hc1JrjuObgXdkwBPr5TNfSNTxCtJaNTyUqKLz97zdFMZ4R6qTNXXjLqL
+HaTagRQI5v6ieCdlSu5bFzaymzhixoMThzQgNhRv51GiJLxDk00DHpLamrMH2tc
TQR5P+3CF/OHnhJg14QCiunap8wJm0wKYkuo41oDbFWe+b/AEYZeZW8XzxFWyGlc
pAoiZf7T6ISqo6A7A+YZ/RvOqOt8oH3MbpArrbGYFsvNPzUCl2iHfl/vasEXVtTv
vxx090r3dn/cMB76Ed/vPKeKv9UeOeB3Z4NodyEDuJX5WLyyrHEa8HDq9AED7mD+
oMqERA12bstCz98MWpgjXe2Lk/NchzBylJfSb1ZWL9bi+svyXk0VKnxtrKQyDOC6
NVFQFbAIA+9uBKUJXMUFx/Rneo3Y9C0kVLAHH5CzO9vSgnCHllFI0FyvRoOh3JN0
GtFozjdfxUkwRWd6gjE7/3vXfGrmBIgPo79wA3mpUWGk/LKtnQMmbhPKV7NI46B8
FvZjzlVIHp0pVVSwbLDCbPRuZ2yZCPV6hii1wVB/WTbce9WNv530Sar2y36glEcU
+SqBR3gR5z0LMlBYzXI3iXvlMAcLdVpQUeviFt2QSzEZqTspjwZ2AC1O5Iyi4tX+
E/JUm22DXR/MxVW23bIVsdrHa4tXf4/mVejFkyaURsnAXExwm40=
=AWBy
-END PGP SIGNATURE-

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

Re: Improvements to Cipher.java

[Mark Thomas]

On 25/04/18 14:39, Christopher Schultz wrote:



> Any objections?

+1 to all the above.

Note a lot of that is public API changes so we should really deprecate
in 9.0.x and remove in 10.x.

Mark

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

Re: Improvements to Cipher.java

[Christopher Schultz]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 4/25/18 10:08 AM, Mark Thomas wrote:
> On 25/04/18 14:39, Christopher Schultz wrote:
> 
> 
> 
>> Any objections?
> 
> +1 to all the above.
> 
> Note a lot of that is public API changes so we should really
> deprecate in 9.0.x and remove in 10.x.

ACK.

I don't see this class in 8.5.x, so I see no reason to consider
back-porting.

- -chris
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlrgkLIACgkQHPApP6U8
pFgsfw//fC5XKaXpcvL/Em1DI0lqF/VEgqt1lH/6e9yjgJEcCLWQS4NqqcSlwoKb
X+ch+WzAqI1UHtP34obQvMWECzkIoFhnCCL7RL+1CJqL5Nt4gx9awrEbkrfDViom
Ic60PM0UihRC6IWx9lUHtFLBsIdCirD9se9YJEBSrl1k4aYczICZa09bxTR+FRqZ
ePJLArjsovot+pksLeKkCuXUhpj/StQGVafcKgScPKudbmFvUo90CA7fB4geWUCb
4D2xlhDOfs76pZ1entrgaSiZ/HxoE+lluftChBP0QJwE2Uq7sZJUwxbX4YlWETzH
YHmOHCahFkbitCONmuDiE984rdZEUIT1iGaa371k23C6NvfpqWXVDQ2ln7kAy1rQ
meeQoRS+CKOrYQzvtTh9GQKL9xcJM/46ojt2SiCEOtITx/NoMicHa1UzKD/V9pMh
nvsLVvcbVQ6kYwi8pTAcSUvoSUU+Px6jJ/vE9ZezuPOi18HgvG22NBzRuxuSKCMT
y8QiDDPXLFAr75WZnlBHyUEaigo/3NMUdJ92nHT+hVHwEMqHry53Je0I6FsTrQ9g
yRxyYPn3p+xgx/mN670SYNKBr/tnBG2OFkd5Qw3BCWD/CRWVfktW8+dJqm8UCYIv
upIuSWRQuojFWeWC2oTpwYEP1xdCDQ++Ok4ZTDeCtx+8pdYt7KE=
=7GgR
-END PGP SIGNATURE-

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

svn commit: r1830087 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/tomcat/util/http/parser/ webapps/docs/ webapps/docs/config/

[markt]

Author: markt
Date: Wed Apr 25 15:31:48 2018
New Revision: 1830087

URL: http://svn.apache.org/viewvc?rev=1830087&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62273
Implement configuration options to work-around specification non-compliant user 
agents (including all the major browsers) that do not correctly %nn encode URI 
paths and query strings as required by RFC 7230 and RFC 3986.

Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/http.xml

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1830087&r1=1830086&r2=1830087&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Wed 
Apr 25 15:31:48 2018
@@ -95,6 +95,24 @@ public abstract class AbstractHttp11Prot
 //  HTTP specific 
properties
 // -- managed in the 
ProtocolHandler
 
+private String relaxedPathChars = null;
+public String getRelaxedPathChars() {
+return relaxedPathChars;
+}
+public void setRelaxedPathChars(String relaxedPathChars) {
+this.relaxedPathChars = relaxedPathChars;
+}
+
+
+private String relaxedQueryChars = null;
+public String getRelaxedQueryChars() {
+return relaxedQueryChars;
+}
+public void setRelaxedQueryChars(String relaxedQueryChars) {
+this.relaxedQueryChars = relaxedQueryChars;
+}
+
+
 private boolean allowHostHeaderMismatch = false;
 /**
  * Will Tomcat accept an HTTP 1.1 request where the host header does not

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java?rev=1830087&r1=1830086&r2=1830087&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java Wed Apr 
25 15:31:48 2018
@@ -133,6 +133,7 @@ public class Http11InputBuffer implement
 private int parsingRequestLineQPos = -1;
 private HeaderParsePosition headerParsePos;
 private final HeaderParseData headerData = new HeaderParseData();
+private final HttpParser httpParser;
 
 /**
  * Maximum allowed size of the HTTP request line plus headers plus any
@@ -149,13 +150,14 @@ public class Http11InputBuffer implement
 // --- Constructors
 
 public Http11InputBuffer(Request request, int headerBufferSize,
-boolean rejectIllegalHeaderName) {
+boolean rejectIllegalHeaderName, HttpParser httpParser) {
 
 this.request = request;
 headers = request.getMimeHeaders();
 
 this.headerBufferSize = headerBufferSize;
 this.rejectIllegalHeaderName = rejectIllegalHeaderName;
+this.httpParser = httpParser;
 
 filterLibrary = new InputFilter[0];
 activeFilters = new InputFilter[0];
@@ -456,10 +458,10 @@ public class Http11InputBuffer implement
 end = pos;
 } else if (chr == Constants.QUESTION && parsingRequestLineQPos 
== -1) {
 parsingRequestLineQPos = pos;
-} else if (parsingRequestLineQPos != -1 && 
!HttpParser.isQuery(chr)) {
+} else if (parsingRequestLineQPos != -1 && 
!httpParser.isQueryRelaxed(chr)) {
 // %nn decoding will be checked at the point of decoding
 throw new 
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
-} else if (HttpParser.isNotRequestTarget(chr)) {
+} else if (httpParser.isNotRequestTargetRelaxed(chr)) {
 // This is a general check that aims to catch problems 
early
 // Detailed checking of each part of the request target 
will
 // happen in Http11Processor#prepareRequest()

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1830087&r1=1830086&r2=1830087&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11P

Re: svn commit: r1830087 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/tomcat/util/http/parser/ webapps/docs/ webapps/docs/config/

[Mark Thomas]

On 25/04/18 16:31, ma...@apache.org wrote:
> Author: markt
> Date: Wed Apr 25 15:31:48 2018
> New Revision: 1830087
> 
> URL: http://svn.apache.org/viewvc?rev=1830087&view=rev
> Log:
> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62273
> Implement configuration options to work-around specification non-compliant 
> user agents (including all the major browsers) that do not correctly %nn 
> encode URI paths and query strings as required by RFC 7230 and RFC 3986.

Hi all,

I'd like to back-port this to 8.5.x and some elements of the improved
parsing to 8.0.x and 7.0.x (mainly the scheme and userinfo
improvements). Before I do that, I wanted to get feedback on this
implementation.

Thoughts?

Mark

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

[GitHub] tomcat issue #108: Improve undeployment in parallel deployment scenario

[koraktor]

Github user koraktor commented on the issue:

https://github.com/apache/tomcat/pull/108
  
@markt-asf @ChristopherSchultz 

Thanks for your feedback so far and for the partial merge. To be honest I 
didn’t think about any performance implications or side effects because I 
didn’t notice that this could be used in other places, especially during each 
request.

I’m sorry for the broken second patch and pushed an updated version which 
fixes the unused imports in `HostConfig` and broken syntax in `ContextName`.

I’ll have another look at the regex precompilation and Java 7 
compatibility later. After that I want to look at improving performance and 
backwards-compatibility. Maybe someone can point me at the right code locations 
where this might be important?


---

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

Tomcat 9 Support Java Version clarification

[Coty Sutherland]

Hi all,

There was a problem discovered on Ubuntu where they're building Tomcat
9 with Java 9, but users are using it with Java 8. That is causing
issues because of changes made in Java 9. One of the Ubuntu folks is
poking around with a patch and has some details about the issue here
https://pastebin.com/EnVh7K8v. We will probably open a bugzilla to see
if anyone is open to addressing them in tomcat, but while thinking
about the problem I noted that our supported java versions table on
http://tomcat.apache.org/whichversion.html doesn't explicitly say that
by 'supported' we mean the tomcat binary we provide will run on that
java version. I don't think that we claim that you can build with any
version and run on any version anywhere, right? Is anyone opposed to
adding a statement to that effect on the page?



Thanks,
Coty

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

Re: Tomcat 9 Support Java Version clarification

[Mark Thomas]

On 25/04/18 18:07, Coty Sutherland wrote:
> Hi all,
> 
> There was a problem discovered on Ubuntu where they're building Tomcat
> 9 with Java 9, but users are using it with Java 8. That is causing
> issues because of changes made in Java 9. One of the Ubuntu folks is
> poking around with a patch and has some details about the issue here
> https://pastebin.com/EnVh7K8v. We will probably open a bugzilla to see
> if anyone is open to addressing them in tomcat,

I'm not in favour of that patch.

> but while thinking
> about the problem I noted that our supported java versions table on
> http://tomcat.apache.org/whichversion.html doesn't explicitly say that
> by 'supported' we mean the tomcat binary we provide will run on that
> java version. I don't think that we claim that you can build with any
> version and run on any version anywhere, right?

Correct.

BUILDING.txt states that Tomcat 9 should be built with Java 8.

> Is anyone opposed to
> adding a statement to that effect on the page?

I think something along those lines would be fine. Something to the
effect of if you build from source with a higher version of Java than
the minimum then it might not work on Java versions below the version
you build with. But worded more clearly.

Mark

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

[GitHub] tomcat issue #108: Improve undeployment in parallel deployment scenario

[markt-asf]

Github user markt-asf commented on the issue:

https://github.com/apache/tomcat/pull/108
  
I think there is a lot of merit in Chris's idea. The concept of some sort 
of internal pre-computed version string that addresses ordering concerns by 
zero padding numerical components is one that would be easy to implement and 
have minimal impact on the existing system.


---

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

Re: Tomcat 9 Support Java Version clarification

[Coty Sutherland]

On Wed, Apr 25, 2018 at 2:14 PM, Mark Thomas  wrote:
> On 25/04/18 18:07, Coty Sutherland wrote:
>> Hi all,
>>
>> There was a problem discovered on Ubuntu where they're building Tomcat
>> 9 with Java 9, but users are using it with Java 8. That is causing
>> issues because of changes made in Java 9. One of the Ubuntu folks is
>> poking around with a patch and has some details about the issue here
>> https://pastebin.com/EnVh7K8v. We will probably open a bugzilla to see
>> if anyone is open to addressing them in tomcat,
>
> I'm not in favour of that patch.

Given the amount of changes I'm not either, I mentioned it because I
told the person working on it I would just in case someone was
interested. I think the responsibility of maintaining those sorts of
problems should fall on that on the distro's maintainer. Fedora is
fine for me (I build with Java 8), but apparently Ubuntu is building
with Java 10 and will switch to 11 at some point, which is causing the
problem.

>
>> but while thinking
>> about the problem I noted that our supported java versions table on
>> http://tomcat.apache.org/whichversion.html doesn't explicitly say that
>> by 'supported' we mean the tomcat binary we provide will run on that
>> java version. I don't think that we claim that you can build with any
>> version and run on any version anywhere, right?
>
> Correct.

Thanks for confirming.

> BUILDING.txt states that Tomcat 9 should be built with Java 8.
>
>> Is anyone opposed to
>> adding a statement to that effect on the page?
>
> I think something along those lines would be fine. Something to the
> effect of if you build from source with a higher version of Java than
> the minimum then it might not work on Java versions below the version
> you build with. But worded more clearly.

OK, I'll look at adding some verbiage around that.

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

[GitHub] tomcat issue #108: Improve undeployment in parallel deployment scenario

[koraktor]

Github user koraktor commented on the issue:

https://github.com/apache/tomcat/pull/108
  
I added another bunch of patches. One of them implementing a different 
approach to a cached version representation based on @ChristopherSchultz’s 
suggestion. Instead of creating zero-padded strings I had the idea of using the 
version components as UTF-16 code points and building a string from those.

I did not yet test all edge cases. So this might not be fail-safe.
I’m still using regular expressions as the overhead of implementing a 
tokenizer seemed a bit much given the one-time nature of the new approach.

I did not include code for non-numeric version components (especially 
suffixes, e.g. `1.2.3-SNAPSHOT` or `1.2.3.pre5`.


---

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

[Bug 62287] ValueExpressionImpl#equals is wrong

[bugzilla]

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

--- Comment #7 from Mark Struberg  ---
Thanks for the feedback and applying. Have been sick over the weekend, so sorry
for the delay.

> I would actually prefer to drop the hashCode because:

Yes, you are both right. I first intended to ship a minimal impact patch. 
But of course hashCode() will likely again be called in Node#equals(). That
would make it being called twice - which makes no sense.

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