Author: markt
Date: Tue Aug 30 20:08:50 2016
New Revision: 1758456
URL: http://svn.apache.org/viewvc?rev=1758456&view=rev
Log:
Consistently decode URL patterns provided via web.xml using the encoding of the
web.xml file where specified or UTF-8 where no explicit encoding is specified.
Added:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/XmlEncodingBase.java
- copied unchanged from r1758430,
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/XmlEncodingBase.java
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
tomcat/tc8.0.x/trunk/test/javax/servlet/http/TestHttpServlet.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestConnector.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestRequest.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestResponse.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcher.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationFilterConfig.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContextValve.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardHostValve.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/ha/context/TestReplicatedContext.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/realm/TestRealmBase.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/session/TestStandardSessionIntegration.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
tomcat/tc8.0.x/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java
tomcat/tc8.0.x/trunk/test/org/apache/jasper/servlet/TestJspServlet.java
tomcat/tc8.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/unittest/TesterContext.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestJspPropertyGroupDescriptorImpl.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestSecurityConstraint.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestBug49158.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGenerationHttp.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TesterConnectionLimit.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestClose.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 30 20:08:50 2016
@@ -1,2 +1,2 @@
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643
-/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,1687544,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,170
2923,1702971,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,1715434,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-17199
10,1720200,1720234,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,1724232,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,17
25926,1726177,1726202,1726628,1726632,1726637,1726639,1726648,1726651,1726654,1726669,1726676,1726803,1726925-1726926,1726972-1726973,1726991,1727162,1727670,1727675,1727899,1727914,1727917,1728091,1728138,1728433,1728448,1728664,1728677,1729185,1729361,1729625,1729730,1730101-1730102,1730137,1730612,1730946-1730975,1731008,1731055,1731079,1731283,1731856,1731882,1731946-1731958,1731976-1731983,1732359,1732488,1732900-1733448,1733602,1733617-1733963,1733978,1734113,1734128,1734192,1734258,1734301,1734418-1734454,1734466-1734512,1734522,1734592,1734594,1734597,1735041,1735577,1736162,1736209,1736280,1736646,1736836,1737119,1737280,1737339,1737632,1737664,1737715,1737834,1737903,1737959,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738643,1738850,1738982,1738996,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740509,1740520,1740535,1740707
,1740803,1740810,1740980,1740991,1741015,1741147,1741173,1741181,1741190,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741677,1741892,1741896,1742071,1742090,1742093,1742101,1742105,1742111,1742146,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742448,1742919,1742975,1742984,1742986,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743697,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744760,1745227,1745337,1746306,1746427,1746473,1746620,1746649,1746724,1746939,1746989,1747536,1747924,1748001,1748547,1748629,1748715,1749287,1749328,1749665-1749666,1750015,1750056,1750899,1750975,1750995,1751061,1751097,1752212,1752737,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755214,1755224,1755230,1755646-1755647,1755
650,1755675,1755693,1755717,1755884,1755890,1755918-1755919,1755942,1756013,1756019,1756039,1756408,1756410,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757495,1757499,1757527,1757997,1758072-1758075,1758078-1758079,1758369
+/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,1687544,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,170
2923,1702971,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,1715434,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-17199
10,1720200,1720234,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,1724232,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,17
25926,1726177,1726202,1726628,1726632,1726637,1726639,1726648,1726651,1726654,1726669,1726676,1726803,1726925-1726926,1726972-1726973,1726991,1727162,1727670,1727675,1727899,1727914,1727917,1728091,1728138,1728433,1728448,1728664,1728677,1729185,1729361,1729625,1729730,1730101-1730102,1730137,1730612,1730946-1730975,1731008,1731055,1731079,1731283,1731856,1731882,1731946-1731958,1731976-1731983,1732359,1732488,1732900-1733448,1733602,1733617-1733963,1733978,1734113,1734128,1734192,1734258,1734301,1734418-1734454,1734466-1734512,1734522,1734592,1734594,1734597,1735041,1735577,1736162,1736209,1736280,1736646,1736836,1737119,1737280,1737339,1737632,1737664,1737715,1737834,1737903,1737959,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738643,1738850,1738982,1738996,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740509,1740520,1740535,1740707
,1740803,1740810,1740980,1740991,1741015,1741147,1741173,1741181,1741190,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741677,1741892,1741896,1742071,1742090,1742093,1742101,1742105,1742111,1742146,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742448,1742919,1742975,1742984,1742986,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743697,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744760,1745227,1745337,1746306,1746427,1746473,1746620,1746649,1746724,1746939,1746989,1747536,1747924,1748001,1748547,1748629,1748715,1749287,1749328,1749665-1749666,1750015,1750056,1750899,1750975,1750995,1751061,1751097,1752212,1752737,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755214,1755224,1755230,1755646-1755647,1755
650,1755675,1755693,1755717,1755884,1755890,1755918-1755919,1755942,1756013,1756019,1756039,1756408,1756410,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757495,1757499,1757527,1757997,1758072-1758075,1758078-1758079,1758369,1758423,1758430
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java Tue Aug 30
20:08:50 2016
@@ -857,10 +857,42 @@ public interface Context extends Contain
* Add a new servlet mapping, replacing any existing mapping for
* the specified pattern.
*
+ * @param pattern URL pattern to be mapped. The pattern will be % decoded
+ * using UTF-8
+ * @param name Name of the corresponding servlet to execute
+ *
+ * @deprecated Will be removed in Tomcat 9. Use
+ * {@link #addServletMappingDecoded(String, String)}
+ */
+ @Deprecated
+ public void addServletMapping(String pattern, String name);
+
+
+ /**
+ * Add a new servlet mapping, replacing any existing mapping for
+ * the specified pattern.
+ *
+ * @param pattern URL pattern to be mapped. The pattern will be %
+ * decoded using UTF-8
+ * @param name Name of the corresponding servlet to execute
+ * @param jspWildcard true if name identifies the JspServlet and pattern
+ * contains a wildcard; false otherwise
+ *
+ * @deprecated Will be removed in Tomcat 9. Use
+ * {@link #addServletMappingDecoded(String, String, boolean)}
+ */
+ @Deprecated
+ public void addServletMapping(String pattern, String name, boolean
jspWildcard);
+
+
+ /**
+ * Add a new servlet mapping, replacing any existing mapping for
+ * the specified pattern.
+ *
* @param pattern URL pattern to be mapped
* @param name Name of the corresponding servlet to execute
*/
- public void addServletMapping(String pattern, String name);
+ public void addServletMappingDecoded(String pattern, String name);
/**
@@ -872,7 +904,7 @@ public interface Context extends Contain
* @param jspWildcard true if name identifies the JspServlet
* and pattern contains a wildcard; false otherwise
*/
- public void addServletMapping(String pattern, String name,
+ public void addServletMappingDecoded(String pattern, String name,
boolean jspWildcard);
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
Tue Aug 30 20:08:50 2016
@@ -96,6 +96,7 @@ public class ApplicationFilterRegistrati
}
if (urlPatterns != null) {
+ // % decoded (if necessary) using UTF-8
for (String urlPattern : urlPatterns) {
filterMap.addURLPattern(urlPattern);
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
Tue Aug 30 20:08:50 2016
@@ -31,6 +31,7 @@ import org.apache.catalina.Context;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Wrapper;
import org.apache.catalina.util.ParameterMap;
+import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.res.StringManager;
public class ApplicationServletRegistration
@@ -189,7 +190,8 @@ public class ApplicationServletRegistrat
}
for (String urlPattern : urlPatterns) {
- context.addServletMapping(urlPattern, wrapper.getName());
+ context.addServletMappingDecoded(
+ UDecoder.URLDecode(urlPattern, "UTF-8"),
wrapper.getName());
}
return Collections.emptySet();
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Tue
Aug 30 20:08:50 2016
@@ -2841,7 +2841,7 @@ public class StandardContext extends Con
*/
String[] jspMappings = oldJspServlet.findMappings();
for (int i=0; jspMappings!=null && i<jspMappings.length; i++) {
- addServletMapping(jspMappings[i], child.getName());
+ addServletMappingDecoded(jspMappings[i], child.getName());
}
}
}
@@ -3163,60 +3163,52 @@ public class StandardContext extends Con
}
- /**
- * Add a new servlet mapping, replacing any existing mapping for
- * the specified pattern.
- *
- * @param pattern URL pattern to be mapped
- * @param name Name of the corresponding servlet to execute
- *
- * @exception IllegalArgumentException if the specified servlet name
- * is not known to this Context
- */
@Override
+ @Deprecated
public void addServletMapping(String pattern, String name) {
addServletMapping(pattern, name, false);
}
- /**
- * Add a new servlet mapping, replacing any existing mapping for
- * the specified pattern.
- *
- * @param pattern URL pattern to be mapped
- * @param name Name of the corresponding servlet to execute
- * @param jspWildCard true if name identifies the JspServlet
- * and pattern contains a wildcard; false otherwise
- *
- * @exception IllegalArgumentException if the specified servlet name
- * is not known to this Context
- */
@Override
- public void addServletMapping(String pattern, String name,
+ @Deprecated
+ public void addServletMapping(String pattern, String name, boolean
jspWildCard) {
+ addServletMappingDecoded(UDecoder.URLDecode(pattern, "UTF-8"), name,
false);
+ }
+
+
+ @Override
+ public void addServletMappingDecoded(String pattern, String name) {
+ addServletMappingDecoded(pattern, name, false);
+ }
+
+
+ @Override
+ public void addServletMappingDecoded(String pattern, String name,
boolean jspWildCard) {
// Validate the proposed mapping
if (findChild(name) == null)
throw new IllegalArgumentException
(sm.getString("standardContext.servletMap.name", name));
- String decodedPattern = adjustURLPattern(UDecoder.URLDecode(pattern));
- if (!validateURLPattern(decodedPattern))
+ String adjustedPattern = adjustURLPattern(pattern);
+ if (!validateURLPattern(adjustedPattern))
throw new IllegalArgumentException
- (sm.getString("standardContext.servletMap.pattern",
decodedPattern));
+ (sm.getString("standardContext.servletMap.pattern",
adjustedPattern));
// Add this mapping to our registered set
synchronized (servletMappingsLock) {
- String name2 = servletMappings.get(decodedPattern);
+ String name2 = servletMappings.get(adjustedPattern);
if (name2 != null) {
// Don't allow more than one servlet on the same pattern
Wrapper wrapper = (Wrapper) findChild(name2);
- wrapper.removeMapping(decodedPattern);
+ wrapper.removeMapping(adjustedPattern);
}
- servletMappings.put(decodedPattern, name);
+ servletMappings.put(adjustedPattern, name);
}
Wrapper wrapper = (Wrapper) findChild(name);
- wrapper.addMapping(decodedPattern);
+ wrapper.addMapping(adjustedPattern);
- fireContainerEvent("addServletMapping", decodedPattern);
+ fireContainerEvent("addServletMapping", adjustedPattern);
}
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=1758456&r1=1758455&r2=1758456&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 Aug 30 20:08:50 2016
@@ -1382,7 +1382,7 @@ public class ContextConfig implements Li
}
for (Entry<String, String> entry :
webxml.getServletMappings().entrySet()) {
- context.addServletMapping(entry.getKey(), entry.getValue());
+ context.addServletMappingDecoded(entry.getKey(), entry.getValue());
}
SessionConfig sessionConfig = webxml.getSessionConfig();
if (sessionConfig != null) {
@@ -1435,7 +1435,7 @@ public class ContextConfig implements Li
}
if (context.findChild(jspServletName) != null) {
for (String urlPattern : jspPropertyGroup.getUrlPatterns()) {
- context.addServletMapping(urlPattern, jspServletName,
true);
+ context.addServletMappingDecoded(urlPattern,
jspServletName, true);
}
} else {
if(log.isDebugEnabled()) {
@@ -2440,6 +2440,7 @@ public class ContextConfig implements Li
urlPatterns = processAnnotationsStringArray(evp.getValue());
urlPatternsSet = urlPatterns.length > 0;
for (String urlPattern : urlPatterns) {
+ // % decoded (if required) using UTF-8
filterMap.addURLPattern(urlPattern);
}
} else if ("servletNames".equals(name)) {
@@ -2521,6 +2522,7 @@ public class ContextConfig implements Li
if (urlPatternsSet
&& (urlsPatterns == null || urlsPatterns.length == 0))
{
for (String urlPattern : filterMap.getURLPatterns()) {
+ // % decoded (if required) using UTF-8
descMap.addURLPattern(urlPattern);
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
Tue Aug 30 20:08:50 2016
@@ -579,6 +579,11 @@ public class FailedContext extends Lifec
public void addServletMapping(String pattern, String name,
boolean jspWildcard) { /* NO-OP */ }
@Override
+ public void addServletMappingDecoded(String pattern, String name) { /*
NO-OP */ }
+ @Override
+ public void addServletMappingDecoded(String pattern, String name,
+ boolean jspWildcard) { /* NO-OP */ }
+ @Override
public String findServletMapping(String pattern) { return null; }
@Override
public String[] findServletMappings() { return null; }
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=1758456&r1=1758455&r2=1758456&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 Aug
30 20:08:50 2016
@@ -834,9 +834,9 @@ public class Tomcat {
servlet.setOverridable(true);
// Servlet mappings
- ctx.addServletMapping("/", "default");
- ctx.addServletMapping("*.jsp", "jsp");
- ctx.addServletMapping("*.jspx", "jsp");
+ ctx.addServletMappingDecoded("/", "default");
+ ctx.addServletMappingDecoded("*.jsp", "jsp");
+ ctx.addServletMappingDecoded("*.jspx", "jsp");
// Sessions
ctx.setSessionTimeout(30);
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
Tue Aug 30 20:08:50 2016
@@ -32,7 +32,7 @@ import org.apache.tomcat.util.buf.UDecod
*
* @author Craig R. McClanahan
*/
-public class FilterMap implements Serializable {
+public class FilterMap extends XmlEncodingBase implements Serializable {
// ------------------------------------------------------------- Properties
@@ -127,6 +127,9 @@ public class FilterMap implements Serial
}
public void addURLPattern(String urlPattern) {
+ addURLPatternDecoded(UDecoder.URLDecode(urlPattern, getEncoding()));
+ }
+ public void addURLPatternDecoded(String urlPattern) {
if ("*".equals(urlPattern)) {
this.matchAllUrlPatterns = true;
} else {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java
Tue Aug 30 20:08:50 2016
@@ -21,10 +21,13 @@ import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Set;
+import org.apache.tomcat.util.buf.UDecoder;
+
/**
* Representation of a jsp-property-group element in web.xml.
*/
-public class JspPropertyGroup {
+public class JspPropertyGroup extends XmlEncodingBase {
+
private Boolean deferredSyntax = null;
public void setDeferredSyntax(String deferredSyntax) {
this.deferredSyntax = Boolean.valueOf(deferredSyntax);
@@ -75,6 +78,9 @@ public class JspPropertyGroup {
private LinkedHashSet<String> urlPattern = new LinkedHashSet<>();
public void addUrlPattern(String urlPattern) {
+ addUrlPatternDecoded(UDecoder.URLDecode(urlPattern, getEncoding()));
+ }
+ public void addUrlPatternDecoded(String urlPattern) {
this.urlPattern.add(urlPattern);
}
public Set<String> getUrlPatterns() { return this.urlPattern; }
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
Tue Aug 30 20:08:50 2016
@@ -38,6 +38,25 @@ public class SecurityCollection implemen
private static final long serialVersionUID = 1L;
+ private String encoding = null;
+ public void setEncoding(String encoding) {
+ this.encoding = encoding;
+ }
+ /**
+ * Obtain the encoding of the XML source that was used to populated this
+ * object.
+ *
+ * @return The encoding of the associated XML source or <code>UTF-8</code>
+ * if the encoding could not be determined
+ */
+ public String getEncoding() {
+ if (encoding == null || encoding.length() == 0) {
+ return "UTF-8";
+ }
+ return encoding;
+ }
+
+
// ----------------------------------------------------------- Constructors
@@ -205,6 +224,9 @@ public class SecurityCollection implemen
* Add a URL pattern to be part of this web resource collection.
*/
public void addPattern(String pattern) {
+ addPatternDecoded(UDecoder.URLDecode(pattern, "UTF-8"));
+ }
+ public void addPatternDecoded(String pattern) {
if (pattern == null)
return;
@@ -216,7 +238,6 @@ public class SecurityCollection implemen
}
results[patterns.length] = decodedPattern;
patterns = results;
-
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
Tue Aug 30 20:08:50 2016
@@ -50,7 +50,7 @@ import org.apache.tomcat.util.res.String
*
* @author Craig R. McClanahan
*/
-public class SecurityConstraint implements Serializable {
+public class SecurityConstraint extends XmlEncodingBase implements
Serializable {
private static final long serialVersionUID = 1L;
@@ -274,6 +274,9 @@ public class SecurityConstraint implemen
if (collection == null)
return;
+
+ collection.setEncoding(getEncoding());
+
SecurityCollection results[] =
new SecurityCollection[collections.length + 1];
for (int i = 0; i < collections.length; i++)
@@ -696,7 +699,7 @@ public class SecurityConstraint implemen
for (String method : methods) {
collection.addOmittedMethod(method);
}
- collection.addPattern(pattern);
+ collection.addPatternDecoded(pattern);
collection.setName("deny-uncovered-http-methods");
SecurityConstraint constraint = new SecurityConstraint();
constraint.setAuthConstraint(true);
@@ -765,7 +768,7 @@ public class SecurityConstraint implemen
for (String method : omittedMethods) {
collection.addMethod(method);
}
- collection.addPattern(pattern);
+ collection.addPatternDecoded(pattern);
collection.setName("deny-uncovered-http-methods");
SecurityConstraint constraint = new SecurityConstraint();
constraint.setAuthConstraint(true);
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
Tue Aug 30 20:08:50 2016
@@ -16,7 +16,9 @@
*/
package org.apache.tomcat.util.descriptor.web;
+import java.io.UnsupportedEncodingException;
import java.net.URL;
+import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.EnumSet;
@@ -37,7 +39,9 @@ import javax.servlet.descriptor.JspConfi
import javax.servlet.descriptor.JspPropertyGroupDescriptor;
import javax.servlet.descriptor.TaglibDescriptor;
+import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.descriptor.XmlIdentifiers;
+import org.apache.tomcat.util.digester.DocumentProperties;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -48,7 +52,7 @@ import org.apache.tomcat.util.res.String
* This class checks for invalid duplicates (eg filter/servlet names)
* StandardContext will check validity of values (eg URL formats etc)
*/
-public class WebXml {
+public class WebXml extends XmlEncodingBase implements
DocumentProperties.Encoding {
protected static final String ORDER_OTHERS =
"org.apache.catalina.order.others";
@@ -119,7 +123,6 @@ public class WebXml {
public Set<String> getBeforeOrdering() { return before; }
// Common elements and attributes
-
// Required attribute of web-app element
public String getVersion() {
StringBuilder sb = new StringBuilder(3);
@@ -298,9 +301,14 @@ public class WebXml {
public Map<String,ServletDef> getServlets() { return servlets; }
// servlet-mapping
+ // Note: URLPatterns from web.xml may be URL encoded
+ // (http://svn.apache.org/r285186)
private final Map<String,String> servletMappings = new HashMap<>();
private final Set<String> servletMappingNames = new HashSet<>();
public void addServletMapping(String urlPattern, String servletName) {
+ addServletMappingDecoded(UDecoder.URLDecode(urlPattern,
getEncoding()), servletName);
+ }
+ public void addServletMappingDecoded(String urlPattern, String
servletName) {
String oldServletName = servletMappings.put(urlPattern, servletName);
if (oldServletName != null) {
// Duplicate mapping. As per clarification from the Servlet EG,
@@ -380,6 +388,7 @@ public class WebXml {
// jsp-config/jsp-property-group
private final Set<JspPropertyGroup> jspPropertyGroups = new
LinkedHashSet<>();
public void addJspPropertyGroup(JspPropertyGroup propertyGroup) {
+ propertyGroup.setEncoding(getEncoding());
jspPropertyGroups.add(propertyGroup);
}
public Set<JspPropertyGroup> getJspPropertyGroups() {
@@ -391,6 +400,7 @@ public class WebXml {
// TODO: Should support multiple description elements with language
private final Set<SecurityConstraint> securityConstraints = new
HashSet<>();
public void addSecurityConstraint(SecurityConstraint securityConstraint) {
+ securityConstraint.setEncoding(getEncoding());
securityConstraints.add(securityConstraint);
}
public Set<SecurityConstraint> getSecurityConstraints() {
@@ -630,7 +640,6 @@ public class WebXml {
*/
public String toXml() {
StringBuilder sb = new StringBuilder(2048);
-
// TODO - Various, icon, description etc elements are skipped - mainly
// because they are ignored when web.xml is parsed - see above
@@ -754,7 +763,7 @@ public class WebXml {
sb.append(" <url-pattern>*</url-pattern>\n");
} else {
for (String urlPattern : filterMap.getURLPatterns()) {
- appendElement(sb, INDENT4, "url-pattern", urlPattern);
+ appendElement(sb, INDENT4, "url-pattern",
encodeUrl(urlPattern));
}
}
// dispatcher was added in Servlet 2.4
@@ -845,7 +854,7 @@ public class WebXml {
for (Map.Entry<String, String> entry : servletMappings.entrySet()) {
sb.append(" <servlet-mapping>\n");
appendElement(sb, INDENT4, "servlet-name", entry.getValue());
- appendElement(sb, INDENT4, "url-pattern", entry.getKey());
+ appendElement(sb, INDENT4, "url-pattern",
encodeUrl(entry.getKey()));
sb.append(" </servlet-mapping>\n");
}
sb.append('\n');
@@ -929,7 +938,7 @@ public class WebXml {
for (JspPropertyGroup jpg : jspPropertyGroups) {
sb.append(" <jsp-property-group>\n");
for (String urlPattern : jpg.getUrlPatterns()) {
- appendElement(sb, INDENT6, "url-pattern", urlPattern);
+ appendElement(sb, INDENT6, "url-pattern",
encodeUrl(urlPattern));
}
appendElement(sb, INDENT6, "el-ignored",
jpg.getElIgnored());
appendElement(sb, INDENT6, "page-encoding",
@@ -1024,7 +1033,7 @@ public class WebXml {
appendElement(sb, INDENT6, "description",
collection.getDescription());
for (String urlPattern : collection.findPatterns()) {
- appendElement(sb, INDENT6, "url-pattern", urlPattern);
+ appendElement(sb, INDENT6, "url-pattern",
encodeUrl(urlPattern));
}
for (String method : collection.findMethods()) {
appendElement(sb, INDENT6, "http-method", method);
@@ -1297,6 +1306,17 @@ public class WebXml {
return sb.toString();
}
+
+ private String encodeUrl(String input) {
+ try {
+ return URLEncoder.encode(input, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ // Impossible. UTF-8 is a required character set
+ return null;
+ }
+ }
+
+
private static void appendElement(StringBuilder sb, String indent,
String elementName, String value) {
if (value == null) {
@@ -1611,7 +1631,7 @@ public class WebXml {
// Add fragment mappings
for (Map.Entry<String,String> mapping : servletMappingsToAdd) {
- addServletMapping(mapping.getKey(), mapping.getValue());
+ addServletMappingDecoded(mapping.getKey(), mapping.getValue());
}
for (WebXml fragment : fragments) {
Modified: tomcat/tc8.0.x/trunk/test/javax/servlet/http/TestHttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/javax/servlet/http/TestHttpServlet.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/javax/servlet/http/TestHttpServlet.java (original)
+++ tomcat/tc8.0.x/trunk/test/javax/servlet/http/TestHttpServlet.java Tue Aug
30 20:08:50 2016
@@ -44,7 +44,7 @@ public class TestHttpServlet extends Tom
// Map the test Servlet
LargeBodyServlet largeBodyServlet = new LargeBodyServlet();
Tomcat.addServlet(ctx, "largeBodyServlet", largeBodyServlet);
- ctx.addServletMapping("/", "largeBodyServlet");
+ ctx.addServletMappingDecoded("/", "largeBodyServlet");
tomcat.start();
@@ -84,11 +84,11 @@ public class TestHttpServlet extends Tom
Bug57602ServletOuter outer = new Bug57602ServletOuter();
Tomcat.addServlet(ctx, "Bug57602ServletOuter", outer);
- ctx.addServletMapping("/outer", "Bug57602ServletOuter");
+ ctx.addServletMappingDecoded("/outer", "Bug57602ServletOuter");
Bug57602ServletInner inner = new Bug57602ServletInner();
Tomcat.addServlet(ctx, "Bug57602ServletInner", inner);
- ctx.addServletMapping("/inner", "Bug57602ServletInner");
+ ctx.addServletMappingDecoded("/inner", "Bug57602ServletInner");
tomcat.start();
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
Tue Aug 30 20:08:50 2016
@@ -273,9 +273,9 @@ public class TestDigestAuthenticator ext
// Add protected servlet
Tomcat.addServlet(ctxt, "TesterServlet", new TesterServlet());
- ctxt.addServletMapping(URI, "TesterServlet");
+ ctxt.addServletMappingDecoded(URI, "TesterServlet");
SecurityCollection collection = new SecurityCollection();
- collection.addPattern(URI);
+ collection.addPatternDecoded(URI);
SecurityConstraint sc = new SecurityConstraint();
sc.addAuthRole(ROLE);
sc.addCollection(collection);
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Tue Aug 30 20:08:50 2016
@@ -700,19 +700,19 @@ public class TestFormAuthenticator exten
"", System.getProperty("java.io.tmpdir"));
Tomcat.addServlet(ctx, "SelectedMethods",
new SelectedMethodsServlet());
- ctx.addServletMapping("/test", "SelectedMethods");
+ ctx.addServletMappingDecoded("/test", "SelectedMethods");
// Login servlet just needs to respond "OK". Client will handle
// creating a valid response. No need for a form.
Tomcat.addServlet(ctx, "Login",
new TesterServlet());
- ctx.addServletMapping("/login", "Login");
+ ctx.addServletMappingDecoded("/login", "Login");
// Configure the security constraints
SecurityConstraint constraint = new SecurityConstraint();
SecurityCollection collection = new SecurityCollection();
collection.setName("Protect PUT");
collection.addMethod("PUT");
- collection.addPattern("/test");
+ collection.addPatternDecoded("/test");
constraint.addCollection(collection);
constraint.addAuthRole("tomcat");
ctx.addConstraint(constraint);
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
Tue Aug 30 20:08:50 2016
@@ -455,10 +455,10 @@ public class TestNonLoginAndBasicAuthent
// Add protected servlet to the context
Tomcat.addServlet(nonloginContext, "TesterServlet1", new
TesterServlet());
- nonloginContext.addServletMapping(URI_PROTECTED, "TesterServlet1");
+ nonloginContext.addServletMappingDecoded(URI_PROTECTED,
"TesterServlet1");
SecurityCollection collection1 = new SecurityCollection();
- collection1.addPattern(URI_PROTECTED);
+ collection1.addPatternDecoded(URI_PROTECTED);
SecurityConstraint sc1 = new SecurityConstraint();
sc1.addAuthRole(ROLE);
sc1.addCollection(collection1);
@@ -466,10 +466,10 @@ public class TestNonLoginAndBasicAuthent
// Add unprotected servlet to the context
Tomcat.addServlet(nonloginContext, "TesterServlet2", new
TesterServlet());
- nonloginContext.addServletMapping(URI_PUBLIC, "TesterServlet2");
+ nonloginContext.addServletMappingDecoded(URI_PUBLIC, "TesterServlet2");
SecurityCollection collection2 = new SecurityCollection();
- collection2.addPattern(URI_PUBLIC);
+ collection2.addPatternDecoded(URI_PUBLIC);
SecurityConstraint sc2 = new SecurityConstraint();
// do not add a role - which signals access permitted without one
sc2.addCollection(collection2);
@@ -492,9 +492,9 @@ public class TestNonLoginAndBasicAuthent
// Add protected servlet to the context
Tomcat.addServlet(basicContext, "TesterServlet3", new TesterServlet());
- basicContext.addServletMapping(URI_PROTECTED, "TesterServlet3");
+ basicContext.addServletMappingDecoded(URI_PROTECTED, "TesterServlet3");
SecurityCollection collection = new SecurityCollection();
- collection.addPattern(URI_PROTECTED);
+ collection.addPatternDecoded(URI_PROTECTED);
SecurityConstraint sc = new SecurityConstraint();
sc.addAuthRole(ROLE);
sc.addCollection(collection);
@@ -502,10 +502,10 @@ public class TestNonLoginAndBasicAuthent
// Add unprotected servlet to the context
Tomcat.addServlet(basicContext, "TesterServlet4", new TesterServlet());
- basicContext.addServletMapping(URI_PUBLIC, "TesterServlet4");
+ basicContext.addServletMappingDecoded(URI_PUBLIC, "TesterServlet4");
SecurityCollection collection2 = new SecurityCollection();
- collection2.addPattern(URI_PUBLIC);
+ collection2.addPatternDecoded(URI_PUBLIC);
SecurityConstraint sc2 = new SecurityConstraint();
// do not add a role - which signals access permitted without one
sc2.addCollection(collection2);
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
Tue Aug 30 20:08:50 2016
@@ -484,10 +484,10 @@ public class TestSSOnonLoginAndBasicAuth
// Add protected servlet to the context
Tomcat.addServlet(nonloginContext, "TesterServlet1",
new TesterServletEncodeUrl());
- nonloginContext.addServletMapping(URI_PROTECTED, "TesterServlet1");
+ nonloginContext.addServletMappingDecoded(URI_PROTECTED,
"TesterServlet1");
SecurityCollection collection1 = new SecurityCollection();
- collection1.addPattern(URI_PROTECTED);
+ collection1.addPatternDecoded(URI_PROTECTED);
SecurityConstraint sc1 = new SecurityConstraint();
sc1.addAuthRole(ROLE);
sc1.addCollection(collection1);
@@ -496,10 +496,10 @@ public class TestSSOnonLoginAndBasicAuth
// Add unprotected servlet to the context
Tomcat.addServlet(nonloginContext, "TesterServlet2",
new TesterServletEncodeUrl());
- nonloginContext.addServletMapping(URI_PUBLIC, "TesterServlet2");
+ nonloginContext.addServletMappingDecoded(URI_PUBLIC, "TesterServlet2");
SecurityCollection collection2 = new SecurityCollection();
- collection2.addPattern(URI_PUBLIC);
+ collection2.addPatternDecoded(URI_PUBLIC);
SecurityConstraint sc2 = new SecurityConstraint();
// do not add a role - which signals access permitted without one
sc2.addCollection(collection2);
@@ -523,9 +523,9 @@ public class TestSSOnonLoginAndBasicAuth
// Add protected servlet to the context
Tomcat.addServlet(basicContext, "TesterServlet3",
new TesterServletEncodeUrl());
- basicContext.addServletMapping(URI_PROTECTED, "TesterServlet3");
+ basicContext.addServletMappingDecoded(URI_PROTECTED, "TesterServlet3");
SecurityCollection collection = new SecurityCollection();
- collection.addPattern(URI_PROTECTED);
+ collection.addPatternDecoded(URI_PROTECTED);
SecurityConstraint sc = new SecurityConstraint();
sc.addAuthRole(ROLE);
sc.addCollection(collection);
@@ -534,9 +534,9 @@ public class TestSSOnonLoginAndBasicAuth
// Add unprotected servlet to the context
Tomcat.addServlet(basicContext, "TesterServlet4",
new TesterServletEncodeUrl());
- basicContext.addServletMapping(URI_PUBLIC, "TesterServlet4");
+ basicContext.addServletMappingDecoded(URI_PUBLIC, "TesterServlet4");
SecurityCollection collection2 = new SecurityCollection();
- collection2.addPattern(URI_PUBLIC);
+ collection2.addPatternDecoded(URI_PUBLIC);
SecurityConstraint sc2 = new SecurityConstraint();
// do not add a role - which signals access permitted without one
sc2.addCollection(collection2);
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
Tue Aug 30 20:08:50 2016
@@ -330,9 +330,9 @@ public class TestSSOnonLoginAndDigestAut
// Add protected servlet
Tomcat.addServlet(ctxt, "TesterServlet1", new TesterServlet());
- ctxt.addServletMapping(URI_PROTECTED, "TesterServlet1");
+ ctxt.addServletMappingDecoded(URI_PROTECTED, "TesterServlet1");
SecurityCollection collection1 = new SecurityCollection();
- collection1.addPattern(URI_PROTECTED);
+ collection1.addPatternDecoded(URI_PROTECTED);
SecurityConstraint sc1 = new SecurityConstraint();
sc1.addAuthRole(ROLE);
sc1.addCollection(collection1);
@@ -340,9 +340,9 @@ public class TestSSOnonLoginAndDigestAut
// Add unprotected servlet
Tomcat.addServlet(ctxt, "TesterServlet2", new TesterServlet());
- ctxt.addServletMapping(URI_PUBLIC, "TesterServlet2");
+ ctxt.addServletMappingDecoded(URI_PUBLIC, "TesterServlet2");
SecurityCollection collection2 = new SecurityCollection();
- collection2.addPattern(URI_PUBLIC);
+ collection2.addPatternDecoded(URI_PUBLIC);
SecurityConstraint sc2 = new SecurityConstraint();
// do not add a role - which signals access permitted without one
sc2.addCollection(collection2);
@@ -364,9 +364,9 @@ public class TestSSOnonLoginAndDigestAut
// Add protected servlet
Tomcat.addServlet(ctxt, "TesterServlet3", new TesterServlet());
- ctxt.addServletMapping(URI_PROTECTED, "TesterServlet3");
+ ctxt.addServletMappingDecoded(URI_PROTECTED, "TesterServlet3");
SecurityCollection collection = new SecurityCollection();
- collection.addPattern(URI_PROTECTED);
+ collection.addPatternDecoded(URI_PROTECTED);
SecurityConstraint sc = new SecurityConstraint();
sc.addAuthRole(ROLE);
sc.addCollection(collection);
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Tue Aug 30 20:08:50 2016
@@ -59,9 +59,9 @@ public class TestCometProcessor extends
Tomcat tomcat = getTomcatInstance();
Context root = tomcat.addContext("", TEMP_DIR);
Tomcat.addServlet(root, "comet", new SimpleCometServlet());
- root.addServletMapping("/comet", "comet");
+ root.addServletMappingDecoded("/comet", "comet");
Tomcat.addServlet(root, "hello", new HelloWorldServlet());
- root.addServletMapping("/hello", "hello");
+ root.addServletMappingDecoded("/hello", "hello");
root.getPipeline().addValve(new AsyncCometCloseValve());
tomcat.getConnector().setProperty("connectionTimeout", "5000");
tomcat.start();
@@ -126,9 +126,9 @@ public class TestCometProcessor extends
Tomcat tomcat = getTomcatInstance();
Context root = tomcat.addContext("", TEMP_DIR);
Tomcat.addServlet(root, "comet", new CometCloseServlet());
- root.addServletMapping("/comet", "comet");
+ root.addServletMappingDecoded("/comet", "comet");
Tomcat.addServlet(root, "hello", new HelloWorldServlet());
- root.addServletMapping("/hello", "hello");
+ root.addServletMappingDecoded("/hello", "hello");
tomcat.getConnector().setProperty("connectionTimeout", "5000");
tomcat.start();
@@ -197,9 +197,9 @@ public class TestCometProcessor extends
Tomcat tomcat = getTomcatInstance();
Context root = tomcat.addContext("", TEMP_DIR);
Tomcat.addServlet(root, "comet", new ConnectionCloseServlet());
- root.addServletMapping("/comet", "comet");
+ root.addServletMappingDecoded("/comet", "comet");
Tomcat.addServlet(root, "hello", new HelloWorldServlet());
- root.addServletMapping("/hello", "hello");
+ root.addServletMappingDecoded("/hello", "hello");
tomcat.getConnector().setProperty("connectionTimeout", "5000");
tomcat.start();
@@ -273,7 +273,7 @@ public class TestCometProcessor extends
if (initParam != null) {
w.addInitParameter(initParam, "true");
}
- root.addServletMapping("/", "comet");
+ root.addServletMappingDecoded("/", "comet");
TesterAccessLogValve alv = new TesterAccessLogValve();
root.getPipeline().addValve(alv);
@@ -365,7 +365,7 @@ public class TestCometProcessor extends
Tomcat tomcat = getTomcatInstance();
Context root = tomcat.addContext("", TEMP_DIR);
Tomcat.addServlet(root, "comet", servlet);
- root.addServletMapping("/", "comet");
+ root.addServletMappingDecoded("/", "comet");
tomcat.start();
// Create connection to Comet servlet
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestConnector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestConnector.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestConnector.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestConnector.java
Tue Aug 30 20:08:50 2016
@@ -43,7 +43,7 @@ public class TestConnector extends Tomca
Wrapper w =
Tomcat.addServlet(root, "tester", new TesterServlet());
w.setAsyncSupported(true);
- root.addServletMapping("/", "tester");
+ root.addServletMappingDecoded("/", "tester");
Connector connector = tomcat.getConnector();
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
Tue Aug 30 20:08:50 2016
@@ -115,7 +115,7 @@ public class TestCoyoteAdapter extends T
Context ctx = tomcat.addContext("", docBase.getAbsolutePath());
Tomcat.addServlet(ctx, "servlet", new PathParamServlet());
- ctx.addServletMapping("/", "servlet");
+ ctx.addServletMappingDecoded("/", "servlet");
tomcat.start();
@@ -136,7 +136,7 @@ public class TestCoyoteAdapter extends T
Context ctx = tomcat.addContext("", null);
Tomcat.addServlet(ctx, "servlet", new PathParamServlet());
- ctx.addServletMapping("/", "servlet");
+ ctx.addServletMappingDecoded("/", "servlet");
tomcat.start();
@@ -189,7 +189,7 @@ public class TestCoyoteAdapter extends T
Context ctx = tomcat.addContext("/testapp", null);
Tomcat.addServlet(ctx, "servlet", new PathParamServlet());
- ctx.addServletMapping("*.txt", "servlet");
+ ctx.addServletMappingDecoded("*.txt", "servlet");
tomcat.start();
@@ -240,7 +240,7 @@ public class TestCoyoteAdapter extends T
PathInfoServlet servlet = new PathInfoServlet();
Tomcat.addServlet(ctx, "servlet", servlet);
- ctx.addServletMapping("/*", "servlet");
+ ctx.addServletMappingDecoded("/*", "servlet");
tomcat.start();
@@ -283,7 +283,7 @@ public class TestCoyoteAdapter extends T
AsyncServlet servlet = new AsyncServlet();
Wrapper w = Tomcat.addServlet(ctx, "async", servlet);
w.setAsyncSupported(true);
- ctx.addServletMapping("/async", "async");
+ ctx.addServletMappingDecoded("/async", "async");
tomcat.start();
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
Tue Aug 30 20:08:50 2016
@@ -108,11 +108,11 @@ public class TestCoyoteOutputStream exte
Wrapper w = Tomcat.addServlet(root, "nbWrite",
new NonBlockingWriteServlet(asyncWriteTarget,
useContainerThreadToSetListener));
w.setAsyncSupported(true);
- root.addServletMapping("/nbWrite", "nbWrite");
+ root.addServletMappingDecoded("/nbWrite", "nbWrite");
Tomcat.addServlet(root, "write",
new BlockingWriteServlet(asyncWriteTarget, syncWriteTarget));
w.setAsyncSupported(true);
- root.addServletMapping("/write", "write");
+ root.addServletMappingDecoded("/write", "write");
tomcat.start();
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
Tue Aug 30 20:08:50 2016
@@ -44,7 +44,7 @@ public class TestInputBuffer extends Tom
Tomcat tomcat = getTomcatInstance();
Context root = tomcat.addContext("", TEMP_DIR);
Tomcat.addServlet(root, "Echo", new Utf8Echo());
- root.addServletMapping("/test", "Echo");
+ root.addServletMappingDecoded("/test", "Echo");
tomcat.getConnector().setProperty("soTimeout", "300000");
tomcat.start();
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
Tue Aug 30 20:08:50 2016
@@ -58,7 +58,7 @@ public class TestKeepAliveCount extends
Tomcat tomcat = getTomcatInstance();
Context root = tomcat.addContext("", TEMP_DIR);
Tomcat.addServlet(root, "Simple", new SimpleServlet());
- root.addServletMapping("/test", "Simple");
+ root.addServletMappingDecoded("/test", "Simple");
tomcat.getConnector().setProperty("maxKeepAliveRequests", "5");
tomcat.getConnector().setProperty("soTimeout", "20000");
tomcat.getConnector().setProperty("keepAliveTimeout", "50000");
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
Tue Aug 30 20:08:50 2016
@@ -73,7 +73,7 @@ public class TestMaxConnections extends
StandardContext root = (StandardContext) tomcat.addContext("",
SimpleHttpClient.TEMP_DIR);
root.setUnloadDelay(soTimeout);
Tomcat.addServlet(root, "Simple", new SimpleServlet());
- root.addServletMapping("/test", "Simple");
+ root.addServletMappingDecoded("/test", "Simple");
tomcat.getConnector().setProperty("maxKeepAliveRequests", "1");
tomcat.getConnector().setProperty("maxThreads", "10");
tomcat.getConnector().setProperty("soTimeout", "20000");
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
Tue Aug 30 20:08:50 2016
@@ -50,7 +50,7 @@ public class TestOutputBuffer extends To
for (int i = 1; i <= WritingServlet.EXPECTED_CONTENT_LENGTH; i*=10) {
WritingServlet servlet = new WritingServlet(i);
Tomcat.addServlet(root, "servlet" + i, servlet);
- root.addServletMapping("/servlet" + i, "servlet" + i);
+ root.addServletMappingDecoded("/servlet" + i, "servlet" + i);
}
tomcat.start();
@@ -84,7 +84,7 @@ public class TestOutputBuffer extends To
Bug52577Servlet bug52577 = new Bug52577Servlet();
Tomcat.addServlet(root, "bug52577", bug52577);
- root.addServletMapping("/", "bug52577");
+ root.addServletMappingDecoded("/", "bug52577");
tomcat.start();
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestRequest.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestRequest.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestRequest.java
Tue Aug 30 20:08:50 2016
@@ -177,7 +177,7 @@ public class TestRequest extends TomcatB
Tomcat tomcat = getTomcatInstance();
Context root = tomcat.addContext("", TEMP_DIR);
Tomcat.addServlet(root, "Bug37794", new Bug37794Servlet());
- root.addServletMapping("/test", "Bug37794");
+ root.addServletMappingDecoded("/test", "Bug37794");
if (createFilter) {
FilterDef failedRequestFilter = new FilterDef();
@@ -186,7 +186,7 @@ public class TestRequest extends TomcatB
FailedRequestFilter.class.getName());
FilterMap failedRequestFilterMap = new FilterMap();
failedRequestFilterMap.setFilterName("failedRequestFilter");
- failedRequestFilterMap.addURLPattern("/*");
+ failedRequestFilterMap.addURLPatternDecoded("/*");
root.addFilterDef(failedRequestFilter);
root.addFilterMap(failedRequestFilterMap);
}
@@ -277,7 +277,7 @@ public class TestRequest extends TomcatB
// Add the Servlet
Tomcat.addServlet(ctx, "servlet", new EchoQueryStringServlet());
- ctx.addServletMapping("/", "servlet");
+ ctx.addServletMappingDecoded("/", "servlet");
tomcat.start();
@@ -325,7 +325,7 @@ public class TestRequest extends TomcatB
ctx.getPipeline().addValve(new BasicAuthenticator());
Tomcat.addServlet(ctx, "servlet", new LoginLogoutServlet());
- ctx.addServletMapping("/", "servlet");
+ ctx.addServletMappingDecoded("/", "servlet");
TesterMapRealm realm = new TesterMapRealm();
realm.addUser(LoginLogoutServlet.USER, LoginLogoutServlet.PWD);
@@ -372,7 +372,7 @@ public class TestRequest extends TomcatB
Context root = tomcat.addContext("",
System.getProperty("java.io.tmpdir"));
Tomcat.addServlet(root, "Bug37794", new Bug37794Servlet());
- root.addServletMapping("/", "Bug37794");
+ root.addServletMappingDecoded("/", "Bug37794");
tomcat.start();
HttpURLConnection conn = getConnection("http://localhost:"; + getPort()
+ "/");
@@ -386,7 +386,7 @@ public class TestRequest extends TomcatB
Context root = tomcat.addContext("",
System.getProperty("java.io.tmpdir"));
Tomcat.addServlet(root, "Bug37794", new Bug37794Servlet());
- root.addServletMapping("/", "Bug37794");
+ root.addServletMappingDecoded("/", "Bug37794");
tomcat.start();
HttpURLConnection conn = getConnection("http://localhost:"; + getPort()
+ "/");
@@ -479,7 +479,7 @@ public class TestRequest extends TomcatB
System.getProperty("java.io.tmpdir"));
root.setAllowCasualMultipartParsing(true);
Tomcat.addServlet(root, "Bug54984", new Bug54984Servlet());
- root.addServletMapping("/", "Bug54984");
+ root.addServletMappingDecoded("/", "Bug54984");
tomcat.start();
HttpURLConnection conn = getConnection("http://localhost:"; + getPort()
@@ -556,7 +556,7 @@ public class TestRequest extends TomcatB
Tomcat tomcat = getTomcatInstance();
Context root = tomcat.addContext("", TEMP_DIR);
Tomcat.addServlet(root, "EchoParameters", new
EchoParametersServlet());
- root.addServletMapping("/echo", "EchoParameters");
+ root.addServletMappingDecoded("/echo", "EchoParameters");
tomcat.start();
setPort(tomcat.getConnector().getLocalPort());
@@ -829,7 +829,7 @@ public class TestRequest extends TomcatB
Context ctx = tomcat.addContext(deployPath, null);
Tomcat.addServlet(ctx, "servlet", new Bug56501Servelet());
- ctx.addServletMapping("/*", "servlet");
+ ctx.addServletMappingDecoded("/*", "servlet");
tomcat.start();
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestResponse.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestResponse.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestResponse.java
Tue Aug 30 20:08:50 2016
@@ -56,7 +56,7 @@ public class TestResponse extends Tomcat
Context ctx = tomcat.addContext("", null);
Tomcat.addServlet(ctx, "servlet", new Bug49598Servlet());
- ctx.addServletMapping("/", "servlet");
+ ctx.addServletMappingDecoded("/", "servlet");
tomcat.start();
@@ -112,7 +112,7 @@ public class TestResponse extends Tomcat
Context ctx = tomcat.addContext("", null);
Tomcat.addServlet(ctx, "servlet", new CharsetServlet());
- ctx.addServletMapping("/", "servlet");
+ ctx.addServletMappingDecoded("/", "servlet");
tomcat.start();
@@ -151,7 +151,7 @@ public class TestResponse extends Tomcat
Context ctx = tomcat.addContext("", null);
Tomcat.addServlet(ctx, "servlet", new Bug52811Servlet());
- ctx.addServletMapping("/", "servlet");
+ ctx.addServletMappingDecoded("/", "servlet");
tomcat.start();
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
Tue Aug 30 20:08:50 2016
@@ -62,7 +62,7 @@ public class TestSendFile extends Tomcat
for (int i=0; i<ITERATIONS; i++) {
WritingServlet servlet = new WritingServlet(files[i]);
Tomcat.addServlet(root, "servlet" + i, servlet);
- root.addServletMapping("/servlet" + i, "servlet" + i);
+ root.addServletMappingDecoded("/servlet" + i, "servlet" + i);
}
tomcat.start();
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java?rev=1758456&r1=1758455&r2=1758456&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationContext.java
Tue Aug 30 20:08:50 2016
@@ -189,7 +189,7 @@ public class TestApplicationContext exte
ctx.setCrossContext(true);
Tomcat.addServlet(ctx, "Bug57190Servlet", new Bug57190Servlet());
- ctx.addServletMapping("/", "Bug57190Servlet");
+ ctx.addServletMappingDecoded("/", "Bug57190Servlet");
tomcat.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
