svn commit: r1784712 - in /tomcat/trunk/test/org/apache/tomcat/util/net: localhost-cert.pem localhost-key.pem

[markt]

Author: markt
Date: Tue Feb 28 10:15:39 2017
New Revision: 1784712

URL: http://svn.apache.org/viewvc?rev=1784712&view=rev
Log:
Update expired certs and test keys

Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem
tomcat/trunk/test/org/apache/tomcat/util/net/localhost-key.pem

Modified: tomcat/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem?rev=1784712&r1=1784711&r2=1784712&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem Tue Feb 28 
10:15:39 2017
@@ -1,79 +1,79 @@
 Certificate:
 Data:
 Version: 3 (0x2)
-Serial Number: 4102 (0x1006)
-Signature Algorithm: sha1WithRSAEncryption
+Serial Number: 4109 (0x100d)
+Signature Algorithm: sha256WithRSAEncryption
 Issuer: C=US, CN=ca-test.tomcat.apache.org
 Validity
-Not Before: Feb 28 16:57:14 2015 GMT
-Not After : Feb 27 16:57:14 2017 GMT
+Not Before: Feb 27 23:25:29 2017 GMT
+Not After : Feb 27 23:25:29 2019 GMT
 Subject: C=US, CN=localhost
 Subject Public Key Info:
 Public Key Algorithm: rsaEncryption
 Public-Key: (2048 bit)
 Modulus:
-00:e7:6f:79:3f:18:87:91:dd:27:98:34:24:79:58:
-47:f9:c2:69:2b:d8:5b:c0:e0:bb:4a:57:d6:00:b5:
-bb:6a:b0:66:84:5c:b8:f0:12:0a:27:27:32:9c:82:
-2a:2f:0f:69:77:a6:e9:0d:df:64:31:51:c0:41:1e:
-dc:d4:74:51:9c:a3:b8:51:13:58:73:ee:21:9c:f9:
-63:82:1b:c2:2c:49:c3:09:70:ff:a9:f3:af:a2:0c:
-0b:60:2f:6a:db:a5:01:45:3e:34:90:8e:67:69:eb:
-45:f3:34:29:85:db:39:8a:99:c2:0f:72:15:21:fd:
-54:35:a6:7b:a7:30:cb:1e:4d:3d:32:24:c6:4b:84:
-4f:5f:60:ff:64:5e:68:ca:d8:fa:de:98:7d:40:04:
-60:b7:ae:50:ec:c8:8c:ae:dd:94:81:41:18:5b:03:
-63:0f:2b:02:63:0a:95:6a:ed:7e:68:e6:b6:d5:56:
-e9:4e:60:ea:1d:95:58:33:be:a2:12:55:cb:7f:9c:
-c4:97:0b:db:c0:94:09:2a:b3:9f:e1:6b:78:0d:63:
-1a:41:d5:6b:db:d8:48:59:04:88:d1:11:d5:e7:45:
-28:0e:7c:1b:78:75:20:7d:ff:7f:e1:d6:ea:e4:c5:
-51:77:41:42:30:4b:ff:29:33:3d:89:58:94:69:5b:
-70:27
+00:ba:d6:b2:32:de:10:53:1f:5d:af:da:d4:3f:64:
+b3:22:37:fd:4e:16:a3:f0:d6:9e:6e:d3:ee:47:ec:
+15:b4:b3:0d:80:bf:fc:21:96:8b:1d:40:16:6d:89:
+35:03:8a:45:8c:c6:6e:2b:66:67:0f:1c:19:cf:62:
+d5:e6:08:48:a8:df:10:da:4c:47:79:7c:02:97:54:
+f9:a8:e9:59:50:33:cd:a0:72:fd:e1:e7:5e:3a:43:
+5c:ff:0c:69:9e:f6:c2:86:71:07:a5:eb:b5:c7:61:
+f9:e9:fe:3f:26:55:2c:f4:04:7c:c0:bd:cd:2b:88:
+9c:69:4d:ce:3c:1e:ad:2e:18:96:aa:a0:eb:72:2b:
+95:99:47:16:90:b5:59:ed:f1:78:cc:8b:01:33:40:
+c4:e9:b0:3f:ec:89:04:13:5c:9b:22:01:cc:25:cf:
+40:c1:40:fa:04:a0:b9:b7:f7:d8:73:91:7f:b8:7e:
+e9:82:20:1f:e9:9c:89:25:28:b5:fa:6f:b7:4a:88:
+28:68:59:d5:30:52:f9:e4:5b:a6:b4:f8:e4:ed:2f:
+03:d8:50:61:9a:53:86:1f:ad:aa:0d:5f:f8:52:b5:
+27:dd:05:82:25:13:a0:d0:10:3c:dd:c0:70:15:24:
+63:89:22:0e:f0:5a:9a:fa:b0:75:56:06:aa:7f:b0:
+f7:9b
 Exponent: 65537 (0x10001)
 X509v3 extensions:
-X509v3 Basic Constraints:
+X509v3 Basic Constraints: 
 CA:FALSE
-Netscape Comment:
+Netscape Comment: 
 OpenSSL Generated Certificate
-X509v3 Subject Key Identifier:
-30:DB:AB:70:94:34:CA:FD:75:46:AB:CE:E2:4A:A9:9E:74:BC:69:BB
-X509v3 Authority Key Identifier:
+X509v3 Subject Key Identifier: 
+0B:37:2F:D6:48:9C:11:2F:28:AE:DC:47:E6:5E:3A:1D:24:12:0F:1A
+X509v3 Authority Key Identifier: 
 
keyid:B0:3B:BC:C9:FA:28:5F:3E:04:1F:9B:6C:C7:8B:68:D8:01:B0:F8:3D
 
-Signature Algorithm: sha1WithRSAEncryption
- ac:e9:89:a0:fd:83:a7:aa:39:0b:08:f2:89:bc:64:e4:fa:3f:
- 7d:7a:5e:6d:79:98:34:31:19:ec:fb:e3:07:2b:ff:ab:2f:58:
- 7f:49:33:ca:d1:bb:36:9c:bd:3d:e2:3b:39:e9:a9:c2:b7:9e:
- 58:7d:5c:f4:9f:02:80:0b:e2:e2:d8:b8:3a:c0:76:c7:3b:33:
- 29:2a:61:02:ac:e0:23:aa:3e:a7:0d:0a:e9:8b:2d:4d:2a:ed:
- 59:0c:05:2d:40:86:ed:63:ad:fd:3c:a0:5e:4e:77:a6:f5:fe:
- 16:19:e5:bf:66:2f:c0:a3:21:25:65:

svn commit: r1784713 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/tomcat/util/net/localhost-cert.pem test/org/apache/tomcat/util/net/localhost-key.pem

[markt]

Author: markt
Date: Tue Feb 28 10:16:49 2017
New Revision: 1784713

URL: http://svn.apache.org/viewvc?rev=1784713&view=rev
Log:
Update expired certs and test keys

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-key.pem

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

svn commit: r1784714 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/tomcat/util/net/localhost-cert.pem test/org/apache/tomcat/util/net/localhost-key.pem

[markt]

Author: markt
Date: Tue Feb 28 10:17:49 2017
New Revision: 1784714

URL: http://svn.apache.org/viewvc?rev=1784714&view=rev
Log:
Update expired certs and test keys

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/localhost-key.pem

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

svn commit: r1784717 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/tomcat/util/net/localhost-cert.pem test/org/apache/tomcat/util/net/localhost-key.pem

[markt]

Author: markt
Date: Tue Feb 28 10:21:21 2017
New Revision: 1784717

URL: http://svn.apache.org/viewvc?rev=1784717&view=rev
Log:
Update expired certs and test keys

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/localhost-cert.pem
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/localhost-key.pem

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

buildbot failure in on tomcat-8-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

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

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

svn commit: r1784723 - in /tomcat/trunk: java/org/apache/catalina/core/ApplicationMapping.java test/org/apache/catalina/core/TestApplicationMapping.java

[markt]

Author: markt
Date: Tue Feb 28 11:16:51 2017
New Revision: 1784723

URL: http://svn.apache.org/viewvc?rev=1784723&view=rev
Log:
Servlet 4 EG discussion concluded that leading '/' should not be present in 
match values.

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
tomcat/trunk/test/org/apache/catalina/core/TestApplicationMapping.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java?rev=1784723&r1=1784722&r2=1784723&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java Tue Feb 
28 11:16:51 2017
@@ -44,20 +44,20 @@ public class ApplicationMapping {
 mapping = new MappingImpl("", "", mappingData.matchType, 
servletName);
 break;
 case DEFAULT:
-mapping = new MappingImpl("/", "/", mappingData.matchType, 
servletName);
+mapping = new MappingImpl("", "/", mappingData.matchType, 
servletName);
 break;
 case EXACT:
-mapping = new 
MappingImpl(mappingData.wrapperPath.toString(),
+mapping = new 
MappingImpl(mappingData.wrapperPath.toString().substring(1),
 mappingData.wrapperPath.toString(), 
mappingData.matchType, servletName);
 break;
 case EXTENSION:
 String path = mappingData.wrapperPath.toString();
 int extIndex = path.lastIndexOf('.');
-mapping = new MappingImpl(path.substring(0, extIndex),
+mapping = new MappingImpl(path.substring(1, extIndex),
 "*" + path.substring(extIndex), 
mappingData.matchType, servletName);
 break;
 case PATH:
-mapping = new MappingImpl(mappingData.pathInfo.toString(),
+mapping = new 
MappingImpl(mappingData.pathInfo.toString().substring(1),
 mappingData.wrapperPath.toString() + "/*",
 mappingData.matchType, servletName);
 break;

Modified: tomcat/trunk/test/org/apache/catalina/core/TestApplicationMapping.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestApplicationMapping.java?rev=1784723&r1=1784722&r2=1784723&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestApplicationMapping.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestApplicationMapping.java Tue 
Feb 28 11:16:51 2017
@@ -45,22 +45,22 @@ public class TestApplicationMapping exte
 
 @Test
 public void testContextNonRootMappingDefault() throws Exception {
-doTestMapping("/dummy", "/", "/foo", "/", "DEFAULT");
+doTestMapping("/dummy", "/", "/foo", "", "DEFAULT");
 }
 
 @Test
 public void testContextNonRootMappingExtension() throws Exception {
-doTestMapping("/dummy", "*.test", "/foo/bar.test", "/foo/bar", 
"EXTENSION");
+doTestMapping("/dummy", "*.test", "/foo/bar.test", "foo/bar", 
"EXTENSION");
 }
 
 @Test
 public void testContextNonRootMappingExact() throws Exception {
-doTestMapping("/dummy", "/foo/bar", "/foo/bar", "/foo/bar", "EXACT");
+doTestMapping("/dummy", "/foo/bar", "/foo/bar", "foo/bar", "EXACT");
 }
 
 @Test
 public void testContextNonRootMappingPath() throws Exception {
-doTestMapping("/dummy", "/foo/bar/*", "/foo/bar/foo2", "/foo2", 
"PATH");
+doTestMapping("/dummy", "/foo/bar/*", "/foo/bar/foo2", "foo2", "PATH");
 }
 
 @Test
@@ -70,22 +70,22 @@ public class TestApplicationMapping exte
 
 @Test
 public void testContextRootMappingDefault() throws Exception {
-doTestMapping("", "/", "/foo", "/", "DEFAULT");
+doTestMapping("", "/", "/foo", "", "DEFAULT");
 }
 
 @Test
 public void testContextRootMappingExtension() throws Exception {
-doTestMapping("", "*.test", "/foo/bar.test", "/foo/bar", "EXTENSION");
+doTestMapping("", "*.test", "/foo/bar.test", "foo/bar", "EXTENSION");
 }
 
 @Test
 public void testContextRootMappingExact() throws Exception {
-doTestMapping("", "/foo/bar", "/foo/bar", "/foo/bar", "EXACT");
+doTestMapping("", "/foo/bar", "/foo/bar", "foo/bar", "EXACT");
 }
 
 @Test
 public void testContextRootMappingPath() throws Exception {
-doTestMapping("", "/foo/bar/*", "/foo/bar/foo2", "/foo2", "PATH");
+doTestMapping("", "/foo/bar/*", "/foo/bar/foo2", "foo2", "PATH");
 }
 
 private void doTestMapping(S

svn commit: r1784724 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/ApplicationMapping.java test/org/apache/catalina/core/TestApplicationMapping.java

[markt]

Author: markt
Date: Tue Feb 28 11:22:12 2017
New Revision: 1784724

URL: http://svn.apache.org/viewvc?rev=1784724&view=rev
Log:
Servlet 4 EG discussion concluded that leading '/' should not be present in 
match values.

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

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

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

[Bug 60784] New: HTTP status line tests ignore trailing space after status code in status line (incomplete RFC test)

[bugzilla]

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

Bug ID: 60784
   Summary: HTTP status line tests ignore trailing space after
status code in status line (incomplete RFC test)
   Product: Tomcat 8
   Version: 8.5.11
  Hardware: All
OS: All
Status: NEW
  Severity: minor
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: 1983-01...@gmx.net
  Target Milestone: 

Created attachment 34783
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=34783&action=edit
Test for trailing space in status line

RFC mandates for status line a mandatory space (U+0020) and optional reason
phrase. Several tests do not check for or even trim the status line.

The attached patch adds the space to the tests.

-- 
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: r1784751 - /tomcat/trunk/build.xml

[markt]

Author: markt
Date: Tue Feb 28 15:27:09 2017
New Revision: 1784751

URL: http://svn.apache.org/viewvc?rev=1784751&view=rev
Log:
Exclude PEm files from checkstyle format checks.

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1784751&r1=1784750&r2=1784751&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Feb 28 15:27:09 2017
@@ -547,6 +547,7 @@
 
 
 
+
 
 
 



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

svn commit: r1784752 - in /tomcat/tc8.5.x/trunk: ./ build.xml

[markt]

Author: markt
Date: Tue Feb 28 15:28:02 2017
New Revision: 1784752

URL: http://svn.apache.org/viewvc?rev=1784752&view=rev
Log:
Exclude PEM files from checkstyle format checks.

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

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

svn commit: r1784755 - in /tomcat/tc7.0.x/trunk: ./ build.xml

[markt]

Author: markt
Date: Tue Feb 28 15:29:09 2017
New Revision: 1784755

URL: http://svn.apache.org/viewvc?rev=1784755&view=rev
Log:
Exclude PEM files from checkstyle format checks.

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

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

svn commit: r1784753 - in /tomcat/tc8.0.x/trunk: ./ build.xml

[markt]

Author: markt
Date: Tue Feb 28 15:28:27 2017
New Revision: 1784753

URL: http://svn.apache.org/viewvc?rev=1784753&view=rev
Log:
Exclude PEM files from checkstyle format checks.

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

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

svn commit: r1784767 - in /tomcat/trunk: java/javax/servlet/ java/org/apache/catalina/core/ java/org/apache/jasper/servlet/ test/org/apache/tomcat/unittest/

[markt]

Author: markt
Date: Tue Feb 28 15:55:44 2017
New Revision: 1784767

URL: http://svn.apache.org/viewvc?rev=1784767&view=rev
Log:
Add the new ServletContext methods to set and get the default session timeout

Modified:
tomcat/trunk/java/javax/servlet/ServletContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
tomcat/trunk/test/org/apache/tomcat/unittest/TesterServletContext.java

Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=1784767&r1=1784766&r2=1784767&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Tue Feb 28 15:55:44 2017
@@ -962,4 +962,39 @@ public interface ServletContext {
  * @since Servlet 3.1
  */
 public String getVirtualServerName();
+
+/**
+ * Get the default session timeout.
+ *
+ * @throws UnsupportedOperationExceptionIf called from a
+ *{@link 
ServletContextListener#contextInitialized(ServletContextEvent)}
+ *method of a {@link ServletContextListener} that was not defined in a
+ *web.xml file, a web-fragment.xml file nor annotated with
+ *{@link javax.servlet.annotation.WebListener}. For example, a
+ *{@link ServletContextListener} defined in a TLD would not be able to
+ *use this method.
+ *
+ * @since Servlet 4.0
+ */
+public int getSessionTimeout();
+
+/**
+ * Set the default session timeout. This method may only be called before
+ * the ServletContext is initialised.
+ *
+ * @param sessionTimeoutMins The new default session timeout in minutes.
+ *
+ * @throws UnsupportedOperationExceptionIf called from a
+ *{@link 
ServletContextListener#contextInitialized(ServletContextEvent)}
+ *method of a {@link ServletContextListener} that was not defined in a
+ *web.xml file, a web-fragment.xml file nor annotated with
+ *{@link javax.servlet.annotation.WebListener}. For example, a
+ *{@link ServletContextListener} defined in a TLD would not be able to
+ *use this method.
+ * @throws IllegalStateException If the ServletContext has already been
+ * initialised
+ *
+ * @since Servlet 4.0
+ */
+public void setSessionTimeout(int sessionTimeout);
 }

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1784767&r1=1784766&r2=1784767&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Tue Feb 
28 15:55:44 2017
@@ -1227,6 +1227,24 @@ public class ApplicationContext implemen
 }
 
 
+@Override
+public int getSessionTimeout() {
+return context.getSessionTimeout();
+}
+
+
+@Override
+public void setSessionTimeout(int sessionTimeout) {
+if (!context.getState().equals(LifecycleState.STARTING_PREP)) {
+throw new IllegalStateException(
+sm.getString("applicationContext.setSessionTimeout.ise",
+getContextPath()));
+}
+
+context.setSessionTimeout(sessionTimeout);
+}
+
+
 //  Package Methods
 protected StandardContext getContext() {
 return this.context;

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java?rev=1784767&r1=1784766&r2=1784767&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java 
Tue Feb 28 15:55:44 2017
@@ -769,6 +769,26 @@ public class ApplicationContextFacade im
 }
 
 
+@Override
+public int getSessionTimeout() {
+if (SecurityUtil.isPackageProtectionEnabled()) {
+return ((Integer) doPrivileged("getSessionTimeout", 
null)).intValue();
+} else  {
+return context.getSessionTimeout();
+}
+}
+
+
+@Override
+public void setSessionTimeout(int sessionTimeout) {
+if (SecurityUtil.isPackageProtectionEnabl

svn commit: r1784768 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/servlet4preview/

[markt]

Author: markt
Date: Tue Feb 28 16:01:52 2017
New Revision: 1784768

URL: http://svn.apache.org/viewvc?rev=1784768&view=rev
Log:
Add the new ServletContext methods to set and get the default session timeout 
to the org.apache.catalina.servlet4preview package

Added:

tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java
Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 16:01:52 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

buildbot failure in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

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

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




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

[Bug 60788] New: Cookies value contains quotes when the Cookie header contains $Version=1 and the header's value is enclosed by quotes

[bugzilla]

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

Bug ID: 60788
   Summary: Cookies value contains quotes when the Cookie header
contains $Version=1 and the header's value is enclosed
by quotes
   Product: Tomcat 8
   Version: 8.5.11
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: mar...@malkusch.de
  Target Milestone: 

Under some rare circumstances it looks like Tomcat-8 is keeping quotes around
Cookie values where it shouldn't. It seems to be associated to the presence of
a $Version=1 token in the request's Cookie header. I noticed this behaviour in
a real world application's log with the following request:

User-Agent: Dalvik/2.1.0 (Linux; U; Android 5.1; A2 Build/LMY47I)
Cookie: $Version="1"; userId="foo";$Path="/";$Domain="www.example.org"

My application would read "foo" (including quotes) were it it actually should
be foo without quotes.

Skimming through RFCs 2109, 2965 and 6265 a value may be enclosed with quotes.
But I'm no expert on this, I just skimmed through the RFCs by looking at the
production rules and searching for the term "quote" to see if there are any
exeptions. For me, this request looks valid and the parsed Cookie value should
not contain quotes.

I created this SSCCE where the tests demonstrate the issue:
https://github.com/spring-projects/spring-boot-issues/pull/63/files
In the tests you can see that it only keeps quotes if the request contains a
$Version=1 token. Without that token, quotes are removed.

As you can see it's a Spring Boot application, but digging through the code, I
couldn't find any Cookie parsing code in Spring. They use the servlet API,
which is effectivly provided by an embedded Tomcat-8.5.11.

-- 
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: r1784787 - /tomcat/trunk/java/javax/servlet/ServletContext.java

[markt]

Author: markt
Date: Tue Feb 28 17:36:42 2017
New Revision: 1784787

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

Modified:
tomcat/trunk/java/javax/servlet/ServletContext.java

Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=1784787&r1=1784786&r2=1784787&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Tue Feb 28 17:36:42 2017
@@ -966,6 +966,8 @@ public interface ServletContext {
 /**
  * Get the default session timeout.
  *
+ * @return The current defauly session timeout in minutes
+ *
  * @throws UnsupportedOperationExceptionIf called from a
  *{@link 
ServletContextListener#contextInitialized(ServletContextEvent)}
  *method of a {@link ServletContextListener} that was not defined in a
@@ -982,7 +984,7 @@ public interface ServletContext {
  * Set the default session timeout. This method may only be called before
  * the ServletContext is initialised.
  *
- * @param sessionTimeoutMins The new default session timeout in minutes.
+ * @param sessionTimeout The new default session timeout in minutes.
  *
  * @throws UnsupportedOperationExceptionIf called from a
  *{@link 
ServletContextListener#contextInitialized(ServletContextEvent)}



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

svn commit: r1784788 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java

[markt]

Author: markt
Date: Tue Feb 28 17:38:11 2017
New Revision: 1784788

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

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java?rev=1784788&r1=1784787&r2=1784788&view=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java
 Tue Feb 28 17:38:11 2017
@@ -32,6 +32,8 @@ public interface ServletContext extends
  *{@link ServletContextListener} defined in a TLD would not be able to
  *use this method.
  *
+ * @return The current default session timeout in minutes
+ *
  * @since Servlet 4.0
  */
 public int getSessionTimeout();
@@ -40,7 +42,7 @@ public interface ServletContext extends
  * Set the default session timeout. This method may only be called before
  * the ServletContext is initialised.
  *
- * @param sessionTimeoutMins The new default session timeout in minutes.
+ * @param sessionTimeout The new default session timeout in minutes.
  *
  * @throws UnsupportedOperationExceptionIf called from a
  *{@link 
ServletContextListener#contextInitialized(ServletContextEvent)}



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

svn commit: r1784789 - /tomcat/trunk/java/javax/servlet/ServletContext.java

[markt]

Author: markt
Date: Tue Feb 28 17:38:44 2017
New Revision: 1784789

URL: http://svn.apache.org/viewvc?rev=1784789&view=rev
Log:
Typo

Modified:
tomcat/trunk/java/javax/servlet/ServletContext.java

Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=1784789&r1=1784788&r2=1784789&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Tue Feb 28 17:38:44 2017
@@ -966,7 +966,7 @@ public interface ServletContext {
 /**
  * Get the default session timeout.
  *
- * @return The current defauly session timeout in minutes
+ * @return The current default session timeout in minutes
  *
  * @throws UnsupportedOperationExceptionIf called from a
  *{@link 
ServletContextListener#contextInitialized(ServletContextEvent)}



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

buildbot success in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

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

Build succeeded!

Sincerely,
 -The Buildbot




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

[Bug 60781] Access Log Valve does not escape the same as mod_log_config

[bugzilla]

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

--- Comment #1 from Felix Schumacher  ---
Created attachment 34787
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=34787&action=edit
Escape characters like httpd

I am not sure about the correct handling of chars with values out of the ASCII
range. I believe they are double encoded now. 

But quotes and alike should be escaped correctly.

My first thought was to combine this escaping with ExtendedAccessLogValve, but
it seems, that the quotes are explicitly coded as "" instead of \".

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

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

[bugzilla]

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

--- Comment #10 from Christopher Schultz  ---
(In reply to qixiaobo.nj from comment #5)
> Very simple code!
> 
> OutputStream out = outputMessage.getBody();

What type is the "outputMessage" reference? You need to post more code.

The stack traces are confusing to me. Is that a thread dump? A show of a
deadlock situation? What are you trying to show?

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

[Bug 60781] Access Log Valve does not escape the same as mod_log_config

[bugzilla]

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

Felix Schumacher  changed:

   What|Removed |Added

  Attachment #34787|0   |1
is obsolete||

--- Comment #2 from Felix Schumacher  ---
Created attachment 34788
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=34788&action=edit
Escape characters like httpd

Use ISO-8859-1 to decode String into bytes.

-- 
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: r1784803 - in /tomcat/trunk/java: javax/servlet/http/HttpServletRequest.java javax/servlet/http/HttpServletRequestWrapper.java org/apache/catalina/connector/Request.java

[markt]

Author: markt
Date: Tue Feb 28 20:13:31 2017
New Revision: 1784803

URL: http://svn.apache.org/viewvc?rev=1784803&view=rev
Log:
Servlet 4 EG discussion concluded that it was cleaner to remove 
isPushSupported() and simply return null from getPushBuilder()

Modified:
tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java

Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java?rev=1784803&r1=1784802&r2=1784803&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java Tue Feb 28 
20:13:31 2017
@@ -240,25 +240,16 @@ public interface HttpServletRequest exte
 public String getPathTranslated();
 
 /**
- * Does the current request allow push requests. This will return {@code
- * true} only if the underlying protocol supports server push and if pushes
- * are permitted from the current request.
- *
- * @return {@code true} if server push is supported for the current request
- * otherwise {@code false}
- */
-public default boolean isPushSupported() {
-return false;
-}
-
-/**
  * Obtain a builder for generating push requests. {@link PushBuilder}
  * documents how this request will be used as the basis for a push request.
  * Each call to this method will return a new instance, independent of any
  * previous instance obtained.
  *
  * @return A builder that can be used to generate push requests based on
- * this request.
+ * this request or {@code null} if push is not supported. Note that
+ * even if a PushBuilder instance is returned, by the time that
+ * {@link PushBuilder#push()} is called, it may no longer be valid
+ * to push a request and the push request will be ignored.
  *
  * @since Servlet 4.0
  */

Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java?rev=1784803&r1=1784802&r2=1784803&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java 
(original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java Tue Feb 
28 20:13:31 2017
@@ -388,20 +388,6 @@ public class HttpServletRequestWrapper e
  * {@inheritDoc}
  * 
  * The default behavior of this method is to return
- * {@link HttpServletRequest#isPushSupported()} on the wrapped request 
object.
- *
- * @since Servlet 4.0
- */
-@Override
-public boolean isPushSupported() {
-return this._getHttpServletRequest().isPushSupported();
-}
-
-
-/**
- * {@inheritDoc}
- * 
- * The default behavior of this method is to return
  * {@link HttpServletRequest#getPushBuilder()} on the wrapped request 
object.
  *
  * @since Servlet 4.0

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1784803&r1=1784802&r2=1784803&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Feb 28 
20:13:31 2017
@@ -1887,25 +1887,19 @@ public class Request implements HttpServ
  * @since Servlet 4.0
  */
 @Override
-public boolean isPushSupported() {
+public PushBuilder getPushBuilder() {
 AtomicBoolean result = new AtomicBoolean();
 coyoteRequest.action(ActionCode.IS_PUSH_SUPPORTED, result);
-return result.get();
+if (result.get()) {
+return new ApplicationPushBuilder(this);
+} else {
+return null;
+}
 }
 
 
 /**
  * {@inheritDoc}
- *
- * @since Servlet 4.0
- */
-@Override
-public PushBuilder getPushBuilder() {
-return new ApplicationPushBuilder(this);
-}
-
-/**
- * {@inheritDoc}
  *
  * @since Servlet 3.1
  */



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

svn commit: r1784805 - in /tomcat/tc8.5.x/trunk/java/org/apache/catalina: connector/Request.java connector/RequestFacade.java servlet4preview/http/HttpServletRequest.java servlet4preview/http/HttpServ

[markt]

Author: markt
Date: Tue Feb 28 20:24:22 2017
New Revision: 1784805

URL: http://svn.apache.org/viewvc?rev=1784805&view=rev
Log:
Servlet 4 EG discussion concluded that it was cleaner to remove 
isPushSupported() and simply return null from getPushBuilder()

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/RequestFacade.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequest.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequestWrapper.java

Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1784805&r1=1784804&r2=1784805&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java Tue 
Feb 28 20:24:22 2017
@@ -1911,28 +1911,21 @@ public class Request implements org.apac
  * Pulled forward from Servlet 4.0. The method signature may be modified,
  * removed or replaced at any time until Servlet 4.0 becomes final.
  *
- * @return {@code true} If this request supports server push
+ * @return A builder to use to construct the push request
  */
 @Override
-public boolean isPushSupported() {
+public PushBuilder getPushBuilder() {
 AtomicBoolean result = new AtomicBoolean();
 coyoteRequest.action(ActionCode.IS_PUSH_SUPPORTED, result);
-return result.get();
+if (result.get()) {
+return new ApplicationPushBuilder(this);
+} else {
+return null;
+}
 }
 
 
 /**
- * Pulled forward from Servlet 4.0. The method signature may be modified,
- * removed or replaced at any time until Servlet 4.0 becomes final.
- *
- * @return A builder to use to construct the push request
- */
-@Override
-public PushBuilder getPushBuilder() {
-return new ApplicationPushBuilder(this);
-}
-
-/**
  * {@inheritDoc}
  *
  * @since Servlet 3.1

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/RequestFacade.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/RequestFacade.java?rev=1784805&r1=1784804&r2=1784805&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/RequestFacade.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/RequestFacade.java 
Tue Feb 28 20:24:22 2017
@@ -1135,18 +1135,6 @@ public class RequestFacade implements Ht
  * removed or replaced at any time until Servlet 4.0 becomes final.
  */
 @Override
-public boolean isPushSupported() {
-return request.isPushSupported();
-}
-
-
-/**
- * {@inheritDoc}
- * 
- * Pulled forward from Servlet 4.0. The method signature may be modified,
- * removed or replaced at any time until Servlet 4.0 becomes final.
- */
-@Override
 public PushBuilder getPushBuilder() {
 return request.getPushBuilder();
 }

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequest.java?rev=1784805&r1=1784804&r2=1784805&view=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequest.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequest.java
 Tue Feb 28 20:24:22 2017
@@ -24,23 +24,16 @@ public interface HttpServletRequest exte
 public ServletMapping getServletMapping();
 
 /**
- * Does the current request allow push requests. This will return {@code
- * true} only if the underlying protocol supports server push and if pushes
- * are permitted from the current request.
- *
- * @return {@code true} if server push is supported for the current request
- * otherwise {@code false}
- */
-public boolean isPushSupported();
-
-/**
  * Obtain a builder for generating push requests. {@link PushBuilder}
  * documents how this request will be used as the basis for a push request.
  * Each call to this method will return a new instance, independent of any
  * previous instance obtained.
  *
  * @return A builder that can be used to generate push requests based on
- * this request.
+ * this request or {@code null} if push is not supported. Note that
+ * even if a PushBuilder instance is returned,

svn commit: r1784806 - in /tomcat/trunk/java: javax/servlet/http/ org/apache/catalina/core/ org/apache/coyote/ org/apache/coyote/http2/

[markt]

Author: markt
Date: Tue Feb 28 20:34:43 2017
New Revision: 1784806

URL: http://svn.apache.org/viewvc?rev=1784806&view=rev
Log:
Servlet 4 EG made the following changes
- etag -> eTag
- change return of push() from boolean to void

Removed:
tomcat/trunk/java/org/apache/coyote/PushToken.java
Modified:
tomcat/trunk/java/javax/servlet/http/PushBuilder.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java

Modified: tomcat/trunk/java/javax/servlet/http/PushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/PushBuilder.java?rev=1784806&r1=1784805&r2=1784806&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/PushBuilder.java (original)
+++ tomcat/trunk/java/javax/servlet/http/PushBuilder.java Tue Feb 28 20:34:43 
2017
@@ -82,7 +82,7 @@ public interface PushBuilder {
 
 /**
  * Sets if the request will be conditional. If {@code true} the values from
- * {@link #getEtag()} and {@link #getLastModified()} will be used to
+ * {@link #getETag()} and {@link #getLastModified()} will be used to
  * construct appropriate headers.
  *
  * @param conditional Should generated push requests be conditional
@@ -137,15 +137,15 @@ public interface PushBuilder {
 PushBuilder path(String path);
 
 /**
- * Sets the etag to be used for conditional push requests. This will be
+ * Sets the eTag to be used for conditional push requests. This will be
  * set to {@code null} after a call to {@link #push()} so it must be
  * explicitly set for every push request that requires it.
  *
- * @param etag The etag use for the push request
+ * @param eTag The eTag use for the push request
  *
  * @return This builder instance
  */
-PushBuilder etag(String etag);
+PushBuilder eTag(String eTag);
 
 /**
  * Sets the last modified to be used for conditional push requests. This
@@ -168,14 +168,11 @@ public interface PushBuilder {
  * {@code lastModified}
  * 
  *
- * @return {@code true} if the push request was sent to the client,
- * otherwise {@code false}
- *
  * @throws IllegalStateException If this method is called when {@code path}
  * is {@code null}
  * @throws IllegalArgumentException If the request to push requires a body
  */
-boolean push();
+void push();
 
 /**
  * Obtain the name of the HTTP method that will be used for push requests
@@ -236,12 +233,12 @@ public interface PushBuilder {
 String getPath();
 
 /**
- * Obtain the etag that will be used for the push request that will be
+ * Obtain the eTag that will be used for the push request that will be
  * generated by the next call to {@code push()}.
  *
- * @return The etag value that will be associated with the next push 
request
+ * @return The eTag value that will be associated with the next push 
request
  */
-String getEtag();
+String getETag();
 
 /**
  * Obtain the last modified that will be used for the push request that 
will

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java?rev=1784806&r1=1784805&r2=1784806&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java Tue 
Feb 28 20:34:43 2017
@@ -38,7 +38,6 @@ import org.apache.catalina.Context;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.util.SessionConfig;
 import org.apache.coyote.ActionCode;
-import org.apache.coyote.PushToken;
 import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.buf.HexUtils;
 import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
@@ -61,7 +60,7 @@ public class ApplicationPushBuilder impl
 private final List cookies = new ArrayList<>();
 private String method = "GET";
 private String path;
-private String etag;
+private String eTag;
 private String lastModified;
 private String queryString;
 private String sessionId;
@@ -205,15 +204,15 @@ public class ApplicationPushBuilder impl
 
 
 @Override
-public PushBuilder etag(String etag) {
-this.etag = etag;
+public PushBuilder eTag(String eTag) {
+this.eTag = eTag;
 return this;
 }
 
 
 @Override
-public String getEtag() {
-return etag;
+public String getETag() {
+return eTag;
 }
 
 
@@ -323,7 +322,7 @@ public class ApplicationPus

svn commit: r1784807 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/servlet4preview/http/ java/org/apache/coyote/ java/org/apache/coyote/http2/

[markt]

Author: markt
Date: Tue Feb 28 20:39:17 2017
New Revision: 1784807

URL: http://svn.apache.org/viewvc?rev=1784807&view=rev
Log:
Servlet 4 EG made the following changes
- etag -> eTag
- change return of push() from boolean to void

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

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/PushBuilder.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 20:39:17 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,

svn commit: r1784818 - in /tomcat/trunk: java/javax/servlet/ java/org/apache/catalina/core/ java/org/apache/jasper/servlet/ test/org/apache/tomcat/unittest/

[markt]

Author: markt
Date: Tue Feb 28 21:18:04 2017
New Revision: 1784818

URL: http://svn.apache.org/viewvc?rev=1784818&view=rev
Log:
Servlet 4.0
Implement dynamic registration of JSP files as servlets

Modified:
tomcat/trunk/java/javax/servlet/ServletContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
tomcat/trunk/test/org/apache/tomcat/unittest/TesterServletContext.java

Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=1784818&r1=1784817&r2=1784818&view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Tue Feb 28 21:18:04 2017
@@ -613,6 +613,20 @@ public interface ServletContext {
 Class servletClass);
 
 /**
+ *
+ * @param jspName   The servlet name under which this JSP file should be
+ *  registered
+ * @param jspFile   The path, relative to the web application root, for the
+ *  JSP file to be used for this servlet
+ *
+ * @return  a {@link javax.servlet.ServletRegistration.Dynamic} object
+ *  that can be used to further configure the servlet
+ *
+ * @since Servlet 4.0
+ */
+public ServletRegistration.Dynamic addJspFile(String jspName, String 
jspFile);
+
+/**
  * TODO SERVLET3 - Add comments
  * @param  TODO
  * @param c   TODO

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1784818&r1=1784817&r2=1784818&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Tue Feb 
28 21:18:04 2017
@@ -46,6 +46,7 @@ import javax.servlet.ServletContextAttri
 import javax.servlet.ServletContextListener;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRegistration;
+import javax.servlet.ServletRegistration.Dynamic;
 import javax.servlet.ServletRequestAttributeListener;
 import javax.servlet.ServletRequestListener;
 import javax.servlet.SessionCookieConfig;
@@ -829,25 +830,61 @@ public class ApplicationContext implemen
 
 @Override
 public ServletRegistration.Dynamic addServlet(String servletName, String 
className) {
-return addServlet(servletName, className, null);
+return addServlet(servletName, className, null, null);
 }
 
 
 @Override
 public ServletRegistration.Dynamic addServlet(String servletName, Servlet 
servlet) {
-return addServlet(servletName, null, servlet);
+return addServlet(servletName, null, servlet, null);
 }
 
 
 @Override
 public ServletRegistration.Dynamic addServlet(String servletName,
 Class servletClass) {
-return addServlet(servletName, servletClass.getName(), null);
+return addServlet(servletName, servletClass.getName(), null, null);
 }
 
 
-private ServletRegistration.Dynamic addServlet(String servletName,
-String servletClass, Servlet servlet) throws IllegalStateException 
{
+@Override
+public Dynamic addJspFile(String jspName, String jspFile) {
+
+// jspName is validated in addServlet()
+if (jspFile == null || !jspFile.startsWith("/")) {
+throw new IllegalArgumentException(
+sm.getString("applicationContext.addJspFile.iae", 
jspFile));
+}
+
+String jspServletClassName = null;
+Map jspFileInitParams = new HashMap<>();
+
+Wrapper jspServlet = (Wrapper) context.findChild("jsp");
+
+if (jspServlet == null) {
+// No JSP servlet currently defined.
+// Use default JSP Servlet class name
+jspServletClassName = Constants.JSP_SERVLET_CLASS;
+} else {
+// JSP Servlet defined.
+// Use same JSP Servlet class name
+jspServletClassName = jspServlet.getServletClass();
+// Use same init parameters
+String[] params = jspServlet.findInitParameters();
+for (String param : params) {
+jspFileInitParams.put(param, 
jspServlet.findInitParameter(param));
+}
+}
+
+// Add init parameter to specify JSP file
+jspFileInitParams.put("jspFile", jspFile);
+
+return addServlet(jspName, jspServletClassName, null, 
jspF

svn commit: r1784820 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/servlet4preview/

[markt]

Author: markt
Date: Tue Feb 28 21:21:11 2017
New Revision: 1784820

URL: http://svn.apache.org/viewvc?rev=1784820&view=rev
Log:
Servlet 4.0 early preview
Implement dynamic registration of JSP files as servlets

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 21:21:11 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,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,176254