Author: markt
Date: Mon Jul 31 10:35:55 2017
New Revision: 1803509
URL: http://svn.apache.org/viewvc?rev=1803509&view=rev
Log:
Revert fix for bug 49464 as it was causing too many regressions.
Removed:
tomcat/tc8.5.x/trunk/test/webapp/404.html
tomcat/tc8.5.x/trunk/test/webapp/bug49nnn/bug49464-ibm850.txt
tomcat/tc8.5.x/trunk/test/webapp/bug49nnn/bug49464-utf8-bom.txt
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/build.xml
tomcat/tc8.5.x/trunk/conf/web.xml
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/default-servlet.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 31 10:35:55 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,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793719,1793736,1793746,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,1795289,1795298,1795305,1795813,1795893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,17
97344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800454,1800464,1800473,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801530,1801540,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802780-1802781,1802786,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459
+/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,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793719,1793736,1793746,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,1795289,1795298,1795305,1795813,1795893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,17
97344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459
Modified: tomcat/tc8.5.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.xml?rev=1803509&r1=1803508&r2=1803509&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/build.xml (original)
+++ tomcat/tc8.5.x/trunk/build.xml Mon Jul 31 10:35:55 2017
@@ -566,8 +566,6 @@
<exclude name="java/org/apache/**/parser/Token*.java" />
<!-- Exclude simple test files -->
<exclude name="test/webapp/bug53257/**/*.txt"/>
- <exclude name="test/webapp/bug49nnn/bug49464-ibm850.txt"/>
- <exclude name="test/webapp/bug49nnn/bug49464-utf8-bom.txt"/>
<exclude name="test/webapp-fragments/WEB-INF/classes/*.txt"/>
<exclude name="test/webresources/**"/>
<!-- Exclude test files with unusual encodings -->
Modified: tomcat/tc8.5.x/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/conf/web.xml?rev=1803509&r1=1803508&r2=1803509&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/conf/web.xml (original)
+++ tomcat/tc8.5.x/trunk/conf/web.xml Mon Jul 31 10:35:55 2017
@@ -48,11 +48,6 @@
<!-- fileEncoding Encoding to be used to read static resources -->
<!-- [platform default] -->
<!-- -->
- <!-- useBomIfPresent If a static file contains a byte order mark -->
- <!-- (BOM), should this be used to determine the -->
- <!-- file encoding in preference to fileEncoding. -->
- <!-- [true] -->
- <!-- -->
<!-- input Input buffer size (in bytes) when reading -->
<!-- resources to be served. [2048] -->
<!-- -->
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1803509&r1=1803508&r2=1803509&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Mon Jul 31 10:35:55 2017
@@ -32,8 +32,6 @@ import java.io.Reader;
import java.io.Serializable;
import java.io.StringReader;
import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.security.AccessController;
import java.util.ArrayList;
@@ -75,7 +73,6 @@ import org.apache.catalina.connector.Res
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
import org.apache.catalina.util.URLEncoder;
-import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.util.security.PrivilegedGetTccl;
import org.apache.tomcat.util.security.PrivilegedSetTccl;
@@ -240,12 +237,6 @@ public class DefaultServlet extends Http
* the platform default is used.
*/
protected String fileEncoding = null;
- private Charset fileEncodingCharset = null;
-
- /**
- * If a file has a BOM, should that be used in preference to fileEncoding?
- */
- private boolean useBomIfPresent = true;
/**
* Minimum size for sendfile usage in bytes.
@@ -303,20 +294,6 @@ public class DefaultServlet extends Http
Integer.parseInt(getServletConfig().getInitParameter("sendfileSize")) * 1024;
fileEncoding = getServletConfig().getInitParameter("fileEncoding");
- if (fileEncoding == null) {
- fileEncodingCharset = Charset.defaultCharset();
- fileEncoding = fileEncodingCharset.name();
- } else {
- try {
- fileEncodingCharset = B2CConverter.getCharset(fileEncoding);
- } catch (UnsupportedEncodingException e) {
- throw new ServletException(e);
- }
- }
-
- if (getServletConfig().getInitParameter("useBomIfPresent") != null)
- useBomIfPresent = Boolean.parseBoolean(
- getServletConfig().getInitParameter("useBomIfPresent"));
globalXsltFile = getServletConfig().getInitParameter("globalXsltFile");
contextXsltFile =
getServletConfig().getInitParameter("contextXsltFile");
@@ -742,11 +719,11 @@ public class DefaultServlet extends Http
/**
* Serve the specified resource, optionally including the data content.
*
- * @param request The servlet request we are processing
- * @param response The servlet response we are creating
- * @param content Should the content be included?
- * @param inputEncoding The encoding to use if it is necessary to access
the
- * source as characters rather than as bytes
+ * @param request The servlet request we are processing
+ * @param response The servlet response we are creating
+ * @param content Should the content be included?
+ * @param encoding The encoding to use if it is necessary to access the
+ * source as characters rather than as bytes
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet-specified error occurs
@@ -754,7 +731,7 @@ public class DefaultServlet extends Http
protected void serveResource(HttpServletRequest request,
HttpServletResponse response,
boolean content,
- String inputEncoding)
+ String encoding)
throws IOException, ServletException {
boolean serveContent = content;
@@ -953,7 +930,12 @@ public class DefaultServlet extends Http
} catch (IllegalStateException e) {
// If it fails, we try to get a Writer instead if we're
// trying to serve a text file
- if (!usingPrecompressedVersion && isText(contentType)) {
+ if (!usingPrecompressedVersion &&
+ ((contentType == null) ||
+ (contentType.startsWith("text")) ||
+ (contentType.endsWith("xml")) ||
+ (contentType.contains("/javascript")))
+ ) {
writer = response.getWriter();
// Cannot reliably serve partial content with a Writer
ranges = FULL;
@@ -963,7 +945,7 @@ public class DefaultServlet extends Http
}
}
- // Check to see if a Filter, Valve or wrapper has written some content.
+ // Check to see if a Filter, Valve of wrapper has written some content.
// If it has, disable range requests and setting of a content length
// since neither can be done reliably.
ServletResponse r = response;
@@ -978,19 +960,6 @@ public class DefaultServlet extends Http
ranges = FULL;
}
- String outputEncoding = response.getCharacterEncoding();
- Charset charset = B2CConverter.getCharset(outputEncoding);
- boolean conversionRequired;
- if (!usingPrecompressedVersion && isText(contentType) &&
- !charset.equals(fileEncodingCharset)) {
- conversionRequired = true;
- // Conversion often results fewer/more/different bytes.
- // That does not play nicely with range requests.
- ranges = FULL;
- } else {
- conversionRequired = false;
- }
-
if (resource.isDirectory() ||
isError ||
( (ranges == null || ranges.isEmpty())
@@ -1010,8 +979,8 @@ public class DefaultServlet extends Http
log("DefaultServlet.serveFile: contentLength=" +
contentLength);
// Don't set a content length if something else has already
- // written to the response or if conversion will be taking
place
- if (contentWritten == 0 && !conversionRequired) {
+ // written to the response.
+ if (contentWritten == 0) {
response.setContentLengthLong(contentLength);
}
}
@@ -1027,57 +996,29 @@ public class DefaultServlet extends Http
// Output via a writer so can't use sendfile or write
// content directly.
if (resource.isDirectory()) {
- renderResult = render(getPathPrefix(request),
resource, inputEncoding);
+ renderResult = render(getPathPrefix(request),
resource, encoding);
} else {
renderResult = resource.getInputStream();
- if (included) {
- // Need to make sure any BOM is removed
- if (!renderResult.markSupported()) {
- renderResult = new
BufferedInputStream(renderResult);
- }
- Charset bomCharset = processBom(renderResult);
- if (bomCharset != null && useBomIfPresent) {
- inputEncoding = bomCharset.name();
- }
- }
}
- copy(renderResult, writer, inputEncoding);
+ copy(renderResult, writer, encoding);
} else {
// Output is via an InputStream
if (resource.isDirectory()) {
- renderResult = render(getPathPrefix(request),
resource, inputEncoding);
+ renderResult = render(getPathPrefix(request),
resource, encoding);
} else {
// Output is content of resource
- // Check to see if conversion is required
- if (conversionRequired || included) {
- // When including a file, we need to check for a
BOM
- // to determine if a conversion is required, so we
- // might as well always convert
- InputStream source = resource.getInputStream();
- if (!source.markSupported()) {
- source = new BufferedInputStream(source);
- }
- Charset bomCharset = processBom(source);
- if (bomCharset != null && useBomIfPresent) {
- inputEncoding = bomCharset.name();
- }
- OutputStreamWriter osw = new
OutputStreamWriter(ostream, charset);
- PrintWriter pw = new PrintWriter(osw);
- copy(source, pw, inputEncoding);
- pw.flush();
- } else {
- if (!checkSendfile(request, response, resource,
contentLength, null)) {
- // sendfile not possible so check if resource
- // content is available directly
- byte[] resourceBody = resource.getContent();
- if (resourceBody == null) {
- // Resource content not available, use
- // inputstream
- renderResult = resource.getInputStream();
- } else {
- // Use the resource content directly
- ostream.write(resourceBody);
- }
+ if (!checkSendfile(request, response, resource,
+ contentLength, null)) {
+ // sendfile not possible so check if resource
+ // content is available directly
+ byte[] resourceBody = resource.getContent();
+ if (resourceBody == null) {
+ // Resource content not available, use
+ // inputstream
+ renderResult = resource.getInputStream();
+ } else {
+ // Use the resource content directly
+ ostream.write(resourceBody);
}
}
}
@@ -1150,81 +1091,6 @@ public class DefaultServlet extends Http
}
}
-
- /*
- * Code borrowed heavily from Jasper's EncodingDetector
- */
- private static Charset processBom(InputStream is) throws IOException {
- // Java supported character sets do not use BOMs longer than 4 bytes
- byte[] bom = new byte[4];
- is.mark(bom.length);
-
- int count = is.read(bom);
-
- // BOMs are at least 2 bytes
- if (count < 2) {
- skip(is, 0);
- return null;
- }
-
- // Look for two byte BOMs
- int b0 = bom[0] & 0xFF;
- int b1 = bom[1] & 0xFF;
- if (b0 == 0xFE && b1 == 0xFF) {
- skip(is, 2);
- return StandardCharsets.UTF_16BE;
- }
- if (b0 == 0xFF && b1 == 0xFE) {
- skip(is, 2);
- return StandardCharsets.UTF_16LE;
- }
-
- // Remaining BOMs are at least 3 bytes
- if (count < 3) {
- skip(is, 0);
- return null;
- }
-
- // UTF-8 is only 3-byte BOM
- int b2 = bom[2] & 0xFF;
- if (b0 == 0xEF && b1 == 0xBB && b2 == 0xBF) {
- skip(is, 3);
- return StandardCharsets.UTF_8;
- }
-
- if (count < 4) {
- skip(is, 0);
- return null;
- }
-
- // Look for 4-bute BOMs
- int b3 = bom[3] & 0xFF;
- if (b0 == 0x00 && b1 == 0x00 && b2 == 0xFE && b3 == 0xFF) {
- return Charset.forName("UTF32-BE");
- }
- if (b0 == 0xFF && b1 == 0xFE && b2 == 0x00 && b3 == 0x00) {
- return Charset.forName("UTF32-LE");
- }
-
- skip(is, 0);
- return null;
- }
-
-
- private static void skip(InputStream is, int skip) throws IOException {
- is.reset();
- while (skip-- > 0) {
- is.read();
- }
- }
-
-
- private static boolean isText(String contentType) {
- return contentType == null || contentType.startsWith("text") ||
- contentType.endsWith("xml") ||
contentType.contains("/javascript");
- }
-
-
private boolean pathEndsWithCompressedExtension(String path) {
for (CompressionFormat format : compressionFormats) {
if (path.endsWith(format.extension)) {
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1803509&r1=1803508&r2=1803509&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
Mon Jul 31 10:35:55 2017
@@ -20,9 +20,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
-import java.io.StringReader;
import java.io.Writer;
-import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
@@ -31,10 +29,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import static org.junit.Assert.assertEquals;
@@ -52,10 +46,7 @@ import org.apache.catalina.Wrapper;
import org.apache.catalina.startup.SimpleHttpClient;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.ByteChunk;
-import org.apache.tomcat.util.descriptor.web.ErrorPage;
-import org.apache.tomcat.util.http.parser.MediaType;
import org.apache.tomcat.websocket.server.WsContextListener;
public class TestDefaultServlet extends TomcatBaseTest {
@@ -121,7 +112,6 @@ public class TestDefaultServlet extends
Wrapper defaultServlet = Tomcat.addServlet(ctxt, "default",
"org.apache.catalina.servlets.DefaultServlet");
defaultServlet.addInitParameter("gzip", "true");
- defaultServlet.addInitParameter("fileEncoding", "ISO-8859-1");
ctxt.addServletMappingDecoded("/", "default");
ctxt.addMimeMapping("html", "text/html");
@@ -177,7 +167,6 @@ public class TestDefaultServlet extends
Wrapper defaultServlet = Tomcat.addServlet(ctxt, "default",
"org.apache.catalina.servlets.DefaultServlet");
defaultServlet.addInitParameter("precompressed", "true");
- defaultServlet.addInitParameter("fileEncoding", "ISO-8859-1");
ctxt.addServletMappingDecoded("/", "default");
ctxt.addMimeMapping("html", "text/html");
@@ -288,7 +277,6 @@ public class TestDefaultServlet extends
Wrapper defaultServlet = Tomcat.addServlet(ctxt, "default",
DefaultServlet.class.getName());
defaultServlet.addInitParameter("precompressed", "br=.br,gzip=.gz");
- defaultServlet.addInitParameter("fileEncoding", "ISO-8859-1");
ctxt.addServletMappingDecoded("/", "default");
ctxt.addMimeMapping("html", "text/html");
@@ -459,24 +447,36 @@ public class TestDefaultServlet extends
*/
@Test
public void testCustomErrorPage() throws Exception {
+ File appDir = new File(getTemporaryDirectory(), "MyApp");
+ File webInf = new File(appDir, "WEB-INF");
+ addDeleteOnTearDown(appDir);
+ if (!webInf.mkdirs() && !webInf.isDirectory()) {
+ fail("Unable to create directory [" + webInf + "]");
+ }
- Tomcat tomcat = getTomcatInstance();
-
- File appDir = new File("test/webapp");
-
- // app dir is relative to server home
- Context ctxt = tomcat.addContext("", appDir.getAbsolutePath());
- Wrapper defaultServlet = Tomcat.addServlet(ctxt, "default",
- DefaultServlet.class.getName());
- defaultServlet.addInitParameter("fileEncoding", "ISO-8859-1");
+ File webxml = new File(appDir, "WEB-INF/web.xml");
+ try (FileOutputStream fos = new FileOutputStream(webxml);
+ Writer w = new OutputStreamWriter(fos, "UTF-8");) {
+ w.write("<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<web-app xmlns='http://java.sun.com/xml/ns/j2ee' "
+ + " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'"
+ + " xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee "
+ + " http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd'"
+ + " version='2.4'>\n"
+ + "<error-page>\n<error-code>404</error-code>\n"
+ + "<location>/404.html</location>\n</error-page>\n"
+ + "</web-app>\n");
+ }
- ctxt.addServletMappingDecoded("/", "default");
- ctxt.addMimeMapping("html", "text/html");
- ErrorPage ep = new ErrorPage();
- ep.setErrorCode(404);
- ep.setLocation("/404.html");
- ctxt.addErrorPage(ep);
+ File error404 = new File(appDir, "404.html");
+ try (FileOutputStream fos = new FileOutputStream(error404);
+ Writer w = new OutputStreamWriter(fos, "ISO-8859-1")) {
+ w.write("It is 404.html");
+ }
+ Tomcat tomcat = getTomcatInstance();
+ String contextPath = "/MyApp";
+ tomcat.addWebapp(null, contextPath, appDir.getAbsolutePath());
tomcat.start();
TestCustomErrorClient client =
@@ -622,212 +622,4 @@ public class TestDefaultServlet extends
return true;
}
}
-
- @Test
- public void testEncodingIncludeIbm850StreamOutIso88591() throws Exception {
- doTestEncodingFileIbm850(false, "ISO-8859-1");
- }
-
- @Test
- public void testEncodingIncludeIbm850WriterOutIso88591() throws Exception {
- doTestEncodingFileIbm850(true, "ISO-8859-1");
- }
-
- @Test
- public void testEncodingIncludeIbm850StreamOutUtf8() throws Exception {
- doTestEncodingFileIbm850(false, "UTF-8");
- }
-
- @Test
- public void testEncodingIncludeIbm850WriterOutUtf8() throws Exception {
- doTestEncodingFileIbm850(true, "UTF-8");
- }
-
- @Test
- public void testEncodingIncludeIbm850StreamOutIbm850() throws Exception {
- doTestEncodingFileIbm850(false, "IBM850");
- }
-
- @Test
- public void testEncodingIncludeIbm850WriterOutIbm850() throws Exception {
- doTestEncodingFileIbm850(false, "IBM850");
- }
-
- @Test
- public void testEncodingIncludeUtf8BomStreamOutIso88591() throws Exception
{
- doTestEncodingFileUtf8Bom(false, "ISO-8859-1");
- }
-
- @Test
- public void testEncodingIncludeUtf8BomWriterOutIso88591() throws Exception
{
- doTestEncodingFileUtf8Bom(true, "ISO-8859-1");
- }
-
- @Test
- public void testEncodingIncludeUtf8BomStreamOutUtf8() throws Exception {
- doTestEncodingFileUtf8Bom(false, "UTF-8");
- }
-
- @Test
- public void testEncodingIncludeUtf8BomWriterOutUtf8() throws Exception {
- doTestEncodingFileUtf8Bom(true, "UTF-8");
- }
-
- @Test
- public void testEncodingIncludeUtf8BomStreamOutIbm850() throws Exception {
- doTestEncodingFileUtf8Bom(false, "IBM850");
- }
-
- @Test
- public void testEncodingIncludeUtf8BomWriterOutIbm850() throws Exception {
- doTestEncodingFileUtf8Bom(false, "IBM850");
- }
-
- @Test
- public void testEncodingIncludeUtf8BomOverrideStreamOutIso88591() throws
Exception {
- doTestEncodingFileUtf8BomOverride(false, "ISO-8859-1");
- }
-
- @Test
- public void testEncodingIncludeUtf8BomOverrideWriterOutIso88591() throws
Exception {
- doTestEncodingFileUtf8BomOverride(true, "ISO-8859-1");
- }
-
- @Test
- public void testEncodingIncludeUtf8BomOverrideStreamOutUtf8() throws
Exception {
- doTestEncodingFileUtf8BomOverride(false, "UTF-8");
- }
-
- @Test
- public void testEncodingIncludeUtf8BomOverrideWriterOutUtf8() throws
Exception {
- doTestEncodingFileUtf8BomOverride(true, "UTF-8");
- }
-
- @Test
- public void testEncodingIncludeUtf8BomOverrideStreamOutIbm850() throws
Exception {
- doTestEncodingFileUtf8BomOverride(false, "IBM850");
- }
-
- @Test
- public void testEncodingIncludeUtf8BomOverrideWriterOutIbm850() throws
Exception {
- doTestEncodingFileUtf8BomOverride(false, "IBM850");
- }
-
- private void doTestEncodingFileIbm850(boolean useWriter, String
outputEncoding)
- throws Exception {
- doTestEncoding("/bug49nnn/bug49464-ibm850.txt", "IBM850", useWriter,
outputEncoding);
- }
-
- private void doTestEncodingFileUtf8Bom(boolean useWriter, String
outputEncoding)
- throws Exception {
- doTestEncoding("/bug49nnn/bug49464-utf8-bom.txt", "UTF-8", useWriter,
outputEncoding);
- }
-
- private void doTestEncodingFileUtf8BomOverride(boolean useWriter, String
outputEncoding)
- throws Exception {
- doTestEncoding("/bug49nnn/bug49464-utf8-bom.txt", "IBM850", useWriter,
outputEncoding);
- }
-
- private void doTestEncoding(String includePath, String inputEncoding,
boolean useWriter,
- String outputEncoding) throws Exception {
- Tomcat tomcat = getTomcatInstance();
-
- File appDir = new File("test/webapp");
-
- Context ctxt = tomcat.addContext("", appDir.getAbsolutePath());
-
- Wrapper defaultServlet = Tomcat.addServlet(ctxt, "default",
DefaultServlet.class.getName());
- defaultServlet.addInitParameter("fileEncoding", inputEncoding);
- ctxt.addServletMappingDecoded("/", "default");
-
- Tomcat.addServlet(ctxt, "encoding",
- new EncodingServlet(outputEncoding, includePath, useWriter));
- ctxt.addServletMappingDecoded("/test", "encoding");
-
- tomcat.start();
-
- final ByteChunk res = new ByteChunk();
- Map<String,List<String>> headers = new HashMap<>();
-
- int rc = getUrl("http://localhost:"; + getPort() + "/test", res,
headers);
-
- Assert.assertEquals(HttpServletResponse.SC_OK, rc);
- List<String> values = headers.get("Content-Type");
- if (values.size() == 1) {
- MediaType mediaType = MediaType.parseMediaType(new
StringReader(values.get(0)));
- String charset = mediaType.getCharset();
- if (charset == null) {
- res.setCharset(StandardCharsets.ISO_8859_1);
- } else {
- res.setCharset(B2CConverter.getCharset(charset));
- }
- } else {
- res.setCharset(StandardCharsets.ISO_8859_1);
- }
- Assert.assertEquals("\u00bd", res.toString());
- }
-
- @Test
- public void testEncodingDirect() throws Exception {
- Tomcat tomcat = getTomcatInstance();
-
- File appDir = new File("test/webapp");
-
- Context ctxt = tomcat.addContext("", appDir.getAbsolutePath());
-
- Wrapper defaultServlet = Tomcat.addServlet(ctxt, "default",
DefaultServlet.class.getName());
- defaultServlet.addInitParameter("fileEncoding", "IBM850");
- ctxt.addServletMappingDecoded("/", "default");
-
- tomcat.start();
-
- final ByteChunk res = new ByteChunk();
- Map<String,List<String>> headers = new HashMap<>();
-
- int rc = getUrl("http://localhost:"; + getPort() +
"/bug49nnn/bug49464-ibm850.txt",
- res, headers);
-
- Assert.assertEquals(HttpServletResponse.SC_OK, rc);
- List<String> values = headers.get("Content-Type");
- if (values != null && values.size() == 1) {
- MediaType mediaType = MediaType.parseMediaType(new
StringReader(values.get(0)));
- String charset = mediaType.getCharset();
- if (charset == null) {
- res.setCharset(StandardCharsets.ISO_8859_1);
- } else {
- res.setCharset(B2CConverter.getCharset(charset));
- }
- } else {
- res.setCharset(StandardCharsets.ISO_8859_1);
- }
- Assert.assertEquals("\u00bd", res.toString());
- }
-
- private static class EncodingServlet extends HttpServlet {
-
- private static final long serialVersionUID = 1L;
-
- private final String outputEncoding;
- private final String includeTarget;
- private final boolean useWriter;
-
- public EncodingServlet(String outputEncoding, String includeTarget,
boolean useWriter) {
- this.outputEncoding = outputEncoding;
- this.includeTarget = includeTarget;
- this.useWriter = useWriter;
- }
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
- resp.setContentType("text/plain");
- resp.setCharacterEncoding(outputEncoding);
- if (useWriter) {
- resp.getWriter();
- }
- resp.flushBuffer();
- RequestDispatcher rd = req.getRequestDispatcher(includeTarget);
- rd.include(req, resp);
- }
- }
}
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1803509&r1=1803508&r2=1803509&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Jul 31 10:35:55 2017
@@ -48,6 +48,10 @@
<subsection name="Catalina">
<changelog>
<fix>
+ Revert the fix for <bug>49464</bug> since it continued to trigger
+ regressions. (markt)
+ </fix>
+ <fix>
Correct a bug in the <code>PushBuilder</code> implementation that
meant push URLs containing <code>%nn</code> sequences were not
correctly
decoded. Identified by FindBugs. (markt)
Modified: tomcat/tc8.5.x/trunk/webapps/docs/default-servlet.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/default-servlet.xml?rev=1803509&r1=1803508&r2=1803509&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/default-servlet.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/default-servlet.xml Mon Jul 31 10:35:55
2017
@@ -167,10 +167,6 @@ directory listings are disabled and debu
File encoding to be used when reading static resources.
[platform default]
</property>
- <property name="useBomIfPresent">
- If a static file contains a byte order mark (BOM), should this be used
- to determine the file encoding in preference to fileEncoding. [true]
- </property>
<property name="sendfileSize">
If the connector used supports sendfile, this represents the minimal
file size in KB for which sendfile will be used. Use a negative value
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
