Author: markt
Date: Sun Dec 18 09:36:47 2016
New Revision: 1774868
URL: http://svn.apache.org/viewvc?rev=1774868&view=rev
Log:
Implement a simpler JSP file encoding detector that delegates XML prolog
encoding detection to the JRE rather than using a custom XML parser.
Added:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
- copied, changed from r1774526,
tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestEncodingDetector.java
- copied unchanged from r1774522,
tomcat/trunk/test/org/apache/jasper/compiler/TestEncodingDetector.java
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/
- copied from r1774522, tomcat/trunk/test/webapp/jsp/encoding/
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/README.txt
- copied, changed from r1774738,
tomcat/trunk/test/webapp/jsp/encoding/README.txt
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/build.xml
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/SymbolTable.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/UCSReader.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLChar.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLString.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jsp
(props changed)
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jspx
(contents, props changed)
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16be.jspx
(contents, props changed)
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16le.jspx
(contents, props changed)
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf8.jspx
(contents, props changed)
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-none.jsp
(props changed)
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-none.jspx
(props changed)
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf16be.jspx
(props changed)
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf16le.jspx
(props changed)
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf8.jspx
(props changed)
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jspx
(contents, props changed)
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16be.jspx
(contents, props changed)
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16le.jspx
(contents, props changed)
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf8.jspx
(contents, props changed)
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 18 09:36:47 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,1768520,1768569,1768651,1768762,1768922,1769191,176
9263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774749,1774789,1774858
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,1768520,1768569,1768651,1768762,1768922,1769191,176
9263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867
Modified: tomcat/tc8.5.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.xml?rev=1774868&r1=1774867&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/build.xml (original)
+++ tomcat/tc8.5.x/trunk/build.xml Sun Dec 18 09:36:47 2016
@@ -560,6 +560,8 @@
<exclude name="test/webapp/bug53257/**/*.txt"/>
<exclude name="test/webapp-fragments/WEB-INF/classes/*.txt"/>
<exclude name="test/webresources/**"/>
+ <!-- Exclude test files with unusual encodings -->
+ <exclude name="test/webapp/jsp/encoding/**"/>
</fileset>
<fileset dir="modules/jdbc-pool" >
<exclude name=".*/**"/>
@@ -614,6 +616,10 @@
<exclude name="nbproject/**"/>
<exclude name="output/**"/>
<exclude name="modules/**"/>
+ <!-- Exclude these since some svn clients do not seem able to handle
+ UTF-16 line-ending conversion -->
+ <exclude name="test/webapp/jsp/encoding/bom-utf16*"/>
+ <exclude name="test/webapp/jsp/encoding/bom-none-prolog-utf16*"/>
</fileset>
<fileset dir="modules/jdbc-pool" >
<patternset refid="text.files" />
Copied:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
(from r1774526,
tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/EncodingDetector.java?p2=tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/EncodingDetector.java&p1=tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java&r1=1774526&r2=1774868&rev=1774868&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/EncodingDetector.java
Sun Dec 18 09:36:47 2016
@@ -55,10 +55,8 @@ class EncodingDetector {
// Reset the stream back to the start to allow the XML prolog detection
// to work. Skip any BoM we discovered.
bis.reset();
- if (bomResult != null) {
- for (int i = 0; i < bomResult.skip; i++) {
- is.read();
- }
+ for (int i = 0; i < bomResult.skip; i++) {
+ is.read();
}
prologEncoding = getPrologEncoding(bis);
@@ -70,11 +68,6 @@ class EncodingDetector {
}
- Boolean getBigEndian() {
- return bomResult.bigEndian;
- }
-
-
int getSkip() {
return bomResult.skip;
}
@@ -116,7 +109,7 @@ class EncodingDetector {
return parseBom(b4, count);
} catch (IOException ioe) {
// Failed.
- return new BomResult("UTF-8", null, 0);
+ return new BomResult("UTF-8", 0);
}
}
@@ -124,7 +117,7 @@ class EncodingDetector {
private BomResult parseBom(byte[] b4, int count) {
if (count < 2) {
- return new BomResult("UTF-8", null, 0);
+ return new BomResult("UTF-8", 0);
}
// UTF-16, with BOM
@@ -132,82 +125,80 @@ class EncodingDetector {
int b1 = b4[1] & 0xFF;
if (b0 == 0xFE && b1 == 0xFF) {
// UTF-16, big-endian
- return new BomResult("UTF-16BE", Boolean.TRUE, 2);
+ return new BomResult("UTF-16BE", 2);
}
if (b0 == 0xFF && b1 == 0xFE) {
// UTF-16, little-endian
- return new BomResult("UTF-16LE", Boolean.FALSE, 2);
+ return new BomResult("UTF-16LE", 2);
}
// default to UTF-8 if we don't have enough bytes to make a
// good determination of the encoding
if (count < 3) {
- return new BomResult("UTF-8", null, 0);
+ return new BomResult("UTF-8", 0);
}
// UTF-8 with a BOM
int b2 = b4[2] & 0xFF;
if (b0 == 0xEF && b1 == 0xBB && b2 == 0xBF) {
- return new BomResult("UTF-8", null, 3);
+ return new BomResult("UTF-8", 3);
}
// default to UTF-8 if we don't have enough bytes to make a
// good determination of the encoding
if (count < 4) {
- return new BomResult("UTF-8", null, 0);
+ return new BomResult("UTF-8", 0);
}
// other encodings
int b3 = b4[3] & 0xFF;
if (b0 == 0x00 && b1 == 0x00 && b2 == 0x00 && b3 == 0x3C) {
// UCS-4, big endian (1234)
- return new BomResult("ISO-10646-UCS-4", Boolean.TRUE, 4);
+ return new BomResult("ISO-10646-UCS-4", 4);
}
if (b0 == 0x3C && b1 == 0x00 && b2 == 0x00 && b3 == 0x00) {
// UCS-4, little endian (4321)
- return new BomResult("ISO-10646-UCS-4", Boolean.FALSE, 4);
+ return new BomResult("ISO-10646-UCS-4", 4);
}
if (b0 == 0x00 && b1 == 0x00 && b2 == 0x3C && b3 == 0x00) {
// UCS-4, unusual octet order (2143)
// REVISIT: What should this be?
- return new BomResult("ISO-10646-UCS-4", null, 4);
+ return new BomResult("ISO-10646-UCS-4", 4);
}
if (b0 == 0x00 && b1 == 0x3C && b2 == 0x00 && b3 == 0x00) {
// UCS-4, unusual octect order (3412)
// REVISIT: What should this be?
- return new BomResult("ISO-10646-UCS-4", null, 4);
+ return new BomResult("ISO-10646-UCS-4", 4);
}
if (b0 == 0x00 && b1 == 0x3C && b2 == 0x00 && b3 == 0x3F) {
// UTF-16, big-endian, no BOM
// (or could turn out to be UCS-2...
// REVISIT: What should this be?
- return new BomResult("UTF-16BE", Boolean.TRUE, 4);
+ return new BomResult("UTF-16BE", 4);
}
if (b0 == 0x3C && b1 == 0x00 && b2 == 0x3F && b3 == 0x00) {
// UTF-16, little-endian, no BOM
// (or could turn out to be UCS-2...
- return new BomResult("UTF-16LE", Boolean.FALSE, 4);
+ return new BomResult("UTF-16LE", 4);
}
if (b0 == 0x4C && b1 == 0x6F && b2 == 0xA7 && b3 == 0x94) {
// EBCDIC
// a la xerces1, return CP037 instead of EBCDIC here
- return new BomResult("CP037", null, 4);
+ return new BomResult("CP037", 4);
}
// default encoding
- return new BomResult("UTF-8", null, 0);
+ return new BomResult("UTF-8", 0);
}
private static class BomResult {
public final String encoding;
- public final Boolean bigEndian;
public final int skip;
- public BomResult(String encoding, Boolean bigEndian, int skip) {
+ public BomResult(String encoding, int skip) {
this.encoding = encoding;
- this.bigEndian = bigEndian;
this.skip = skip;
}
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ParserController.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ParserController.java?rev=1774868&r1=1774867&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ParserController.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ParserController.java
Sun Dec 18 09:36:47 2016
@@ -18,12 +18,12 @@ package org.apache.jasper.compiler;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Stack;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.xmlparser.XMLEncodingDetector;
import org.apache.tomcat.Jar;
import org.xml.sax.Attributes;
@@ -318,16 +318,13 @@ class ParserController implements TagCon
sourceEnc = "ISO-8859-1";
} else {
// XML syntax or unknown, (auto)detect encoding ...
- Object[] ret = XMLEncodingDetector.getEncoding(absFileName, jar,
- ctxt, err);
- sourceEnc = (String) ret[0];
- if (((Boolean) ret[1]).booleanValue()) {
- isEncodingSpecifiedInProlog = true;
- }
- if (((Boolean) ret[2]).booleanValue()) {
- isBomPresent = true;
- }
- skip = ((Integer) ret[3]).intValue();
+ InputStream inStream = JspUtil.getInputStream(absFileName, jar,
ctxt);
+ EncodingDetector encodingDetector = new EncodingDetector(inStream);
+
+ sourceEnc = encodingDetector.getBomEncoding();
+ isEncodingSpecifiedInProlog =
(encodingDetector.getPrologEncoding() != null);
+ isBomPresent = (encodingDetector.getSkip() > 0);
+ skip = encodingDetector.getSkip();
if (!isXml && sourceEnc.equals("UTF-8")) {
/*
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java?rev=1774868&r1=1774867&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
Sun Dec 18 09:36:47 2016
@@ -39,6 +39,10 @@ public final class SecurityClassLoad {
final String basePackage = "org.apache.jasper.";
try {
+ // Ensure XMLInputFactory is loaded with Tomcat's class loader
+ loader.loadClass( basePackage +
+ "compiler.EncodingDetector");
+
loader.loadClass( basePackage +
"runtime.JspFactoryImpl$PrivilegedGetPageContext");
loader.loadClass( basePackage +
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java?rev=1774868&r1=1774867&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/ASCIIReader.java Sun
Dec 18 09:36:47 2016
@@ -28,7 +28,10 @@ import org.apache.jasper.compiler.Locali
* byte streams that only contain 7-bit ASCII characters.
*
* @author Andy Clark, IBM
+ *
+ * @deprecated Will be removed in Tomcat 9.0.x onwards
*/
+@Deprecated
public class ASCIIReader extends Reader {
//
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java?rev=1774868&r1=1774867&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java Sun
Dec 18 09:36:47 2016
@@ -473,7 +473,10 @@ import java.util.Hashtable;
*
* @author TAMURA Kent, IBM
* @author Andy Clark, IBM
+ *
+ * @deprecated Will be removed in Tomcat 9.0.x onwards
*/
+@Deprecated
public class EncodingMap {
//
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/SymbolTable.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/SymbolTable.java?rev=1774868&r1=1774867&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/SymbolTable.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/SymbolTable.java Sun
Dec 18 09:36:47 2016
@@ -49,7 +49,10 @@ package org.apache.jasper.xmlparser;
* </ul>
*
* @author Andy Clark
+ *
+ * @deprecated Will be removed in Tomcat 9.0.x onwards
*/
+@Deprecated
public class SymbolTable {
//
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/UCSReader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/UCSReader.java?rev=1774868&r1=1774867&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/UCSReader.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/UCSReader.java Sun
Dec 18 09:36:47 2016
@@ -29,7 +29,10 @@ import org.apache.juli.logging.LogFactor
* (i.e., encodings from ISO-10646-UCS-(2|4)).
*
* @author Neil Graham, IBM
+ *
+ * @deprecated Will be removed in Tomcat 9.0.x onwards
*/
+@Deprecated
public class UCSReader extends Reader {
private final Log log = LogFactory.getLog(UCSReader.class);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java?rev=1774868&r1=1774867&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java Sun
Dec 18 09:36:47 2016
@@ -28,7 +28,10 @@ import org.apache.juli.logging.LogFactor
/**
* @author Andy Clark, IBM
+ *
+ * @deprecated Will be removed in Tomcat 9.0.x onwards
*/
+@Deprecated
public class UTF8Reader
extends Reader {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLChar.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLChar.java?rev=1774868&r1=1774867&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLChar.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLChar.java Sun Dec
18 09:36:47 2016
@@ -48,7 +48,10 @@ import java.util.Arrays;
* @author Arnaud Le Hors, IBM
* @author Michael Glavassevich, IBM
* @author Rahul Srivastava, Sun Microsystems Inc.
+ *
+ * @deprecated Will be removed in Tomcat 9.0.x onwards
*/
+@Deprecated
public class XMLChar {
//
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?rev=1774868&r1=1774867&r2=1774868&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
Sun Dec 18 09:36:47 2016
@@ -38,6 +38,10 @@ import org.apache.jasper.compiler.JspUti
import org.apache.jasper.compiler.Localizer;
import org.apache.tomcat.Jar;
+/**
+ * @deprecated Will be removed in Tomcat 9.0.x onwards
+ */
+@Deprecated
public class XMLEncodingDetector {
private InputStream stream;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLString.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLString.java?rev=1774868&r1=1774867&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLString.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLString.java Sun
Dec 18 09:36:47 2016
@@ -46,7 +46,10 @@ package org.apache.jasper.xmlparser;
*
* @author Eric Ye, IBM
* @author Andy Clark, IBM
+ *
+ * @deprecated Will be removed in Tomcat 9.0.x onwards
*/
+@Deprecated
public class XMLString {
//
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java?rev=1774868&r1=1774867&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java
Sun Dec 18 09:36:47 2016
@@ -43,7 +43,10 @@ package org.apache.jasper.xmlparser;
*
* @author Andy Clark, IBM
* @author Eric Ye, IBM
+ *
+ * @deprecated Will be removed in Tomcat 9.0.x onwards
*/
+@Deprecated
public class XMLStringBuffer
extends XMLString {
Copied: tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/README.txt (from
r1774738, tomcat/trunk/test/webapp/jsp/encoding/README.txt)
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/README.txt?p2=tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/README.txt&p1=tomcat/trunk/test/webapp/jsp/encoding/README.txt&r1=1774738&r2=1774868&rev=1774868&view=diff
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/README.txt (original)
+++ tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/README.txt Sun Dec 18
09:36:47 2016
@@ -1,3 +1,20 @@
+================================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+================================================================================
+
A number of the test files in this directory specify conflicting encoding
in the BOM and and in the XML prolog. The rules for determining the actual
encoding are as follows:
Propchange:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain; charset=UTF-8
Modified:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jspx
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jspx?rev=1774868&r1=1774522&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jspx
[iso-8859-1] (original)
+++ tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jspx
[UTF-8] Sun Dec 18 09:36:47 2016
@@ -1,19 +1,19 @@
-<?xml version="1.0" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+<?xml version="1.0" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"; version="2.3">
<jsp:directive.page contentType="text/plain" />
Propchange:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jspx
------------------------------------------------------------------------------
svn:mime-type = text/plain; charset=UTF-8
Modified:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16be.jspx
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16be.jspx?rev=1774868&r1=1774522&r2=1774868&view=diff
==============================================================================
Binary files - no diff available.
Propchange:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16be.jspx
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 18 09:36:47 2016
@@ -1 +1 @@
-application/octet-stream
+text/plain; charset=UTF-16BE
Modified:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16le.jspx
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16le.jspx?rev=1774868&r1=1774522&r2=1774868&view=diff
==============================================================================
Binary files - no diff available.
Propchange:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16le.jspx
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 18 09:36:47 2016
@@ -1 +1 @@
-application/octet-stream
+text/plain; charset=UTF-16LE
Modified:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf8.jspx
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf8.jspx?rev=1774868&r1=1774522&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf8.jspx
[iso-8859-1] (original)
+++ tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf8.jspx
[UTF-8] Sun Dec 18 09:36:47 2016
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"; version="2.3">
<jsp:directive.page contentType="text/plain" />
Propchange:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf8.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf8.jspx
------------------------------------------------------------------------------
svn:mime-type = text/plain; charset=UTF-8
Propchange:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-none.jsp
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 18 09:36:47 2016
@@ -1 +1 @@
-text/plain; UTF-16BE
+text/plain; charset=UTF-16LE
Propchange:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-none.jspx
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 18 09:36:47 2016
@@ -1 +1 @@
-text/plain; UTF-16BE
+text/plain; charset=UTF-16LE
Propchange:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf16be.jspx
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 18 09:36:47 2016
@@ -1 +1 @@
-text/plain; UTF-16BE
+text/plain; charset=UTF-16LE
Propchange:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf16le.jspx
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 18 09:36:47 2016
@@ -1 +1 @@
-text/plain; UTF-16BE
+text/plain; charset=UTF-16LE
Propchange:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf8.jspx
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sun Dec 18 09:36:47 2016
@@ -1 +1 @@
-text/plain; UTF-16BE
+text/plain; charset=UTF-16LE
Modified:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jspx
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jspx?rev=1774868&r1=1774522&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jspx
[UTF-8] (original)
+++ tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jspx
[UTF-8] Sun Dec 18 09:36:47 2016
@@ -1,21 +1,21 @@
-<?xml version="1.0" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"; version="2.3">
- <jsp:directive.page contentType="text/plain" />
- <jsp:text>OK</jsp:text>
+<?xml version="1.0" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"; version="2.3">
+ <jsp:directive.page contentType="text/plain" />
+ <jsp:text>OK</jsp:text>
</jsp:root>
\ No newline at end of file
Propchange:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16be.jspx
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16be.jspx?rev=1774868&r1=1774522&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16be.jspx
[UTF-8] (original)
+++ tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16be.jspx
[UTF-8] Sun Dec 18 09:36:47 2016
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-16BE" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"; version="2.3">
- <jsp:directive.page contentType="text/plain" />
- <jsp:text>OK</jsp:text>
+<?xml version="1.0" encoding="UTF-16BE" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"; version="2.3">
+ <jsp:directive.page contentType="text/plain" />
+ <jsp:text>OK</jsp:text>
</jsp:root>
\ No newline at end of file
Propchange:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16be.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16le.jspx
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16le.jspx?rev=1774868&r1=1774522&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16le.jspx
[UTF-8] (original)
+++ tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16le.jspx
[UTF-8] Sun Dec 18 09:36:47 2016
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-16LE" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"; version="2.3">
- <jsp:directive.page contentType="text/plain" />
- <jsp:text>OK</jsp:text>
+<?xml version="1.0" encoding="UTF-16LE" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"; version="2.3">
+ <jsp:directive.page contentType="text/plain" />
+ <jsp:text>OK</jsp:text>
</jsp:root>
\ No newline at end of file
Propchange:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16le.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf8.jspx
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf8.jspx?rev=1774868&r1=1774522&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf8.jspx
[UTF-8] (original)
+++ tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf8.jspx
[UTF-8] Sun Dec 18 09:36:47 2016
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"; version="2.3">
- <jsp:directive.page contentType="text/plain" />
- <jsp:text>OK</jsp:text>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"; version="2.3">
+ <jsp:directive.page contentType="text/plain" />
+ <jsp:text>OK</jsp:text>
</jsp:root>
\ No newline at end of file
Propchange:
tomcat/tc8.5.x/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf8.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1774868&r1=1774867&r2=1774868&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Sun Dec 18 09:36:47 2016
@@ -94,6 +94,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ Implement a simpler JSP file encoding detector that delegates XML prolog
+ encoding detection to the JRE rather than using a custom XML parser.
+ (markt)
+ </changelog>
+ </subsection>
<subseciton name="WebSocket">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
