Author: markt Date: Tue May 2 08:58:10 2017 New Revision: 1793442 URL: http://svn.apache.org/viewvc?rev=1793442&view=rev Log: Move towards using Charset rather than String internally to reduce the number of calls required to B2CConverter.getCharset() during a request.
Added: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties - copied unchanged from r1793437, tomcat/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/XmlEncodingBase.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/DocumentProperties.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcher.java tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestUDecoder.java Propchange: tomcat/tc8.5.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 2 08:58:10 2017 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747 536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1 756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216 8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,1768520,1768569,176 8651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,1778141-1778150, 1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778582,1778600,1779641,1779654,1779708,1779718,1779897,1779899,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,1788550,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,17887 53,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790376,1790614,1790983,1790991,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793266 +/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747 536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1 756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216 8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,1768520,1768569,176 8651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,1778141-1778150, 1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778582,1778600,1779641,1779654,1779708,1779718,1779897,1779899,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,1788550,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,17887 53,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790376,1790614,1790983,1790991,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793266,1793437 Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1793442&r1=1793441&r2=1793442&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java Tue May 2 08:58:10 2017 @@ -2054,7 +2054,7 @@ public class Request implements org.apac candidate = uri.substring(0, pos); } candidate = removePathParameters(candidate); - candidate = UDecoder.URLDecode(candidate, connector.getURIEncoding()); + candidate = UDecoder.URLDecode(candidate, connector.getURICharset()); candidate = org.apache.tomcat.util.http.RequestUtil.normalize(candidate); boolean match = canonicalContextPath.equals(candidate); while (!match && pos != -1) { @@ -2065,7 +2065,7 @@ public class Request implements org.apac candidate = uri.substring(0, pos); } candidate = removePathParameters(candidate); - candidate = UDecoder.URLDecode(candidate, connector.getURIEncoding()); + candidate = UDecoder.URLDecode(candidate, connector.getURICharset()); candidate = org.apache.tomcat.util.http.RequestUtil.normalize(candidate); match = canonicalContextPath.equals(candidate); } Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java?rev=1793442&r1=1793441&r2=1793442&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java Tue May 2 08:58:10 2017 @@ -17,6 +17,7 @@ package org.apache.catalina.core; +import java.nio.charset.StandardCharsets; import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -191,7 +192,7 @@ public class ApplicationServletRegistrat for (String urlPattern : urlPatterns) { context.addServletMappingDecoded( - UDecoder.URLDecode(urlPattern, "UTF-8"), wrapper.getName()); + UDecoder.URLDecode(urlPattern, StandardCharsets.UTF_8), wrapper.getName()); } return Collections.emptySet(); } Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1793442&r1=1793441&r2=1793442&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Tue May 2 08:58:10 2017 @@ -1524,7 +1524,7 @@ public class WebdavServlet } // Remove url encoding from destination - destinationPath = UDecoder.URLDecode(destinationPath, "UTF8"); + destinationPath = UDecoder.URLDecode(destinationPath, StandardCharsets.UTF_8); int protocolIndex = destinationPath.indexOf("://"); if (protocolIndex >= 0) { Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1793442&r1=1793441&r2=1793442&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Tue May 2 08:58:10 2017 @@ -19,6 +19,7 @@ package org.apache.tomcat.util.buf; import java.io.CharConversionException; import java.io.IOException; import java.io.UnsupportedEncodingException; +import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import org.apache.juli.logging.Log; @@ -35,8 +36,7 @@ import org.apache.tomcat.util.res.String */ public final class UDecoder { - private static final StringManager sm = - StringManager.getManager(Constants.Package); + private static final StringManager sm = StringManager.getManager(UDecoder.class); private static final Log log = LogFactory.getLog(UDecoder.class); @@ -295,9 +295,9 @@ public final class UDecoder { /** * Decode and return the specified URL-encoded String. - * When the byte array is converted to a string, the system default - * character encoding is used... This may be different than some other - * servers. It is assumed the string is not a query string. + * When the byte array is converted to a string, ISO-885901 is used. This + * may be different than some other servers. It is assumed the string is not + * a query string. * * @param str The url-encoded string * @return the decoded string @@ -305,7 +305,7 @@ public final class UDecoder { * by a valid 2-digit hexadecimal number */ public static String URLDecode(String str) { - return URLDecode(str, null); + return URLDecode(str, StandardCharsets.ISO_8859_1); } @@ -314,18 +314,40 @@ public final class UDecoder { * string is not a query string. * * @param str The url-encoded string - * @param enc The encoding to use; if null, the default encoding is used. If + * @param enc The encoding to use; if null, ISO-885901 is used. If * an unsupported encoding is specified null will be returned * @return the decoded string * @exception IllegalArgumentException if a '%' character is not followed * by a valid 2-digit hexadecimal number + * + * @deprecated This method will be removed in Tomcat 9 */ + @Deprecated public static String URLDecode(String str, String enc) { return URLDecode(str, enc, false); } /** + * Decode and return the specified URL-encoded String. It is assumed the + * string is not a query string. + * + * @param str The url-encoded string + * @param charset The character encoding to use; if null, ISO-8859-1 is + * used. + * @return the decoded string + * @exception IllegalArgumentException if a '%' character is not followed + * by a valid 2-digit hexadecimal number + */ + public static String URLDecode(String str, Charset charset) { + if (str == null) { + return null; + } + return URLDecode(str.getBytes(StandardCharsets.US_ASCII), charset, false); + } + + + /** * Decode and return the specified URL-encoded String. * * @param str The url-encoded string @@ -335,7 +357,10 @@ public final class UDecoder { * @return the decoded string * @exception IllegalArgumentException if a '%' character is not followed * by a valid 2-digit hexadecimal number + * + * @deprecated This method will be removed in Tomcat 9 */ + @Deprecated public static String URLDecode(String str, String enc, boolean isQuery) { if (str == null) { return null; @@ -358,11 +383,36 @@ public final class UDecoder { * @return the decoded string * @exception IllegalArgumentException if a '%' character is not followed * by a valid 2-digit hexadecimal number + * + * @deprecated This method will be removed in Tomcat 9 */ + @Deprecated public static String URLDecode(byte[] bytes, String enc, boolean isQuery) { + Charset charset = null; + + if (enc != null) { + try { + charset = B2CConverter.getCharset(enc); + } catch (UnsupportedEncodingException uee) { + if (log.isDebugEnabled()) { + log.debug(sm.getString("uDecoder.urlDecode.uee", enc), uee); + } + } + } - if (bytes == null) + return URLDecode(bytes, charset, isQuery); + } + + + private static String URLDecode(byte[] bytes, Charset charset, boolean isQuery) { + + if (bytes == null) { return null; + } + + if (charset == null) { + charset = StandardCharsets.ISO_8859_1; + } int len = bytes.length; int ix = 0; @@ -381,18 +431,8 @@ public final class UDecoder { } bytes[ox++] = b; } - if (enc != null) { - try { - return new String(bytes, 0, ox, B2CConverter.getCharset(enc)); - } catch (UnsupportedEncodingException uee) { - if (log.isDebugEnabled()) { - log.debug(sm.getString("uDecoder.urlDecode.uee", enc), uee); - } - return null; - } - } - return new String(bytes, 0, ox, StandardCharsets.ISO_8859_1); + return new String(bytes, 0, ox, charset); } Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java?rev=1793442&r1=1793441&r2=1793442&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java Tue May 2 08:58:10 2017 @@ -127,7 +127,7 @@ public class FilterMap extends XmlEncodi } public void addURLPattern(String urlPattern) { - addURLPatternDecoded(UDecoder.URLDecode(urlPattern, getEncoding())); + addURLPatternDecoded(UDecoder.URLDecode(urlPattern, getCharset())); } public void addURLPatternDecoded(String urlPattern) { if ("*".equals(urlPattern)) { Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java?rev=1793442&r1=1793441&r2=1793442&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/JspPropertyGroup.java Tue May 2 08:58:10 2017 @@ -78,7 +78,7 @@ public class JspPropertyGroup extends Xm private LinkedHashSet<String> urlPattern = new LinkedHashSet<>(); public void addUrlPattern(String urlPattern) { - addUrlPatternDecoded(UDecoder.URLDecode(urlPattern, getEncoding())); + addUrlPatternDecoded(UDecoder.URLDecode(urlPattern, getCharset())); } public void addUrlPatternDecoded(String urlPattern) { this.urlPattern.add(urlPattern); Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties?rev=1793442&r1=1793441&r2=1793442&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties Tue May 2 08:58:10 2017 @@ -62,3 +62,5 @@ webXml.wrongFragmentName=Used a wrong fr webXmlParser.applicationParse=Parse error in application web.xml file at [{0}] webXmlParser.applicationPosition=Occurred at line [{0}] column [{1}] webXmlParser.applicationStart=Parsing application web.xml file at [{0}] + +xmlEncodingBase.encodingInvalid=The encoding [{0}] is not recognised by this JRE. The existing value of [{1}] will be used \ No newline at end of file Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java?rev=1793442&r1=1793441&r2=1793442&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java Tue May 2 08:58:10 2017 @@ -17,6 +17,7 @@ package org.apache.tomcat.util.descriptor.web; import java.io.Serializable; +import java.nio.charset.StandardCharsets; import org.apache.tomcat.util.buf.UDecoder; @@ -209,7 +210,7 @@ public class SecurityCollection extends * @param pattern The pattern */ public void addPattern(String pattern) { - addPatternDecoded(UDecoder.URLDecode(pattern, "UTF-8")); + addPatternDecoded(UDecoder.URLDecode(pattern, StandardCharsets.UTF_8)); } public void addPatternDecoded(String pattern) { Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java?rev=1793442&r1=1793441&r2=1793442&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java Tue May 2 08:58:10 2017 @@ -281,7 +281,7 @@ public class SecurityConstraint extends if (collection == null) return; - collection.setEncoding(getEncoding()); + collection.setCharset(getCharset()); SecurityCollection results[] = new SecurityCollection[collections.length + 1]; Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1793442&r1=1793441&r2=1793442&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java Tue May 2 08:58:10 2017 @@ -54,7 +54,9 @@ 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 extends XmlEncodingBase implements DocumentProperties.Encoding { +@SuppressWarnings("deprecation") +public class WebXml extends XmlEncodingBase implements DocumentProperties.Encoding, + DocumentProperties.Charset { protected static final String ORDER_OTHERS = "org.apache.catalina.order.others"; @@ -313,7 +315,7 @@ public class WebXml extends XmlEncodingB 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); + addServletMappingDecoded(UDecoder.URLDecode(urlPattern, getCharset()), servletName); } public void addServletMappingDecoded(String urlPattern, String servletName) { String oldServletName = servletMappings.put(urlPattern, servletName); @@ -398,7 +400,7 @@ public class WebXml extends XmlEncodingB // jsp-config/jsp-property-group private final Set<JspPropertyGroup> jspPropertyGroups = new LinkedHashSet<>(); public void addJspPropertyGroup(JspPropertyGroup propertyGroup) { - propertyGroup.setEncoding(getEncoding()); + propertyGroup.setCharset(getCharset()); jspPropertyGroups.add(propertyGroup); } public Set<JspPropertyGroup> getJspPropertyGroups() { @@ -410,7 +412,7 @@ public class WebXml extends XmlEncodingB // TODO: Should support multiple description elements with language private final Set<SecurityConstraint> securityConstraints = new HashSet<>(); public void addSecurityConstraint(SecurityConstraint securityConstraint) { - securityConstraint.setEncoding(getEncoding()); + securityConstraint.setCharset(getCharset()); securityConstraints.add(securityConstraint); } public Set<SecurityConstraint> getSecurityConstraints() { Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/XmlEncodingBase.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/XmlEncodingBase.java?rev=1793442&r1=1793441&r2=1793442&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/XmlEncodingBase.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/XmlEncodingBase.java Tue May 2 08:58:10 2017 @@ -16,17 +16,38 @@ */ package org.apache.tomcat.util.descriptor.web; +import java.io.UnsupportedEncodingException; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; + +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; +import org.apache.tomcat.util.buf.B2CConverter; +import org.apache.tomcat.util.res.StringManager; + /** * Base class for those elements that need to track the encoding used in the * source XML. */ public abstract class XmlEncodingBase { - private String encoding = null; + private static final Log log = LogFactory.getLog(XmlEncodingBase.class); + private static final StringManager sm = StringManager.getManager(XmlEncodingBase.class); + private Charset charset = StandardCharsets.UTF_8; + /** + * @param encoding The encoding of the XML source that was used to + * populated this object. + * @deprecated This method will be removed in Tomcat 9 + */ + @Deprecated public void setEncoding(String encoding) { - this.encoding = encoding; + try { + charset = B2CConverter.getCharset(encoding); + } catch (UnsupportedEncodingException e) { + log.warn(sm.getString("xmlEncodingBase.encodingInvalid", encoding, charset.name()), e); + } } @@ -36,11 +57,27 @@ public abstract class XmlEncodingBase { * * @return The encoding of the associated XML source or <code>UTF-8</code> * if the encoding could not be determined + * @deprecated This method will be removed in Tomcat 9 */ + @Deprecated public String getEncoding() { - if (encoding == null || encoding.length() == 0) { - return "UTF-8"; - } - return encoding; + return charset.name(); + } + + + public void setCharset(Charset charset) { + this.charset = charset; + } + + + /** + * Obtain the character encoding of the XML source that was used to + * populated this object. + * + * @return The character encoding of the associated XML source or + * <code>UTF-8</code> if the encoding could not be determined + */ + public Charset getCharset() { + return charset; } } Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1793442&r1=1793441&r2=1793442&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java Tue May 2 08:58:10 2017 @@ -20,6 +20,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; import java.net.URI; import java.net.URISyntaxException; @@ -39,6 +40,8 @@ import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.ExceptionUtils; import org.apache.tomcat.util.IntrospectionUtils; +import org.apache.tomcat.util.buf.B2CConverter; +import org.apache.tomcat.util.res.StringManager; import org.apache.tomcat.util.security.PermissionCheck; import org.xml.sax.Attributes; import org.xml.sax.EntityResolver; @@ -76,7 +79,6 @@ import org.xml.sax.helpers.AttributesImp */ public class Digester extends DefaultHandler2 { - // ---------------------------------------------------------- Static Fields protected static IntrospectionUtils.PropertySource propertySource = null; @@ -289,8 +291,8 @@ public class Digester extends DefaultHan /** * The Log to which most logging calls will be made. */ - protected Log log = LogFactory.getLog("org.apache.tomcat.util.digester.Digester"); - + protected Log log = LogFactory.getLog(Digester.class); + protected StringManager sm = StringManager.getManager(Digester.class); /** * The Log to which all SAX event related logging calls will be made. @@ -1112,6 +1114,7 @@ public class Digester extends DefaultHan * * @exception SAXException if a parsing error is to be reported */ + @SuppressWarnings("deprecation") @Override public void startDocument() throws SAXException { @@ -1119,8 +1122,17 @@ public class Digester extends DefaultHan saxLog.debug("startDocument()"); } - if (locator instanceof Locator2 && root instanceof DocumentProperties.Encoding) { - ((DocumentProperties.Encoding) root).setEncoding(((Locator2) locator).getEncoding()); + if (locator instanceof Locator2) { + if (root instanceof DocumentProperties.Charset) { + String enc = ((Locator2) locator).getEncoding(); + try { + ((DocumentProperties.Charset) root).setCharset(B2CConverter.getCharset(enc)); + } catch (UnsupportedEncodingException e) { + log.warn(sm.getString("disgester.encodingInvalid", enc), e); + } + } else if (root instanceof DocumentProperties.Encoding) { + ((DocumentProperties.Encoding) root).setEncoding(((Locator2) locator).getEncoding()); + } } // ensure that the digester is properly configured, as Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/DocumentProperties.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/DocumentProperties.java?rev=1793442&r1=1793441&r2=1793442&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/DocumentProperties.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/DocumentProperties.java Tue May 2 08:58:10 2017 @@ -26,9 +26,19 @@ package org.apache.tomcat.util.digester; public interface DocumentProperties { /** - * The encoding used by the source XMl document. + * The encoding used by the source XML document. + * + * @deprecated This method will be removed in Tomcat 9 */ + @Deprecated public interface Encoding { public void setEncoding(String encoding); } + + /** + * The character encoding used by the source XML document. + */ + public interface Charset { + public void setCharset(java.nio.charset.Charset charset); + } } Modified: tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcher.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcher.java?rev=1793442&r1=1793441&r2=1793442&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcher.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcher.java Tue May 2 08:58:10 2017 @@ -17,6 +17,7 @@ package org.apache.catalina.core; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collection; @@ -369,7 +370,8 @@ public class TestApplicationContextGetRe // Add a target servlet to dispatch to Tomcat.addServlet(ctx, "target", new TargetServlet()); - ctx.addServletMappingDecoded(UDecoder.URLDecode(targetPath, "UTF-8"), "target"); + ctx.addServletMappingDecoded( + UDecoder.URLDecode(targetPath, StandardCharsets.UTF_8), "target"); if (useAsync) { Wrapper w = Tomcat.addServlet( @@ -378,7 +380,7 @@ public class TestApplicationContextGetRe } else { Tomcat.addServlet(ctx, "rd", new DispatcherServlet(dispatchPath)); } - ctx.addServletMappingDecoded(UDecoder.URLDecode(startPath, "UTF-8"), "rd"); + ctx.addServletMappingDecoded(UDecoder.URLDecode(startPath, StandardCharsets.UTF_8), "rd"); tomcat.start(); Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestUDecoder.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestUDecoder.java?rev=1793442&r1=1793441&r2=1793442&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestUDecoder.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestUDecoder.java Tue May 2 08:58:10 2017 @@ -16,6 +16,8 @@ */ package org.apache.tomcat.util.buf; +import java.nio.charset.StandardCharsets; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -47,41 +49,41 @@ public class TestUDecoder { @Test public void testURLDecodeStringValidIso88591Start() { - String result = UDecoder.URLDecode("%41xxxx", "ISO-8859-1"); + String result = UDecoder.URLDecode("%41xxxx", StandardCharsets.ISO_8859_1); assertEquals("Axxxx", result); } @Test public void testURLDecodeStringValidIso88591Middle() { - String result = UDecoder.URLDecode("xx%41xx", "ISO-8859-1"); + String result = UDecoder.URLDecode("xx%41xx", StandardCharsets.ISO_8859_1); assertEquals("xxAxx", result); } @Test public void testURLDecodeStringValidIso88591End() { - String result = UDecoder.URLDecode("xxxx%41", "ISO-8859-1"); + String result = UDecoder.URLDecode("xxxx%41", StandardCharsets.ISO_8859_1); assertEquals("xxxxA", result); } @Test public void testURLDecodeStringValidUtf8Start() { - String result = UDecoder.URLDecode("%c3%aaxxxx", "UTF-8"); + String result = UDecoder.URLDecode("%c3%aaxxxx", StandardCharsets.UTF_8); assertEquals("\u00eaxxxx", result); } @Test public void testURLDecodeStringValidUtf8Middle() { - String result = UDecoder.URLDecode("xx%c3%aaxx", "UTF-8"); + String result = UDecoder.URLDecode("xx%c3%aaxx", StandardCharsets.UTF_8); assertEquals("xx\u00eaxx", result); } @Test public void testURLDecodeStringValidUtf8End() { - String result = UDecoder.URLDecode("xxxx%c3%aa", "UTF-8"); + String result = UDecoder.URLDecode("xxxx%c3%aa", StandardCharsets.UTF_8); assertEquals("xxxx\u00ea", result); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org