You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/07/31 10:27:30 UTC
svn commit: r1803507 - in /tomcat/tc8.0.x/trunk: ./ conf/
java/org/apache/catalina/servlets/ test/org/apache/catalina/servlets/
test/webapp/ test/webapp/bug49nnn/ webapps/docs/
Author: markt
Date: Mon Jul 31 10:27:30 2017
New Revision: 1803507
URL: http://svn.apache.org/viewvc?rev=1803507&view=rev
Log:
Revert fix for bug 49464 as it was causing too many regressions in later branches.
Removed:
tomcat/tc8.0.x/trunk/test/webapp/404.html
tomcat/tc8.0.x/trunk/test/webapp/bug49nnn/bug49464-ibm850.txt
tomcat/tc8.0.x/trunk/test/webapp/bug49nnn/bug49464-utf8-bom.txt
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/build.xml
tomcat/tc8.0.x/trunk/conf/web.xml
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/default-servlet.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 31 10:27:30 2017
@@ -1,2 +1,2 @@
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805
-/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,1687549,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,1701113,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,170
2886,1702910,1702923,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,1719276,1719278,1719291,1719315,1719332,1719334,1719340,1719346,1719441,17194
46,1719488,1719909-1719910,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,1723806,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-17
25907,1725910,1725914,1725920,1725926,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,1742387,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,1755
214,1755224,1755230,1755646-1755647,1755650,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,1758292,1758369,1758423,1758425-1758427,1758430,1758486-1758487,1758499,1758556,1758582,1758584,1758588,1758842,1759019,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761491,1761498,1761500-1761501,1761550,1761625-1761626,1761628,1761682,1761740,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762541,1762608,1762710,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276,1763319,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763477,1
763479,1763512,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1764083,1764659,1764682,1764897,1765299,1765358,1765439,1765571,1766276,1766514,1766822,1766834,1766840,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1768651,1768762,1768922,1769263,1770140,1770180,1770258,1770656,1770666,1770718,1770762,1771087,1771139,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771963,1772174,1772223,1772229,1772554,1772849,1772947,1773418,1773756,1773813-1773814,1774052,1774131,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1775596,1776540,1776937,1777011,1777173,1777211,1777261,1777524,1777605,1777647,1778061,1778138-1778139,1778141-1778150,1778154,1779654,1779718,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1781569,1781986,1782814,1782857,1782868,1782946,1783144,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784751,1784963,1785271,1785667,1785762,178577
4,1785823,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787250,1788241-1788242,1788248,1788323-1788324,1788328,1788741,1788747,1788764,1789051,1789400,1789415,1789442,1789733,1789735,1789744-1789745,1790119,1790180,1790183,1790376,1791527,1791557,1792460,1792468,1793468,1793487,1793498,1793502,1793514,1793712,1793736,1793746,1793771,1793819,1793980,1794674,1795278,1795298,1795305,1795813,1795893,1796275,1796693-1796694,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797678,1797692,1797694,1797748,1797828,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799285,1799368,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800454,1800464,1800473,1800791,1800816,1800981,1800984,1800988,1801530,1801540,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802403,1802475,1802639,1802780-1802781,1802786,1802796,1802820,180
2828,1802833,1802836,1803446,1803451
+/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,1687549,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,1701113,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,170
2886,1702910,1702923,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,1719276,1719278,1719291,1719315,1719332,1719334,1719340,1719346,1719441,17194
46,1719488,1719909-1719910,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,1723806,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-17
25907,1725910,1725914,1725920,1725926,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,1742387,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,1755
214,1755224,1755230,1755646-1755647,1755650,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,1758292,1758369,1758423,1758425-1758427,1758430,1758486-1758487,1758499,1758556,1758582,1758584,1758588,1758842,1759019,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761491,1761498,1761500-1761501,1761550,1761625-1761626,1761628,1761682,1761740,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762541,1762608,1762710,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276,1763319,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763477,1
763479,1763512,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1764083,1764659,1764682,1764897,1765299,1765358,1765439,1765571,1766276,1766514,1766822,1766834,1766840,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1768651,1768762,1768922,1769263,1770140,1770180,1770258,1770656,1770666,1770718,1770762,1771087,1771139,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771963,1772174,1772223,1772229,1772554,1772849,1772947,1773418,1773756,1773813-1773814,1774052,1774131,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1775596,1776540,1776937,1777011,1777173,1777211,1777261,1777524,1777605,1777647,1778061,1778138-1778139,1778141-1778150,1778154,1779654,1779718,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1781569,1781986,1782814,1782857,1782868,1782946,1783144,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784751,1784963,1785271,1785667,1785762,178577
4,1785823,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787250,1788241-1788242,1788248,1788323-1788324,1788328,1788741,1788747,1788764,1789051,1789400,1789415,1789442,1789733,1789735,1789744-1789745,1790119,1790180,1790183,1790376,1791527,1791557,1792460,1792468,1793468,1793487,1793498,1793502,1793514,1793712,1793736,1793746,1793771,1793819,1793980,1794674,1795278,1795298,1795305,1795813,1795893,1796275,1796693-1796694,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797678,1797692,1797694,1797748,1797828,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799285,1799368,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800791,1800816,1800981,1800984,1800988,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802403,1802475,1802639,1802796,1802820,1802828,1802833,1802836,1803446,1803451
Modified: tomcat/tc8.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/build.xml?rev=1803507&r1=1803506&r2=1803507&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/build.xml (original)
+++ tomcat/tc8.0.x/trunk/build.xml Mon Jul 31 10:27:30 2017
@@ -574,8 +574,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 developer specific local files -->
Modified: tomcat/tc8.0.x/trunk/conf/web.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/conf/web.xml?rev=1803507&r1=1803506&r2=1803507&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/conf/web.xml (original)
+++ tomcat/tc8.0.x/trunk/conf/web.xml Mon Jul 31 10:27:30 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.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1803507&r1=1803506&r2=1803507&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Mon Jul 31 10:27:30 2017
@@ -31,9 +31,6 @@ import java.io.RandomAccessFile;
import java.io.Reader;
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;
import java.util.Collection;
@@ -73,7 +70,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;
@@ -236,12 +232,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.
@@ -298,20 +288,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");
@@ -708,11 +684,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
@@ -720,7 +696,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;
@@ -915,7 +891,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 (!usingGzippedVersion && isText(contentType)) {
+ if (!usingGzippedVersion &&
+ ((contentType == null) ||
+ (contentType.startsWith("text")) ||
+ (contentType.endsWith("xml")) ||
+ (contentType.contains("/javascript")))
+ ) {
writer = response.getWriter();
// Cannot reliably serve partial content with a Writer
ranges = FULL;
@@ -925,7 +906,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;
@@ -940,18 +921,6 @@ public class DefaultServlet extends Http
ranges = FULL;
}
- String outputEncoding = response.getCharacterEncoding();
- Charset charset = B2CConverter.getCharset(outputEncoding);
- boolean conversionRequired;
- if (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())
@@ -971,8 +940,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);
}
}
@@ -988,57 +957,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(resource, renderResult, writer, inputEncoding);
+ copy(resource, 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(resource, 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);
}
}
}
@@ -1111,81 +1052,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 void doDirectoryRedirect(HttpServletRequest request, HttpServletResponse response)
throws IOException {
StringBuilder location = new StringBuilder(request.getRequestURI());
@@ -2153,11 +2019,18 @@ public class DefaultServlet extends Http
IOException exception = null;
+ InputStream resourceInputStream = null;
+ if (resource.isFile()) {
+ resourceInputStream = resource.getInputStream();
+ } else {
+ resourceInputStream = is;
+ }
+
Reader reader;
if (encoding == null) {
- reader = new InputStreamReader(is);
+ reader = new InputStreamReader(resourceInputStream);
} else {
- reader = new InputStreamReader(is, encoding);
+ reader = new InputStreamReader(resourceInputStream, encoding);
}
// Copy the input stream to the output stream
Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1803507&r1=1803506&r2=1803507&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java (original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Mon Jul 31 10:27:30 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");
@@ -233,24 +223,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 =
@@ -396,212 +398,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.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1803507&r1=1803506&r2=1803507&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Jul 31 10:27:30 2017
@@ -48,11 +48,6 @@
<subsection name="Catalina">
<changelog>
<fix>
- <bug>49464</bug>: Improve the Default Servlet's handling of static files
- when the file encoding is not compatible with the required response
- encoding. (markt)
- </fix>
- <fix>
Additional permission for deleting files is granted to JULI as it is
required by FileHandler when running under a Security Manager. The
thread that cleans the log files is marked as daemon thread.
Modified: tomcat/tc8.0.x/trunk/webapps/docs/default-servlet.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/default-servlet.xml?rev=1803507&r1=1803506&r2=1803507&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/default-servlet.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/default-servlet.xml Mon Jul 31 10:27:30 2017
@@ -157,10 +157,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org