Author: markt
Date: Tue Mar 1 22:07:02 2016
New Revision: 1733166
URL: http://svn.apache.org/viewvc?rev=1733166&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59001
Correctly handle the case when Tomcat is installed on a path where one of the
segments ends in an exclamation mark, a caret or an asterisk.
Added:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UriUtil.java
- copied, changed from r1733041,
tomcat/trunk/java/org/apache/tomcat/util/buf/UriUtil.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestUriUtil.java
- copied, changed from r1733093,
tomcat/trunk/test/org/apache/tomcat/util/buf/TestUriUtil.java
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/UriUtil.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 1 22:07:02 2016
@@ -1 +1 @@
-/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,1655558,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,1666637,1666649,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,1687551,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1692894,1692896,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701123,1701213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,1702246,1702250,1702268,1702313,1702531,1702630-1702635,1702637-1702638,1702640,1702647,1702660,1702662,1702665-1702666,1702668,1702671-1702673,1702675-1702676,1702680,1702722,1702778,1702795,1702862,1702881,1702886,1702910,1702923,170
2971,1702984,1703024,1703040,1703044,1703049-1703050,1703143,1703146,1703151,1703160,1703164,1703167,1703174,1703192,1703287,1703290,1703358,1703408,1703486,1703509,1703523,1703542,1703545,1703554,1703584,1703673,1703676,1703678,1703680,1703763,1703784,1703821,1703842,1703849,1703851,1703853,1703856,1703860,1703865,1703890,1703948,1704149,1704151,1704251,1704278,1704289,1704302,1704305,1704307,1704318,1704331,1704647,1704658,1704689,1704702,1704706,1704711,1704730-1704733,1704735,1704739,1704741-1704742,1704744,1704786,1704867,1705231,1705630,1705635,1705639,1705647,1705650-1705652,1705842,1705848,1705865-1705866,1705942,1706017,1706744-1706745,1706853,1706915,1707052,1707088,1708500-1708501,1708504-1708505,1708570,1708649,1708687,1708745,1708957,1709120,1709266,1709295,1709375,1709663,1709895,1709960,1710070,1710134,1710341,1710346,1710441,1710445,1710489,1710517,1710523,1710571,1710577,1710632,1710676,1710689,1710753-1710754,1710779,1710924,1710930,1710933,1710945,1711006,1711016,
1711022,1711026,1712163,1712225,1712228,1712233,1712250,1712254,1712489,1712547-1712548,1712588,1712617,1712645,1712654,1712695,1712765-1712766,1712771,1712775,1712859,1712876,1712898,1712902,1712905,1712912,1712974,1713129,1713168,1713184,1713285,1713362,1713397,1713446,1713612,1713618,1713871,1713931,1713975,1713987,1713992,1713997,1714002,1714012,1714019,1714054,1714521,1714535,1714537,1715168,1715188,1715206,1715413,1715415,1715510-1715512,1715514-1715515,1715517-1715519,1715521,1715633,1715661,1715682,1715965,1716213-1716214,1716258,1716269,1716347,1716354,1716364,1716413,1716420,1716511,1716543,1716640,1716644,1716856,1716858,1716881-1716882,1716886,1716894,1717085,1717225,1717233,1717252,1717264,1717282,1717286,1717290,1717385,1717416,1717418,1717445,1717515,1717520,1717528,1717965,1717967-1717968,1717979,1718022,1718308,1718523,1718794,1718796,1718834,1718836-1718838,1719278,1719291,1719315,1719332,1719334,1719340,1719346,1719441,1719446,1719488,1719909-1719910,1720200,17202
34,1720394,1720439,1720445,1720448,1720462,1720506,1720652,1720654-1720655,1720711,1720752,1720769,1720776,1720804,1720815,1721303,1721307,1721311,1721314,1721447,1721528,1721539,1721812,1721817,1721830,1721860,1721866,1721881,1721887,1722205,1722292,1722399,1722453,1722455,1722522,1722526,1722532,1722548,1722574,1722583,1722585,1722799,1722807,1722824,1722828-1722829,1722831,1722859,1722902,1722905,1722923,1722939,1722945,1722996,1723068,1723127,1723155,1723250,1723316-1723318,1723368,1723371,1723375,1723377,1723380,1723410,1723414,1723437,1723484,1723486,1723493-1723494,1723500,1723552,1723554,1723683,1723707,1723736,1724012,1724252,1724325,1724427-1724428,1724433,1724673,1724788,1724863,1724900,1724997,1725113,1725126-1725127,1725150,1725165,1725183,1725199,1725202,1725204,1725207,1725263-1725264,1725266,1725278,1725282,1725405,1725599,1725601,1725635,1725646,1725649-1725652,1725694,1725696-1725697,1725816,1725851,1725906-1725907,1725910,1725914,1725920,1725926,1726177,1726202,17
26628,1726632,1726637,1726639,1726648,1726651,1726654,1726669,1726676,1726803,1726925-1726926,1726972-1726973,1726991,1727162,1727670,1727675,1727899,1727914,1727917,1728091,1728138,1728433,1728448,1729185,1729361,1729625,1729730,1730101-1730102,1730137,1730612,1730946,1730952,1730975,1731008,1731055,1731079,1731283,1731856,1731882,1731946,1731953,1731958,1731976,1731982-1731983,1732359,1732488,1732900,1733019
+/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,1655558,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,1666637,1666649,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,1687551,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1692894,1692896,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701123,1701213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,1702246,1702250,1702268,1702313,1702531,1702630-1702635,1702637-1702638,1702640,1702647,1702660,1702662,1702665-1702666,1702668,1702671-1702673,1702675-1702676,1702680,1702722,1702778,1702795,1702862,1702881,1702886,1702910,1702923,170
2971,1702984,1703024,1703040,1703044,1703049-1703050,1703143,1703146,1703151,1703160,1703164,1703167,1703174,1703192,1703287,1703290,1703358,1703408,1703486,1703509,1703523,1703542,1703545,1703554,1703584,1703673,1703676,1703678,1703680,1703763,1703784,1703821,1703842,1703849,1703851,1703853,1703856,1703860,1703865,1703890,1703948,1704149,1704151,1704251,1704278,1704289,1704302,1704305,1704307,1704318,1704331,1704647,1704658,1704689,1704702,1704706,1704711,1704730-1704733,1704735,1704739,1704741-1704742,1704744,1704786,1704867,1705231,1705630,1705635,1705639,1705647,1705650-1705652,1705842,1705848,1705865-1705866,1705942,1706017,1706744-1706745,1706853,1706915,1707052,1707088,1708500-1708501,1708504-1708505,1708570,1708649,1708687,1708745,1708957,1709120,1709266,1709295,1709375,1709663,1709895,1709960,1710070,1710134,1710341,1710346,1710441,1710445,1710489,1710517,1710523,1710571,1710577,1710632,1710676,1710689,1710753-1710754,1710779,1710924,1710930,1710933,1710945,1711006,1711016,
1711022,1711026,1712163,1712225,1712228,1712233,1712250,1712254,1712489,1712547-1712548,1712588,1712617,1712645,1712654,1712695,1712765-1712766,1712771,1712775,1712859,1712876,1712898,1712902,1712905,1712912,1712974,1713129,1713168,1713184,1713285,1713362,1713397,1713446,1713612,1713618,1713871,1713931,1713975,1713987,1713992,1713997,1714002,1714012,1714019,1714054,1714521,1714535,1714537,1715168,1715188,1715206,1715413,1715415,1715510-1715512,1715514-1715515,1715517-1715519,1715521,1715633,1715661,1715682,1715965,1716213-1716214,1716258,1716269,1716347,1716354,1716364,1716413,1716420,1716511,1716543,1716640,1716644,1716856,1716858,1716881-1716882,1716886,1716894,1717085,1717225,1717233,1717252,1717264,1717282,1717286,1717290,1717385,1717416,1717418,1717445,1717515,1717520,1717528,1717965,1717967-1717968,1717979,1718022,1718308,1718523,1718794,1718796,1718834,1718836-1718838,1719278,1719291,1719315,1719332,1719334,1719340,1719346,1719441,1719446,1719488,1719909-1719910,1720200,17202
34,1720394,1720439,1720445,1720448,1720462,1720506,1720652,1720654-1720655,1720711,1720752,1720769,1720776,1720804,1720815,1721303,1721307,1721311,1721314,1721447,1721528,1721539,1721812,1721817,1721830,1721860,1721866,1721881,1721887,1722205,1722292,1722399,1722453,1722455,1722522,1722526,1722532,1722548,1722574,1722583,1722585,1722799,1722807,1722824,1722828-1722829,1722831,1722859,1722902,1722905,1722923,1722939,1722945,1722996,1723068,1723127,1723155,1723250,1723316-1723318,1723368,1723371,1723375,1723377,1723380,1723410,1723414,1723437,1723484,1723486,1723493-1723494,1723500,1723552,1723554,1723683,1723707,1723736,1724012,1724252,1724325,1724427-1724428,1724433,1724673,1724788,1724863,1724900,1724997,1725113,1725126-1725127,1725150,1725165,1725183,1725199,1725202,1725204,1725207,1725263-1725264,1725266,1725278,1725282,1725405,1725599,1725601,1725635,1725646,1725649-1725652,1725694,1725696-1725697,1725816,1725851,1725906-1725907,1725910,1725914,1725920,1725926,1726177,1726202,17
26628,1726632,1726637,1726639,1726648,1726651,1726654,1726669,1726676,1726803,1726925-1726926,1726972-1726973,1726991,1727162,1727670,1727675,1727899,1727914,1727917,1728091,1728138,1728433,1728448,1729185,1729361,1729625,1729730,1730101-1730102,1730137,1730612,1730946,1730952,1730975,1731008,1731055,1731079,1731283,1731856,1731882,1731946,1731953,1731958,1731976,1731982-1731983,1732359,1732488,1732900,1733019,1733041,1733044,1733077,1733080,1733093,1733154
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java?rev=1733166&r1=1733165&r2=1733166&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java Tue
Mar 1 22:07:02 2016
@@ -49,13 +49,13 @@ import org.apache.catalina.Wrapper;
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.SessionConfig;
-import org.apache.catalina.util.UriUtil;
import org.apache.coyote.ActionCode;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.UEncoder;
import org.apache.tomcat.util.buf.UEncoder.SafeCharsSet;
+import org.apache.tomcat.util.buf.UriUtil;
import org.apache.tomcat.util.http.FastHttpDateFormat;
import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.http.parser.MediaTypeCache;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1733166&r1=1733165&r2=1733166&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Tue Mar 1 22:07:02 2016
@@ -150,7 +150,6 @@ public final class SecurityClassLoad {
final String basePackage = "org.apache.catalina.util.";
loader.loadClass(basePackage + "ParameterMap");
loader.loadClass(basePackage + "RequestUtil");
- loader.loadClass(basePackage + "UriUtil");
}
@@ -269,6 +268,7 @@ public final class SecurityClassLoad {
loader.loadClass(basePackage + "util.buf.StringCache");
loader.loadClass(basePackage + "util.buf.StringCache$ByteEntry");
loader.loadClass(basePackage + "util.buf.StringCache$CharEntry");
+ loader.loadClass(basePackage + "util.buf.UriUtil");
// http
loader.loadClass(basePackage + "util.http.HttpMessages");
// Make sure system property is read at this point
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java?rev=1733166&r1=1733165&r2=1733166&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
Tue Mar 1 22:07:02 2016
@@ -18,6 +18,7 @@ package org.apache.catalina.startup;
import java.io.File;
import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.security.AccessController;
@@ -159,7 +160,7 @@ public final class ClassLoaderFactory {
if (repositories != null) {
for (Repository repository : repositories) {
if (repository.getType() == RepositoryType.URL) {
- URL url = new URL(repository.getLocation());
+ URL url = buildClassLoaderUrl(repository.getLocation());
if (log.isDebugEnabled())
log.debug(" Including URL " + url);
set.add(url);
@@ -169,7 +170,7 @@ public final class ClassLoaderFactory {
if (!validateFile(directory, RepositoryType.DIR)) {
continue;
}
- URL url = directory.toURI().toURL();
+ URL url = buildClassLoaderUrl(directory);
if (log.isDebugEnabled())
log.debug(" Including directory " + url);
set.add(url);
@@ -179,7 +180,7 @@ public final class ClassLoaderFactory {
if (!validateFile(file, RepositoryType.JAR)) {
continue;
}
- URL url = file.toURI().toURL();
+ URL url = buildClassLoaderUrl(file);
if (log.isDebugEnabled())
log.debug(" Including jar file " + url);
set.add(url);
@@ -208,7 +209,7 @@ public final class ClassLoaderFactory {
if (log.isDebugEnabled())
log.debug(" Including glob jar file "
+ file.getAbsolutePath());
- URL url = file.toURI().toURL();
+ URL url = buildClassLoaderUrl(file);
set.add(url);
}
}
@@ -272,6 +273,30 @@ public final class ClassLoaderFactory {
return true;
}
+
+ /*
+ * These two methods would ideally be in the utility class
+ * org.apache.tomcat.util.buf.UriUtil but that class is not visible until
+ * after the class loaders have been constructed.
+ */
+ private static URL buildClassLoaderUrl(String urlString) throws
MalformedURLException {
+ // URLs passed to class loaders may point to directories that contain
+ // JARs. If these URLs are used to construct URLs for resources in a
JAR
+ // the URL will be used as is. It is therefore necessary to ensure that
+ // the sequence "!/" is not present in a class loader URL.
+ String result = urlString.replaceAll("!/", "%21/");
+ return new URL(result);
+ }
+
+
+ private static URL buildClassLoaderUrl(File file) throws
MalformedURLException {
+ // Could be a directory or a file
+ String fileUrlString = file.toURI().toString();
+ fileUrlString = fileUrlString.replaceAll("!/", "%21/");
+ return new URL(fileUrlString);
+ }
+
+
public static enum RepositoryType {
DIR,
GLOB,
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1733166&r1=1733165&r2=1733166&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Tue Mar 1 22:07:02 2016
@@ -78,6 +78,7 @@ import org.apache.tomcat.util.bcel.class
import org.apache.tomcat.util.bcel.classfile.ElementValue;
import org.apache.tomcat.util.bcel.classfile.ElementValuePair;
import org.apache.tomcat.util.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.buf.UriUtil;
import org.apache.tomcat.util.descriptor.XmlErrorHandler;
import org.apache.tomcat.util.descriptor.web.ContextEjb;
import org.apache.tomcat.util.descriptor.web.ContextEnvironment;
@@ -613,8 +614,8 @@ public class ContextConfig implements Li
boolean docBaseInAppBase = docBase.startsWith(appBase.getPath() +
File.separatorChar);
if (docBase.toLowerCase(Locale.ENGLISH).endsWith(".war") &&
!file.isDirectory()) {
+ URL war = UriUtil.buildJarUrl(new File(docBase));
if (unpackWARs) {
- URL war = new URL("jar:" + (new File(docBase)).toURI().toURL()
+ "!/");
docBase = ExpandWar.expand(host, war, pathName);
file = new File(docBase);
docBase = file.getCanonicalPath();
@@ -622,8 +623,6 @@ public class ContextConfig implements Li
((StandardContext)
context).setOriginalDocBase(origDocBase);
}
} else {
- URL war =
- new URL("jar:" + (new File (docBase)).toURI().toURL()
+ "!/");
ExpandWar.validate(host, war, pathName);
}
} else {
@@ -631,7 +630,7 @@ public class ContextConfig implements Li
File warFile = new File(docBase + ".war");
URL war = null;
if (warFile.exists() && docBaseInAppBase) {
- war = new URL("jar:" + warFile.toURI().toURL() + "!/");
+ war = UriUtil.buildJarUrl(warFile);
}
if (docDir.exists()) {
if (war != null && unpackWARs) {
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1733166&r1=1733165&r2=1733166&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Tue
Mar 1 22:07:02 2016
@@ -22,7 +22,6 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.HashMap;
@@ -59,6 +58,7 @@ import org.apache.catalina.util.ContextN
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.buf.UriUtil;
import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.res.StringManager;
@@ -840,9 +840,8 @@ public class HostConfig
if (context == null) {
context = new FailedContext();
}
- context.setConfigFile(new URL("jar:" +
- war.toURI().toString() + "!/" +
- Constants.ApplicationContextXml));
+ context.setConfigFile(
+ UriUtil.buildJarUrl(war,
Constants.ApplicationContextXml));
}
}
} else if (!deployXML && xmlInWar) {
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1733166&r1=1733165&r2=1733166&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java Tue Mar
1 22:07:02 2016
@@ -61,6 +61,7 @@ import org.apache.catalina.core.Standard
import org.apache.catalina.core.StandardWrapper;
import org.apache.catalina.realm.GenericPrincipal;
import org.apache.catalina.realm.RealmBase;
+import org.apache.tomcat.util.buf.UriUtil;
import org.apache.tomcat.util.descriptor.web.LoginConfig;
// TODO: lazy init for the temp dir - only when a JSP is compiled or
@@ -1172,8 +1173,7 @@ public class Tomcat {
try (JarFile jar = new JarFile(docBase)) {
JarEntry entry = jar.getJarEntry(Constants.ApplicationContextXml);
if (entry != null) {
- result = new URL("jar:" + docBase.toURI().toString() + "!/"
- + Constants.ApplicationContextXml);
+ result = UriUtil.buildJarUrl(docBase,
Constants.ApplicationContextXml);
}
} catch (IOException e) {
Logger.getLogger(getLoggerName(getHost(),
contextName)).log(Level.WARNING,
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/UriUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/UriUtil.java?rev=1733166&r1=1733165&r2=1733166&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/UriUtil.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/UriUtil.java Tue Mar 1
22:07:02 2016
@@ -18,7 +18,10 @@ package org.apache.catalina.util;
/**
* Utility class for working with URIs and URLs.
+ *
+ * @deprecated Use {@link org.apache.tomcat.util.buf.UriUtil}
*/
+@Deprecated
public final class UriUtil {
private UriUtil() {
@@ -27,20 +30,6 @@ public final class UriUtil {
/**
- * Determine if the character is allowed in the scheme of a URI.
- * See RFC 2396, Section 3.1
- *
- * @param c The character to test
- *
- * @return {@code true} if a the character is allowed, otherwise {code
- * @false}
- */
- private static boolean isSchemeChar(char c) {
- return Character.isLetterOrDigit(c) || c == '+' || c == '-' || c ==
'.';
- }
-
-
- /**
* Determine if a URI string has a <code>scheme</code> component.
*
* @param uri The URI to test
@@ -48,15 +37,6 @@ public final class UriUtil {
* @return {@code true} if a scheme is present, otherwise {code @false}
*/
public static boolean hasScheme(CharSequence uri) {
- int len = uri.length();
- for(int i=0; i < len ; i++) {
- char c = uri.charAt(i);
- if(c == ':') {
- return i > 0;
- } else if(!UriUtil.isSchemeChar(c)) {
- return false;
- }
- }
- return false;
+ return org.apache.tomcat.util.buf.UriUtil.hasScheme(uri);
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1733166&r1=1733165&r2=1733166&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
Tue Mar 1 22:07:02 2016
@@ -45,10 +45,10 @@ import org.apache.catalina.connector.Con
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.URLEncoder;
-import org.apache.catalina.util.UriUtil;
import org.apache.catalina.valves.ValveBase;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.buf.UriUtil;
import org.apache.tomcat.util.http.RequestUtil;
public class RewriteValve extends ValveBase {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResourceSet.java?rev=1733166&r1=1733165&r2=1733166&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
Tue Mar 1 22:07:02 2016
@@ -28,6 +28,7 @@ import java.util.jar.Manifest;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.WebResource;
import org.apache.catalina.WebResourceRoot;
+import org.apache.tomcat.util.buf.UriUtil;
/**
* Represents a {@link org.apache.catalina.WebResourceSet} based on a JAR file.
@@ -139,7 +140,7 @@ public class JarResourceSet extends Abst
}
try {
- setBaseUrl((new File(getBase())).toURI().toURL());
+ setBaseUrl(UriUtil.buildJarSafeUrl(new File(getBase())));
} catch (MalformedURLException e) {
throw new IllegalArgumentException(e);
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java?rev=1733166&r1=1733165&r2=1733166&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
Tue Mar 1 22:07:02 2016
@@ -29,6 +29,7 @@ import java.util.jar.Manifest;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.WebResource;
import org.apache.catalina.WebResourceRoot;
+import org.apache.tomcat.util.buf.UriUtil;
/**
* Represents a {@link org.apache.catalina.WebResourceSet} based on a JAR file
@@ -162,7 +163,7 @@ public class JarWarResourceSet extends A
}
try {
- setBaseUrl((new File(getBase())).toURI().toURL());
+ setBaseUrl(UriUtil.buildJarSafeUrl(new File(getBase())));
} catch (MalformedURLException e) {
throw new IllegalArgumentException(e);
}
Copied: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UriUtil.java (from
r1733041, tomcat/trunk/java/org/apache/tomcat/util/buf/UriUtil.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UriUtil.java?p2=tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UriUtil.java&p1=tomcat/trunk/java/org/apache/tomcat/util/buf/UriUtil.java&r1=1733041&r2=1733166&rev=1733166&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UriUtil.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UriUtil.java Tue Mar
1 22:07:02 2016
@@ -16,11 +16,20 @@
*/
package org.apache.tomcat.util.buf;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.regex.Pattern;
+
/**
* Utility class for working with URIs and URLs.
*/
public final class UriUtil {
+ private static Pattern PATTERN_EXCLAMATION_MARK = Pattern.compile("!/");
+ private static Pattern PATTERN_CARET = Pattern.compile("\\^/");
+ private static Pattern PATTERN_ASTERISK = Pattern.compile("\\*/");
+
private UriUtil() {
// Utility class. Hide default constructor
}
@@ -59,4 +68,64 @@ public final class UriUtil {
}
return false;
}
+
+
+ public static URL buildJarUrl(File jarFile) throws MalformedURLException {
+ return buildJarUrl(jarFile, null);
+ }
+
+
+ public static URL buildJarUrl(File jarFile, String entryPath) throws
MalformedURLException {
+ return buildJarUrl(jarFile.toURI().toString(), entryPath);
+ }
+
+
+ public static URL buildJarUrl(String fileUrlString) throws
MalformedURLException {
+ return buildJarUrl(fileUrlString, null);
+ }
+
+
+ public static URL buildJarUrl(String fileUrlString, String entryPath)
throws MalformedURLException {
+ String safeString = makeSafeForJarUrl(fileUrlString);
+ StringBuilder sb = new StringBuilder();
+ sb.append("jar:");
+ sb.append(safeString);
+ sb.append("!/");
+ if (entryPath != null) {
+ sb.append(makeSafeForJarUrl(entryPath));
+ }
+ return new URL(sb.toString());
+ }
+
+
+ public static URL buildJarSafeUrl(File file) throws MalformedURLException {
+ String safe = makeSafeForJarUrl(file.toURI().toString());
+ return new URL(safe);
+ }
+
+
+ /*
+ * When testing on markt's desktop each iteration was taking ~1420ns when
+ * using String.replaceAll().
+ *
+ * Switching the implementation to use pre-compiled patterns and
+ * Pattern.matcher(input).replaceAll(replacement) reduced this by ~10%.
+ *
+ * Note: Given the very small absolute time of a single iteration, even for
+ * a web application with 1000 JARs this is only going to add ~3ms.
+ * It is therefore unlikely that further optimisation will be
+ * necessary.
+ */
+ /*
+ * Pulled out into a separate method in case we need to handle other
unusual
+ * sequences in the future.
+ */
+ private static String makeSafeForJarUrl(String input) {
+ // Since "!/" has a special meaning in a JAR URL, make sure that the
+ // sequence is properly escaped if present.
+ String tmp =
PATTERN_EXCLAMATION_MARK.matcher(input).replaceAll("%21/");
+ // Tomcat's custom jar:war: URL handling treats */ and ^/ as special
+ tmp = PATTERN_CARET.matcher(tmp).replaceAll("%5e/");
+ return PATTERN_ASTERISK.matcher(tmp).replaceAll("%2a/");
+ }
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java?rev=1733166&r1=1733165&r2=1733166&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java Tue Mar 1
22:07:02 2016
@@ -44,7 +44,7 @@ import java.util.Locale;
* @author Craig R. McClanahan
*
* @deprecated Will be removed in Tomcat 9.0.x. Use {@link java.net.URI} or
- * {@link org.apache.catalina.util.UriUtil}.
+ * {@link org.apache.tomcat.util.buf.UriUtil}.
*/
@Deprecated
public final class URL implements Serializable {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?rev=1733166&r1=1733165&r2=1733166&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
Tue Mar 1 22:07:02 2016
@@ -36,6 +36,7 @@ import org.apache.tomcat.JarScanType;
import org.apache.tomcat.JarScanner;
import org.apache.tomcat.JarScannerCallback;
import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.buf.UriUtil;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -308,7 +309,7 @@ public class StandardJarScanner implemen
String urlStr = url.toString();
if (urlStr.startsWith("file:") || urlStr.startsWith("http:") ||
urlStr.startsWith("https:")) {
if (urlStr.endsWith(Constants.JAR_EXT)) {
- URL jarURL = new URL("jar:" + urlStr + "!/");
+ URL jarURL = UriUtil.buildJarUrl(urlStr);
callback.scan((JarURLConnection) jarURL.openConnection(),
webappPath, isWebapp);
} else {
@@ -317,7 +318,7 @@ public class StandardJarScanner implemen
f = new File(url.toURI());
if (f.isFile() && isScanAllFiles()) {
// Treat this file as a JAR
- URL jarURL = new URL("jar:" + urlStr + "!/");
+ URL jarURL = UriUtil.buildJarUrl(f);
callback.scan(
(JarURLConnection) jarURL.openConnection(),
webappPath, isWebapp);
Copied: tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestUriUtil.java
(from r1733093, tomcat/trunk/test/org/apache/tomcat/util/buf/TestUriUtil.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestUriUtil.java?p2=tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestUriUtil.java&p1=tomcat/trunk/test/org/apache/tomcat/util/buf/TestUriUtil.java&r1=1733093&r2=1733166&rev=1733166&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/buf/TestUriUtil.java (original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestUriUtil.java Tue
Mar 1 22:07:02 2016
@@ -18,6 +18,7 @@ package org.apache.tomcat.util.buf;
import java.io.File;
import java.net.MalformedURLException;
+import java.net.URL;
import org.junit.Assert;
import org.junit.Test;
@@ -58,4 +59,29 @@ public class TestUriUtil {
index = result.indexOf("^/");
Assert.assertEquals(result, -1, index);
}
+
+
+ // @Test /* Uncomment to test performance for different implementations. */
+ public void performanceTestBuildJarUrl() throws MalformedURLException {
+ File jarFile = new File("/patha/pathb^/pathc");
+
+ URL url = null;
+
+ int count = 1000000;
+
+ // Warm up
+ for (int i = 0; i < count / 10; i++) {
+ url = UriUtil.buildJarUrl(jarFile);
+ }
+
+ // Test
+ long start = System.nanoTime();
+ for (int i = 0; i < count / 10; i++) {
+ url = UriUtil.buildJarUrl(jarFile);
+ }
+ long duration = System.nanoTime() - start;
+
+ System.out.println("[" + count + "] iterations took [" +
+ duration + "] ns for [" + url + "]");
+ }
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1733166&r1=1733165&r2=1733166&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Mar 1 22:07:02 2016
@@ -98,6 +98,14 @@
removed in Tomcat 9. (markt)
</fix>
<fix>
+ <bug>59001</bug>: Correctly handle the case when Tomcat is installed on
+ a path where one of the segments ends in an exclamation mark. (markt)
+ </fix>
+ <fix>
+ Expand the fix for <bug>59001</bug> to cover the special sequences used
+ in Tomcat's custom jar:war: URLs. (markt)
+ </fix>
+ <fix>
<bug>59043</bug>: Avoid warning while expiring sessions associated with
a single sign on if <code>HttpServletRequest.logout()</code> is used.
(markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
