Author: markt
Date: Thu May 10 16:20:16 2018
New Revision: 1831354
URL: http://svn.apache.org/viewvc?rev=1831354&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60490
Format improvements to ErrorReportValve
Patch by Michael Osipov
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties
tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 10 16:20:16 2018
@@ -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,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207,1822186,1823164,1823497,1824960,1826872-1826873,1827862,1829310,1829777,1829796,1829935,1830215,1830991,1831042
-/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,1739492,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,1744786,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,1754
950-1754951,1755214,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,1
763430,1763477,1763479,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,1771226,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,178527
1,1785667,1785762,1785774,1785823,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787250,1787662,1788224,1788241-1788242,1788248,1788323-1788324,1788328,1788741,1788747,1788764,1789051,1789400,1789415,1789442,1789685,1789733,1789735,1789744-1789745,1790119,1790180,1790183,1790376,1790443,1791027-1791028,1791050,1791527,1791557,1792460,1792468,1793468,1793487,1793498,1793502,1793514,1793712,1793736,1793746,1793771,1793819,1793980,1794556,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,1800617,1800791,1800816,1800981,1800984,1800988,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802403,180
2475,1802490,1802639,1802796,1802820,1802828,1802833,1802836,1803205,1803446,1803451,1803616,1803828,1803901,1804306,1804461-1804462,1804501,1804506-1804507,1804890,1804906,1805613,1805637,1805645,1805652,1805782,1806736,1806794,1806798,1806801,1806807,1806966,1806973,1807004,1807205-1807206,1807455,1807686,1807698,1808116,1808156,1808266,1808466,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809212,1809214,1809239,1809248,1809265,1809317,1809434,1809669,1809674,1809684,1809711,1809908,1809922,1810106,1810300,1811119,1811122,1811132,1811137,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811328,1811560,1811704,1811837-1811839,1811861,1811932,1812088,1812092,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812617,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815319,1815325,1815451,1815459,1815505,1815615,1815778,1815786,1815790,1815903,1815944,1815954,1816083,1816120,1816128,1816140,1816147,1816157,1816338,1816563,1816647,1817089,
1817092,1817096,1817104,1817126,1817136-1817137,1817196,1817223,1817298,1817305,1817495,1817517,1817520,1818179,1818184,1820003,1820138,1820153,1820194,1820196-1820197,1820202,1820206,1820222,1820272,1820279,1820302,1820634,1820701,1820705,1820932,1821157,1821167,1821197-1821203,1821225,1821234-1821235,1821251,1821293,1821328,1821381,1821490,1821708,1822109,1822111,1822116,1822232,1822644,1822775,1822945-1822946,1823006-1823007,1823111,1823161,1823306,1823310,1823337,1823481,1823492,1823495,1823540,1824297,1824311,1824323,1824357,1824766,1824774,1824892,1824901,1824959,1825054,1825713,1825738,1825872,1826361,1826375,1826688,1826731,1826825,1826867,1826869,1827363,1827368,1827491,1827498,1827860,1828016,1828223-1828239,1828253,1828262,1828545,1828565,1829082,1829084,1829086,1829879,1829915,1829934,1830013,1830051,1830068,1830087,1830325,1830341,1830367,1830373,1830378,1830669-1830670,1830764-1830765,1830772,1830802,1830861,1830989,1831000,1831251,1831256,1831262,1831333,1831338,18313
41-1831342
+/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1779898,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207,1822186,1823164,1823497,1824960,1826872-1826873,1827862,1829310,1829777,1829796,1829935,1830215,1830991,1831042
+/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,1739492,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,1744786,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,1754
950-1754951,1755214,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,1
763430,1763477,1763479,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,1771226,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,1779641,1779654,1779718,1779897,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1781569,1781986,1782814,1782857,1782868,1782946,1783144,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,178475
1,1784963,1785271,1785667,1785762,1785774,1785823,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787250,1787662,1788224,1788241-1788242,1788248,1788323-1788324,1788328,1788741,1788747,1788764,1789051,1789400,1789415,1789442,1789685,1789733,1789735,1789744-1789745,1790119,1790180,1790183,1790376,1790443,1791027-1791028,1791050,1791527,1791557,1792460,1792468,1793468,1793487,1793498,1793502,1793514,1793712,1793736,1793746,1793771,1793819,1793980,1794556,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,1800617,1800791,1800816,1800981,1800984,1800988,1801686,1801688,1801709,1801717,1801774,1801778,180
2083,1802403,1802475,1802490,1802639,1802796,1802820,1802828,1802833,1802836,1803205,1803446,1803451,1803616,1803828,1803901,1804306,1804461-1804462,1804501,1804506-1804507,1804890,1804906,1805613,1805637,1805645,1805652,1805782,1806736,1806794,1806798,1806801,1806807,1806966,1806973,1807004,1807205-1807206,1807455,1807686,1807698,1808116,1808156,1808266,1808466,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809212,1809214,1809239,1809248,1809265,1809317,1809434,1809669,1809674,1809684,1809711,1809908,1809922,1810106,1810300,1811119,1811122,1811132,1811137,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811328,1811560,1811704,1811837-1811839,1811861,1811932,1812088,1812092,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812617,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815319,1815325,1815451,1815459,1815505,1815615,1815778,1815786,1815790,1815903,1815944,1815954,1816083,1816120,1816128,1816140,1816147,1816157,1816338,1816563,
1816647,1817089,1817092,1817096,1817104,1817126,1817136-1817137,1817196,1817223,1817298,1817305,1817495,1817517,1817520,1818179,1818184,1820003,1820138,1820153,1820194,1820196-1820197,1820202,1820206,1820222,1820272,1820279,1820302,1820634,1820701,1820705,1820932,1821157,1821167,1821197-1821203,1821225,1821234-1821235,1821251,1821293,1821328,1821381,1821490,1821708,1822109,1822111,1822116,1822232,1822644,1822775,1822945-1822946,1823006-1823007,1823111,1823161,1823306,1823310,1823337,1823481,1823492,1823495,1823540,1824297,1824311,1824323,1824357,1824766,1824774,1824892,1824901,1824959,1825054,1825713,1825738,1825872,1826361,1826375,1826688,1826731,1826825,1826867,1826869,1827363,1827368,1827491,1827498,1827860,1828016,1828223-1828239,1828253,1828262,1828545,1828565,1829082,1829084,1829086,1829879,1829915,1829934,1830013,1830051,1830068,1830087,1830325,1830341,1830367,1830373,1830378,1830669-1830670,1830764-1830765,1830772,1830802,1830861,1830989,1831000,1831251,1831256,1831262,18313
33,1831338,1831341-1831342
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1831354&r1=1831353&r2=1831354&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Thu May 10 16:20:16 2018
@@ -28,6 +28,7 @@ import org.apache.catalina.connector.Req
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
+import org.apache.catalina.util.TomcatCSS;
import org.apache.coyote.ActionCode;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
@@ -161,67 +162,67 @@ public class ErrorReportValve extends Va
}
}
- // Do nothing if there is no report for the specified status code and
+ // Do nothing if there is no reason phrase for the specified status
code and
// no error message provided
- String report = null;
+ String reason = null;
+ String description = null;
StringManager smClient = StringManager.getManager(
Constants.Package, request.getLocales());
response.setLocale(smClient.getLocale());
try {
- report = smClient.getString("http." + statusCode);
+ reason = smClient.getString("http." + statusCode + ".reason");
+ description = smClient.getString("http." + statusCode + ".desc");
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
}
- if (report == null) {
- if (message.length() == 0) {
+ if (reason == null || description == null) {
+ if (message.isEmpty()) {
return;
} else {
- report = smClient.getString("errorReportValve.noDescription");
+ reason = smClient.getString("errorReportValve.unknownReason");
+ description =
smClient.getString("errorReportValve.noDescription");
}
}
StringBuilder sb = new StringBuilder();
- sb.append("<!DOCTYPE html><html><head>");
- if(showServerInfo || showReport){
- sb.append("<title>");
- if(showServerInfo) {
- sb.append(ServerInfo.getServerInfo()).append(" - ");
- }
- sb.append(smClient.getString("errorReportValve.errorReport"));
- sb.append("</title>");
- sb.append("<style type=\"text/css\">");
- sb.append(org.apache.catalina.util.TomcatCSS.TOMCAT_CSS);
- sb.append("</style> ");
- } else {
- sb.append("<title>");
- sb.append(smClient.getString("errorReportValve.errorReport"));
- sb.append("</title>");
- }
+ sb.append("<!doctype html><html lang=\"");
+ sb.append(smClient.getLocale().getLanguage()).append("\">");
+ sb.append("<head>");
+ sb.append("<title>");
+ sb.append(smClient.getString("errorReportValve.statusHeader",
+ String.valueOf(statusCode), reason));
+ sb.append("</title>");
+ sb.append("<style type=\"text/css\">");
+ sb.append(TomcatCSS.TOMCAT_CSS);
+ sb.append("</style>");
sb.append("</head><body>");
sb.append("<h1>");
sb.append(smClient.getString("errorReportValve.statusHeader",
- String.valueOf(statusCode), message)).append("</h1>");
- if (showReport) {
- sb.append("<div class=\"line\"></div>");
- sb.append("<p><b>type</b> ");
+ String.valueOf(statusCode), reason)).append("</h1>");
+ if (isShowReport()) {
+ sb.append("<hr class=\"line\" />");
+ sb.append("<p><b>");
+ sb.append(smClient.getString("errorReportValve.type"));
+ sb.append("</b> ");
if (throwable != null) {
sb.append(smClient.getString("errorReportValve.exceptionReport"));
} else {
sb.append(smClient.getString("errorReportValve.statusReport"));
}
sb.append("</p>");
- sb.append("<p><b>");
- sb.append(smClient.getString("errorReportValve.message"));
- sb.append("</b> <u>");
- sb.append(message).append("</u></p>");
+ if (!message.isEmpty()) {
+ sb.append("<p><b>");
+ sb.append(smClient.getString("errorReportValve.message"));
+ sb.append("</b> ");
+ sb.append(message).append("</p>");
+ }
sb.append("<p><b>");
sb.append(smClient.getString("errorReportValve.description"));
- sb.append("</b> <u>");
- sb.append(report);
- sb.append("</u></p>");
+ sb.append("</b> ");
+ sb.append(description);
+ sb.append("</p>");
if (throwable != null) {
-
String stackTrace = getPartialServletStackTrace(throwable);
sb.append("<p><b>");
sb.append(smClient.getString("errorReportValve.exception"));
@@ -245,15 +246,14 @@ public class ErrorReportValve extends Va
sb.append("<p><b>");
sb.append(smClient.getString("errorReportValve.note"));
- sb.append("</b> <u>");
-
sb.append(smClient.getString("errorReportValve.rootCauseInLogs",
- showServerInfo?ServerInfo.getServerInfo():""));
- sb.append("</u></p>");
+ sb.append("</b> ");
+
sb.append(smClient.getString("errorReportValve.rootCauseInLogs"));
+ sb.append("</p>");
}
- sb.append("<hr class=\"line\">");
+ sb.append("<hr class=\"line\" />");
}
- if (showServerInfo) {
+ if (isShowServerInfo()) {
sb.append("<h3>").append(ServerInfo.getServerInfo()).append("</h3>");
}
sb.append("</body></html>");
@@ -290,7 +290,7 @@ public class ErrorReportValve extends Va
*/
protected String getPartialServletStackTrace(Throwable t) {
StringBuilder trace = new StringBuilder();
- trace.append(t.toString()).append('\n');
+ trace.append(t.toString()).append(System.lineSeparator());
StackTraceElement[] elements = t.getStackTrace();
int pos = elements.length;
for (int i = elements.length - 1; i >= 0; i--) {
@@ -304,7 +304,7 @@ public class ErrorReportValve extends Va
for (int i = 0; i < pos; i++) {
if (!(elements[i].getClassName().startsWith
("org.apache.catalina.core."))) {
- trace.append('\t').append(elements[i].toString()).append('\n');
+
trace.append('\t').append(elements[i].toString()).append(System.lineSeparator());
}
}
return trace.toString();
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1831354&r1=1831353&r2=1831354&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
Thu May 10 16:20:16 2018
@@ -31,16 +31,17 @@ accessLogValve.invalidPortType=Invalid p
accessLogValve.writeFail=Failed to write log message [{0}]
# Error report valve
-errorReportValve.errorReport=Error report
-errorReportValve.statusHeader=HTTP Status {0} - {1}
-errorReportValve.exceptionReport=Exception report
-errorReportValve.statusReport=Status report
-errorReportValve.message=message
-errorReportValve.description=description
-errorReportValve.exception=exception
-errorReportValve.rootCause=root cause
-errorReportValve.note=note
-errorReportValve.rootCauseInLogs=The full stack trace of the root cause is
available in the {0} logs.
+errorReportValve.statusHeader=HTTP Status {0} \u2013 {1}
+errorReportValve.type=Type
+errorReportValve.exceptionReport=Exception Report
+errorReportValve.statusReport=Status Report
+errorReportValve.message=Message
+errorReportValve.description=Description
+errorReportValve.exception=Exception
+errorReportValve.rootCause=Root Cause
+errorReportValve.note=Note
+errorReportValve.rootCauseInLogs=The full stack trace of the root cause is
available in the server logs.
+errorReportValve.unknownReason=Unknown Reason
errorReportValve.noDescription=No description available
# Remote IP valve
@@ -58,65 +59,84 @@ stuckThreadDetectionValve.notifyStuckThr
stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread "{0}" (id={3}) was
previously reported to be stuck but has completed. It was active for
approximately {1} milliseconds.{2,choice,0#|0< There is/are still {2} thread(s)
that are monitored by this Valve and may be stuck.}
stuckThreadDetectionValve.notifyStuckThreadInterrupted=Thread "{0}" (id={5})
has been interrupted because it was active for {1} milliseconds (since {2}) to
serve the same request for {3} and was probably stuck (configured interruption
threshold for this StuckThreadDetectionValve is {4} seconds).
-# HTTP status reports
+# HTTP status reports (error codes only)
# All status codes registered with IANA can be found at
# http://www.iana.org/assignments/http-status-codes/http-status-codes.xml
# The list might be kept in sync with the one in
# org/apache/tomcat/util/http/res/LocalStrings.properties.
-http.100=The client may continue.
-http.101=The server is switching protocols according to the "Upgrade" header.
-http.102=The server has accepted the complete request, but has not yet
completed it.
-http.201=The request succeeded and a new resource has been created on the
server.
-http.202=This request was accepted for processing, but has not been completed.
-http.203=The meta information presented by the client did not originate from
the server.
-http.204=The request succeeded but there is no information to return.
-http.205=The client should reset the document view which caused this request
to be sent.
-http.206=The server has fulfilled a partial GET request for this resource.
-http.207=Multiple status values have been returned.
-http.208=This collection binding was already reported.
-http.226=The response is a representation of the result of one or more
instance-manipulations applied to the current instance.
-http.300=The requested resource corresponds to any one of a set of
representations, each with its own specific location.
-http.301=The requested resource has moved permanently to a new location.
-http.302=The requested resource has moved temporarily to a new location.
-http.303=The response to this request can be found under a different URI.
-http.304=The requested resource is available and has not been modified.
-http.305=The requested resource must be accessed through the proxy given by
the "Location" header.
-http.307=The requested resource resides temporarily under a different URI.
-http.308=The target resource has been assigned a new permanent URI and any
future references to this resource SHOULD use one of the returned URIs.
-http.400=The request sent by the client was syntactically incorrect.
-http.401=This request requires HTTP authentication.
-http.402=Payment is required for access to this resource.
-http.403=Access to the specified resource has been forbidden.
-http.404=The requested resource is not available.
-http.405=The specified HTTP method is not allowed for the requested resource.
-http.406=The resource identified by this request is only capable of generating
responses with characteristics not acceptable according to the request "accept"
headers.
-http.407=The client must first authenticate itself with the proxy.
-http.408=The client did not produce a request within the time that the server
was prepared to wait.
-http.409=The request could not be completed due to a conflict with the current
state of the resource.
-http.410=The requested resource is no longer available, and no forwarding
address is known.
-http.411=This request cannot be handled without a defined content length.
-http.412=A specified precondition has failed for this request.
-http.413=The request entity is larger than the server is willing or able to
process.
-http.414=The server refused this request because the request URI was too long.
-http.415=The server refused this request because the request entity is in a
format not supported by the requested resource for the requested method.
-http.416=The requested byte range cannot be satisfied.
-http.417=The expectation given in the "Expect" request header could not be
fulfilled.
-http.422=The server understood the content type and syntax of the request but
was unable to process the contained instructions.
-http.423=The source or destination resource of a method is locked.
-http.424=The method could not be performed on the resource because the
requested action depended on another action and that action failed.
-http.426=The request can only be completed after a protocol upgrade.
-http.428=The request is required to be conditional.
-http.429=The user has sent too many requests in a given amount of time.
-http.431=The server refused this request because the request header fields are
too large.
-http.451=The server refused this request for legal reasons.
-http.500=The server encountered an internal error that prevented it from
fulfilling this request.
-http.501=The server does not support the functionality needed to fulfill this
request.
-http.502=This server received an invalid response from a server it consulted
when acting as a proxy or gateway.
-http.503=The requested service is not currently available.
-http.504=The server received a timeout from an upstream server while acting as
a gateway or proxy.
-http.505=The server does not support the requested HTTP protocol version.
-http.506=The chosen variant resource is configured to engage in transparent
content negotiation itself, and is therefore not a proper end point in the
negotiation process.
-http.507=The resource does not have sufficient space to record the state of
the resource after execution of this method.
-http.508=The server terminated an operation because it encountered an infinite
loop.
-http.510=The policy for accessing the resource has not been met in the request.
-http.511=The client needs to authenticate to gain network access.
+http.400.reason=Bad Request
+http.400.desc=The server cannot or will not process the request due to
something that is perceived to be a client error (e.g., malformed request
syntax, invalid request message framing, or deceptive request routing).
+http.401.reason=Unauthorized
+http.401.desc=The request has not been applied because it lacks valid
authentication credentials for the target resource.
+http.402.reason=Payment Required
+http.402.desc=This status code is reserved for future use.
+http.403.reason=Forbidden
+http.403.desc=The server understood the request but refuses to authorize it.
+http.404.reason=Not Found
+http.404.desc=The origin server did not find a current representation for the
target resource or is not willing to disclose that one exists.
+http.405.reason=Method Not Allowed
+http.405.desc=The method received in the request-line is known by the origin
server but not supported by the target resource.
+http.406.reason=Not Acceptable
+http.406.desc= The target resource does not have a current representation that
would be acceptable to the user agent, according to the proactive negotiation
header fields received in the request, and the server is unwilling to supply a
default representation.
+http.407.reason=Proxy Authentication Required
+http.407.desc=This status code is similar to 401 (Unauthorized), but it
indicates that the client needs to authenticate itself in order to use a proxy.
+http.408.reason=Request Timeout
+http.408.desc= The server did not receive a complete request message within
the time that it was prepared to wait.
+http.409.reason=Conflict
+http.409.desc=The request could not be completed due to a conflict with the
current state of the target resource.
+http.410.reason=Gone
+http.410.desc= Access to the target resource is no longer available at the
origin server and that this condition is likely to be permanent.
+http.411.reason=Length Required
+http.411.desc=The server refuses to accept the request without a defined
Content-Length.
+http.412.reason=Precondition Failed
+http.412.desc=One or more conditions given in the request header fields
evaluated to false when tested on the server.
+http.413.reason=Payload Too Large
+http.413.desc=The server is refusing to process a request because the request
payload is larger than the server is willing or able to process.
+http.414.reason=URI Too Long
+http.414.desc=The server is refusing to service the request because the
request-target is longer than the server is willing to interpret.
+http.415.reason=Unsupported Media Type
+http.415.desc=The origin server is refusing to service the request because the
payload is in a format not supported by this method on the target resource.
+http.416.reason=Range Not Satisfiable
+http.416.desc=None of the ranges in the request's Range header field overlap
the current extent of the selected resource or that the set of ranges requested
has been rejected due to invalid ranges or an excessive request of small or
overlapping ranges.
+http.417.reason=Expectation Failed
+http.417.desc=The expectation given in the request's Expect header field could
not be met by at least one of the inbound servers.
+http.421.reason=Misdirected Request
+http.421.desc=The request was directed at a server that is not able to produce
a response.
+http.422.reason=Unprocessable Entity
+http.422.desc=The server understands the content type of the request entity,
and the syntax of the request entity is correct but was unable to process the
contained instructions.
+http.423.reason=Locked
+http.423.desc=The source or destination resource of a method is locked.
+http.424.reason=Failed Dependency
+http.424.desc=The method could not be performed on the resource because the
requested action depended on another action and that action failed.
+http.426.reason=Upgrade Required
+http.426.desc=the server refuses to perform the request using the current
protocol but might be willing to do so after the client upgrades to a different
protocol.
+http.428.reason=Precondition Required
+http.428.desc=The origin server requires the request to be conditional.
+http.429.reason=Too Many Requests
+http.429.desc=The user has sent too many requests in a given amount of time
("rate limiting").
+http.431.reason=Request Header Fields Too Large
+http.431.desc=The server is unwilling to process the request because its
header fields are too large.
+http.451.reason=Unavailable For Legal Reasons
+http.451.desc=The server refused this request for legal reasons.
+http.500.reason=Internal Server Error
+http.500.desc=The server encountered an unexpected condition that prevented it
from fulfilling the request.
+http.501.reason=Not Implemented
+http.501.desc=The server does not support the functionality required to
fulfill the request.
+http.502.reason=Bad Gateway
+http.502.desc=The server, while acting as a gateway or proxy, received an
invalid response from an inbound server it accessed while attempting to fulfill
the request.
+http.503.reason=Service Unavailable
+http.503.desc=The server is currently unable to handle the request due to a
temporary overload or scheduled maintenance, which will likely be alleviated
after some delay.
+http.504.reason=Gateway Timeout
+http.504.desc=The server, while acting as a gateway or proxy, did not receive
a timely response from an upstream server it needed to access in order to
complete the request.
+http.505.reason=HTTP Version Not Supported
+http.505.desc=The server does not support, or refuses to support, the major
version of HTTP that was used in the request message.
+http.506.reason=Variant Also Negotiates
+http.506.desc=The server has an internal configuration error: the chosen
variant resource is configured to engage in transparent content negotiation
itself, and is thereforenot a proper end point in the negotiation process.
+http.507.reason=Insufficient Storage
+http.507.desc=The method could not be performed on the resource because the
server is unable to store the representation needed to successfully complete
the request.
+http.508.reason=Loop Detected
+http.508.desc=The server terminated an operation because it encountered an
infinite loop while processing a request with "Depth: infinity".
+http.510.reason=Not Extended
+http.510.desc=The policy for accessing the resource has not been met in the
request
+http.511.reason=Network Authentication Required
+http.511.desc=The client needs to authenticate to gain network access.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties?rev=1831354&r1=1831353&r2=1831354&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
Thu May 10 16:20:16 2018
@@ -20,8 +20,8 @@ accessLogValve.closeFail = No pude cerra
accessLogValve.openDirFail = No pude crear directorio [{0}] para historiales
de acceso
accessLogValve.rotateFail = No pude rotar historial de acceso
# Error report valve
-errorReportValve.errorReport = Informe de Error
-errorReportValve.statusHeader = Estado HTTP {0} - {1}
+errorReportValve.statusHeader = Estado HTTP {0} \u2013 {1}
+errorReportValve.type=Tipo
errorReportValve.exceptionReport = Informe de Excepci\u00F3n
errorReportValve.statusReport = Informe de estado
errorReportValve.message = mensaje
@@ -29,52 +29,39 @@ errorReportValve.description = descripci
errorReportValve.exception = excepci\u00F3n
errorReportValve.rootCause = causa ra\u00EDz
errorReportValve.note = nota
-errorReportValve.rootCauseInLogs = La traza completa de la causa de este error
se encuentra en los archivos de diario de {0}.
+errorReportValve.rootCauseInLogs = La traza completa de la causa de este error
se encuentra en los archivos de diario del servidor.
+
remoteIpValve.invalidPortHeader = Valor inv\u00E1lido [{0}] hallado para el
puerto en cabecera HTTP [{1}]
sslValve.certError = No pude procesar cadena de certificado [{0}] para crear
un objeto java.security.cert.X509Certificate
sslValve.invalidProvider = El proveedor de SSL especificado en el conecto
asociado con este requerimiento de [{0}] ies inv\u00E1lido. No se pueden
procesar los datos del certificado.
stuckThreadDetectionValve.notifyStuckThreadDetected = El hilo "{0}" (id={6})
ha estado activo durante {1} miilisegundos (desde {2}) para servir el mismo
requerimiento para {4} y puede estar atascado (el umbral configurado para este
StuckThreadDetectionValve es de {5} segundos). Hay {3} hilo(s) en total que son
monitorizados por esta V\u00E1lvula y pueden estar atascados.
stuckThreadDetectionValve.notifyStuckThreadCompleted = El hilo "{0}" (id={3}),
que previamente se report\u00F3 como atascado, se ha completado. Estuvo activo
por aproximadamente {1} milisegundos. {2, choice,0\#|0< Hay a\u00FAn {2}
hilo(s) que son monitorizados por esta V\u00E1lvula y pueden estar atascados.}
+
# HTTP status reports
-http.100 = El cliente puede continuar.
-http.101 = El servidor est\u00E1 conmutando protocolos con arreglo a la
cabecera "Upgrade".
-http.201 = El requerimiento tuvo \u00E9xito y un nuevo recurso ha sido creado
en el servidor.
-http.202 = Este requerimiento ha sido aceptado para ser procesado, pero no ha
sido completado.
-http.203 = La informaci\u00F3n meta presentada por el cliente no se
origin\u00F3 desde el servidor.
-http.204 = El requerimiento tuvo \u00E9xito pero no hay informaci\u00F3n que
devolver.
-http.205 = El cliente no deber\u00EDa de limpiar la vista del documento que
caus\u00F3 que este requerimiento fuera enviado.
-http.206 = El servidor ha rellenado paci\u00E1lmente un requerimiento GET para
este recurso.
-http.207 = Se han devuelto valores m\u00FAltiples de estado.
-http.300 = El recurso requerido corresponde a una cualquiera de un conjunto de
representaciones, cada una con su propia localizaci\u00F3n espec\u00EDfica.
-http.301 = El recurso requerido ha sido movido perman\u00E9ntemente a una
nueva localizaci\u00F3n.
-http.302 = El recurso requerido ha sido movido tempor\u00E1lmente a una nueva
localizaci\u00F3n.
-http.303 = La respuesta a este requerimiento se puede hallar bajo una URI
diferente.
-http.304 = El recurso requerido est\u00E1 disponible y no ha sido modificado.
-http.305 = El recurso requerido debe de ser accedido a trav\u00E9s del
apoderado (proxy) dado mediante la cabecera "Location".
-http.400 = El requerimiento enviado por el cliente era sint\u00E1cticamente
incorrecto.
-http.401 = Este requerimiento requiere autenticaci\u00F3n HTTP.
-http.402 = Se requiere pago para acceder a este recurso.
-http.403 = El acceso al recurso especificado ha sido prohibido.
-http.404 = El recurso requerido no est\u00E1 disponible.
-http.405 = El m\u00E9todo HTTP especificado no est\u00E1 permitido para el
recurso requerido.
-http.406 = El recurso identificado por este requerimiento s\u00F3lo es capaz
de generar respuestas con caracter\u00EDsticas no aceptables con arreglo a las
cabeceras "accept" de requerimiento.
-http.407 = El cliente debe de ser primero autenticado en el apoderado.
-http.408 = El cliente no produjo un requerimiento dentro del tiempo en que el
servidor estaba preparado esperando.
-http.409 = El requerimiento no pudo ser completado debido a un conflicto con
el estado actual del recurso.
-http.410 = El recurso requerido ya no est\u00E1 disponible y no se conoce
direcci\u00F3n de reenv\u00EDo.
-http.411 = Este requerimiento no puede ser manejado sin un tama\u00F1o
definido de contenido.
-http.412 = Una precondici\u00F3n especificada ha fallado para este
requerimiento.
-http.413 = La entidad de requerimiento es mayor de lo que el servidor quiere o
puede procesar.
-http.414 = El servidor rechaz\u00F3 este requerimiento porque la URI requerida
era demasiado larga.
-http.415 = El servidor rechaz\u00F3 este requerimiento porque la entidad
requerida se encuentra en un formato no soportado por el recurso requerido para
el m\u00E9todo requerido.
-http.416 = El rango de byte requerido no puede ser satisfecho.
-http.417 = Lo que se espera dado por la cabecera "Expect" de requerimiento no
pudo ser completado.
-http.422 = El servidor entendi\u00F3 el tipo de contenido y la sint\u00E1xis
del requerimiento pero no pudo procesar las instrucciones contenidas.
-http.423 = La fuente o recurso de destino de un m\u00E9todo est\u00E1
bloqueada.
-http.500 = El servidor encontr\u00F3 un error interno que hizo que no pudiera
rellenar este requerimiento.
-http.501 = El servidor no soporta la funcionalidad necesaria para rellenar
este requerimiento.
-http.502 = Este servidor recibi\u00F3 una respuesta inv\u00E1lida desde un
servidor que consult\u00F3 cuando actuaba como apoderado o pasarela.
-http.503 = El servicio requerido no est\u00E1 disponible en este momento.
-http.504 = El servidor recibi\u00F3 un Tiempo Agotado desde un servidor
superior cuando actuaba como pasarela o apoderado.
-http.505 = El servidor no soporta la versi\u00F3n de protocolo HTTP requerida.
-http.507 = El recurso no tiene espacio suficiente para registrar el estado del
recurso tras la ejecuci\u00F3n de este m\u00E9todo.
+http.400.desc = El requerimiento enviado por el cliente era
sint\u00E1cticamente incorrecto.
+http.401.desc = Este requerimiento requiere autenticaci\u00F3n HTTP.
+http.402.desc = Se requiere pago para acceder a este recurso.
+http.403.desc = El acceso al recurso especificado ha sido prohibido.
+http.404.desc = El recurso requerido no est\u00E1 disponible.
+http.405.desc = El m\u00E9todo HTTP especificado no est\u00E1 permitido para
el recurso requerido.
+http.406.desc = El recurso identificado por este requerimiento s\u00F3lo es
capaz de generar respuestas con caracter\u00EDsticas no aceptables con arreglo
a las cabeceras "accept" de requerimiento.
+http.407.desc = El cliente debe de ser primero autenticado en el apoderado.
+http.408.desc = El cliente no produjo un requerimiento dentro del tiempo en
que el servidor estaba preparado esperando.
+http.409.desc = El requerimiento no pudo ser completado debido a un conflicto
con el estado actual del recurso.
+http.410.desc = El recurso requerido ya no est\u00E1 disponible y no se conoce
direcci\u00F3n de reenv\u00EDo.
+http.411.desc = Este requerimiento no puede ser manejado sin un tama\u00F1o
definido de contenido.
+http.412.desc = Una precondici\u00F3n especificada ha fallado para este
requerimiento.
+http.413.desc = La entidad de requerimiento es mayor de lo que el servidor
quiere o puede procesar.
+http.414.desc = El servidor rechaz\u00F3 este requerimiento porque la URI
requerida era demasiado larga.
+http.415.desc = El servidor rechaz\u00F3 este requerimiento porque la entidad
requerida se encuentra en un formato no soportado por el recurso requerido para
el m\u00E9todo requerido.
+http.416.desc = El rango de byte requerido no puede ser satisfecho.
+http.417.desc = Lo que se espera dado por la cabecera "Expect" de
requerimiento no pudo ser completado.
+http.422.desc = El servidor entendi\u00F3 el tipo de contenido y la
sint\u00E1xis del requerimiento pero no pudo procesar las instrucciones
contenidas.
+http.423.desc = La fuente o recurso de destino de un m\u00E9todo est\u00E1
bloqueada.
+http.500.desc = El servidor encontr\u00F3 un error interno que hizo que no
pudiera rellenar este requerimiento.
+http.501.desc = El servidor no soporta la funcionalidad necesaria para
rellenar este requerimiento.
+http.502.desc = Este servidor recibi\u00F3 una respuesta inv\u00E1lida desde
un servidor que consult\u00F3 cuando actuaba como apoderado o pasarela.
+http.503.desc = El servicio requerido no est\u00E1 disponible en este momento.
+http.504.desc = El servidor recibi\u00F3 un Tiempo Agotado desde un servidor
superior cuando actuaba como pasarela o apoderado.
+http.505.desc = El servidor no soporta la versi\u00F3n de protocolo HTTP
requerida.
+http.507.desc = El recurso no tiene espacio suficiente para registrar el
estado del recurso tras la ejecuci\u00F3n de este m\u00E9todo.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties?rev=1831354&r1=1831353&r2=1831354&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
Thu May 10 16:20:16 2018
@@ -14,8 +14,8 @@
# limitations under the License.
# Error report valve
-errorReportValve.errorReport=Rapport d''erreur
-errorReportValve.statusHeader=Etat HTTP {0} - {1}
+errorReportValve.statusHeader=\u00c9tat HTTP {0} \u2013 {1}
+errorReportValve.type=Type
errorReportValve.exceptionReport=Rapport d''exception
errorReportValve.statusReport=Rapport d''\u00e9tat
errorReportValve.message=message
@@ -23,48 +23,33 @@ errorReportValve.description=description
errorReportValve.exception=exception
errorReportValve.rootCause=cause m\u00e8re
errorReportValve.note=note
-errorReportValve.rootCauseInLogs=La trace compl\u00e8te de la cause m\u00e8re
de cette erreur est disponible dans les fichiers journaux de {0}.
+errorReportValve.rootCauseInLogs=La trace compl\u00e8te de la cause m\u00e8re
de cette erreur est disponible dans les fichiers journaux de ce serveur.
# HTTP status reports
-http.100=Le client peut continuer.
-http.101=Le serveur change de protocoles suivant la directive "Upgrade" de
l''ent\u00eate.
-http.201=La requ\u00eate a r\u00e9ussi et une nouvelle ressource a
\u00e9t\u00e9 cr\u00e9\u00e9e sur le serveur.
-http.202=La requ\u00eate a \u00e9t\u00e9 accept\u00e9e pour traitement, mais
n''a pas \u00e9t\u00e9 termin\u00e9e.
-http.203=L''information meta pr\u00e9sent\u00e9e par le client n''a pas pour
origine ce serveur.
-http.204=La requ\u00eate a r\u00e9ussi mais il n''y a aucune information
\u00e0 retourner.
-http.205=Le client doit remettre \u00e0 z\u00e9ro la vue de document qui a
caus\u00e9 l''envoi de cette requ\u00eate.
-http.206=Le serveur a satisfait une requ\u00eate GET partielle pour cette
ressource.
-http.207=Plusieurs valeurs d''\u00e9tats ont \u00e9t\u00e9 retourn\u00e9es.
-http.300=La ressource demand\u00e9e correspond \u00e0 plusieurs
repr\u00e9sentations, chacune avec sa propre localisation.
-http.301=La ressource demand\u00e9e a \u00e9t\u00e9 d\u00e9plac\u00e9e de
fa\u00e7on permanente vers une nouvelle localisation.
-http.302=La ressource demand\u00e9e a \u00e9t\u00e9 d\u00e9plac\u00e9e de
fa\u00e7on temporaire vers une nouvelle localisation.
-http.303=La r\u00e9ponse \u00e0 cette requ\u00eate peut \u00eatre trouv\u00e9e
\u00e0 une URI diff\u00e9rente.
-http.304=La ressource demand\u00e9e est disponible et n''a pas \u00e9t\u00e9
modifi\u00e9e.
-http.305=La ressource demand\u00e9e doit \u00eatre acc\u00e9d\u00e9e au
travers du relais indiqu\u00e9 par la directive "Location" de l''ent\u00eate.
-http.400=La requ\u00eate envoy\u00e9e par le client \u00e9tait syntaxiquement
incorrecte.
-http.401=La requ\u00eate n\u00e9cessite une authentification HTTP.
-http.402=Un paiement est demand\u00e9 pour acc\u00e9der \u00e0 cette ressource.
-http.403=L''acc\u00e8s \u00e0 la ressource demand\u00e9e a \u00e9t\u00e9
interdit.
-http.404=La ressource demand\u00e9e n''est pas disponible.
-http.405=La m\u00e9thode HTTP sp\u00e9cifi\u00e9e n''est pas autoris\u00e9e
pour la ressource demand\u00e9e.
-http.406=La ressource identifi\u00e9e par cette requ\u00eate n''est capable de
g\u00e9n\u00e9rer des r\u00e9ponses qu''avec des caract\u00e9ristiques
incompatible avec la directive "accept" pr\u00e9sente dans l''ent\u00eate de
requ\u00eate.
-http.407=Le client doit d''abord s''authentifier aupr\u00e8s du relais.
-http.408=Le client n''a pas produit de requ\u00eate pendant le temps
d''attente du serveur.
-http.409=La requ\u00eate ne peut \u00eatre finalis\u00e9e suite \u00e0 un
conflit li\u00e9 \u00e0 l''\u00e9tat de la ressource.
-http.410=La ressource demand\u00e9e n''est pas disponible, et aucune addresse
de rebond (forwarding) n''est connue.
-http.411=La requ\u00eate ne peut \u00eatre trait\u00e9e sans d\u00e9finition
d''une taille de contenu (content length).
-http.412=Une condition pr\u00e9alable demand\u00e9e n''est pas satisfaite pour
cette requ\u00eate.
-http.413=L''entit\u00e9 de requ\u00eate est plus importante que ce que le
serveur veut ou peut traiter.
-http.414=Le serveur a refus\u00e9 cette requ\u00eate car l''URI de
requ\u00eate est trop longue.
-http.415=Le serveur a refus\u00e9 cette requ\u00eate car l''entit\u00e9 de
requ\u00eate est dans un format non support\u00e9 par la ressource
demand\u00e9e avec la m\u00e9thode sp\u00e9cifi\u00e9e.
-http.416=La plage d''octets demand\u00e9e (byte range) ne peut \u00eatre
satisfaite.
-http.417=L''attente indiqu\u00e9e dans la directive "Expect" de l''ent\u00eate
de requ\u00eate ne peut \u00eatre satisfaite.
-http.422=Le serveur a compris le type de contenu (content type) ainsi que la
syntaxe de la requ\u00eate mais a \u00e9t\u00e9 incapable de traiter les
instructions contenues.
-http.423=La ressource source ou destination de la m\u00e9thode est
verrouill\u00e9e.
-http.500=Le serveur a rencontr\u00e9 une erreur interne qui l''a
emp\u00each\u00e9 de satisfaire la requ\u00eate.
-http.501=Le serveur ne supporte pas la fonctionnalit\u00e9 demand\u00e9e pour
satisfaire cette requ\u00eate.
-http.502=Le serveur a re\u00e7u une r\u00e9ponse invalide d''un serveur qu''il
consultait en tant que relais ou passerelle.
-http.503=Le service demand\u00e9 n''est pas disponible actuellement.
-http.504=Le serveur a re\u00e7u un d\u00e9passement de delai (timeout) d''un
serveur amont qu''il consultait en tant que relais ou passerelle.
-http.505=Le serveur ne supporte pas la version demand\u00e9e du protocole HTTP.
-http.507=L''espace disponible est insuffisant pour enregistrer l''\u00e9tat de
la ressource apr\u00e8s ex\u00e9cution de cette m\u00e9thode.
+http.400.desc=La requ\u00eate envoy\u00e9e par le client \u00e9tait
syntaxiquement incorrecte.
+http.401.desc=La requ\u00eate n\u00e9cessite une authentification HTTP.
+http.402.desc=Un paiement est demand\u00e9 pour acc\u00e9der \u00e0 cette
ressource.
+http.403.desc=L''acc\u00e8s \u00e0 la ressource demand\u00e9e a \u00e9t\u00e9
interdit.
+http.404.desc=La ressource demand\u00e9e n''est pas disponible.
+http.405.desc=La m\u00e9thode HTTP sp\u00e9cifi\u00e9e n''est pas
autoris\u00e9e pour la ressource demand\u00e9e.
+http.406.desc=La ressource identifi\u00e9e par cette requ\u00eate n''est
capable de g\u00e9n\u00e9rer des r\u00e9ponses qu''avec des
caract\u00e9ristiques incompatible avec la directive "accept" pr\u00e9sente
dans l''ent\u00eate de requ\u00eate.
+http.407.desc=Le client doit d''abord s''authentifier aupr\u00e8s du relais.
+http.408.desc=Le client n''a pas produit de requ\u00eate pendant le temps
d''attente du serveur.
+http.409.desc=La requ\u00eate ne peut \u00eatre finalis\u00e9e suite \u00e0 un
conflit li\u00e9 \u00e0 l''\u00e9tat de la ressource.
+http.410.desc=La ressource demand\u00e9e n''est pas disponible, et aucune
addresse de rebond (forwarding) n''est connue.
+http.411.desc=La requ\u00eate ne peut \u00eatre trait\u00e9e sans
d\u00e9finition d''une taille de contenu (content length).
+http.412.desc=Une condition pr\u00e9alable demand\u00e9e n''est pas satisfaite
pour cette requ\u00eate.
+http.413.desc=L''entit\u00e9 de requ\u00eate est plus importante que ce que le
serveur veut ou peut traiter.
+http.414.desc=Le serveur a refus\u00e9 cette requ\u00eate car l''URI de
requ\u00eate est trop longue.
+http.415.desc=Le serveur a refus\u00e9 cette requ\u00eate car l''entit\u00e9
de requ\u00eate est dans un format non support\u00e9 par la ressource
demand\u00e9e avec la m\u00e9thode sp\u00e9cifi\u00e9e.
+http.416.desc=La plage d''octets demand\u00e9e (byte range) ne peut \u00eatre
satisfaite.
+http.417.desc=L''attente indiqu\u00e9e dans la directive "Expect" de
l''ent\u00eate de requ\u00eate ne peut \u00eatre satisfaite.
+http.422.desc=Le serveur a compris le type de contenu (content type) ainsi que
la syntaxe de la requ\u00eate mais a \u00e9t\u00e9 incapable de traiter les
instructions contenues.
+http.423.desc=La ressource source ou destination de la m\u00e9thode est
verrouill\u00e9e.
+http.500.desc=Le serveur a rencontr\u00e9 une erreur interne qui l''a
emp\u00each\u00e9 de satisfaire la requ\u00eate.
+http.501.desc=Le serveur ne supporte pas la fonctionnalit\u00e9 demand\u00e9e
pour satisfaire cette requ\u00eate.
+http.502.desc=Le serveur a re\u00e7u une r\u00e9ponse invalide d''un serveur
qu''il consultait en tant que relais ou passerelle.
+http.503.desc=Le service demand\u00e9 n''est pas disponible actuellement.
+http.504.desc=Le serveur a re\u00e7u un d\u00e9passement de delai (timeout)
d''un serveur amont qu''il consultait en tant que relais ou passerelle.
+http.505.desc=Le serveur ne supporte pas la version demand\u00e9e du protocole
HTTP.
+http.507.desc=L''espace disponible est insuffisant pour enregistrer
l''\u00e9tat de la ressource apr\u00e8s ex\u00e9cution de cette m\u00e9thode.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties?rev=1831354&r1=1831353&r2=1831354&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties
Thu May 10 16:20:16 2018
@@ -16,11 +16,10 @@
jdbcAccessLogValve.exception=\u30a2\u30af\u30bb\u30b9\u30a8\u30f3\u30c8\u30ea\u306e\u633f\u5165\u3092\u5b9f\u884c\u4e2d\u306e\u4f8b\u5916\u3067\u3059
# Error report valve
errorReportValve.statusHeader=HTTP\u30b9\u30c6\u30fc\u30bf\u30b9 {0} - {1}
-errorReportValve.exceptionReport=\u4f8b\u5916\u30ec\u30dd\u30fc\u30c8
errorReportValve.statusReport=\u30b9\u30c6\u30fc\u30bf\u30b9\u30ec\u30dd\u30fc\u30c8
errorReportValve.message=\u30e1\u30c3\u30bb\u30fc\u30b8
errorReportValve.description=\u8aac\u660e
errorReportValve.exception=\u4f8b\u5916
errorReportValve.rootCause=\u539f\u56e0
errorReportValve.note=\u6ce8\u610f
-errorReportValve.rootCauseInLogs=\u539f\u56e0\u306e\u3059\u3079\u3066\u306e\u30b9\u30bf\u30c3\u30af\u30c8\u30ec\u30fc\u30b9\u306f\u3001{0}\u306e\u30ed\u30b0\u306b\u8a18\u9332\u3055\u308c\u3066\u3044\u307e\u3059
+errorReportValve.rootCauseInLogs=\u539f\u56e0\u306e\u3059\u3079\u3066\u306e\u30b9\u30bf\u30c3\u30af\u30c8\u30ec\u30fc\u30b9\u306f\u3001\u306e\u30ed\u30b0\u306b\u8a18\u9332\u3055\u308c\u3066\u3044\u307e\u3059
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java?rev=1831354&r1=1831353&r2=1831354&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestErrorReportValve.java
Thu May 10 16:20:16 2018
@@ -50,8 +50,8 @@ public class TestErrorReportValve extend
ByteChunk res = getUrl("http://localhost:"; + getPort());
- Assert.assertTrue(res.toString().contains("<p><b>message</b> <u>" +
- ErrorServlet.ERROR_TEXT + "</u></p>"));
+ Assert.assertTrue(res.toString().contains("<p><b>Message</b> " +
+ ErrorServlet.ERROR_TEXT + "</p>"));
}
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=1831354&r1=1831353&r2=1831354&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu May 10 16:20:16 2018
@@ -85,6 +85,10 @@
<bug>50019</bug>: Add support for <code><lookup-name></code>.
Based on a patch by Gurkan Erdogdu. (markt)
</fix>
+ <fix>
+ <bug>60490</bug>: Various formatting and layout improvements for the
+ <code>ErrorReportValve</code>. Patch provided by Michael Osipov.
(markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
