Author: markt
Date: Wed Dec 6 10:50:21 2017
New Revision: 1817283
URL: http://svn.apache.org/viewvc?rev=1817283&view=rev
Log:
Align packaged renamed FileUpload with original.
Update the internal fork of Commons FileUpload to 6c00d57 (2017-11-23)
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/MERGE.txt
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/ (props
changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUtils.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/ThresholdingOutputStream.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 6 10:50:21 2017
@@ -1,2 +1,2 @@
/tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763748,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,176
8283,1768520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-
1778139,1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,17885
50,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790213,1790376,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793716,1793719,1793736,1793746,1793758,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,17
95289,1795298,1795305,1795813,1795893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446
,1803451,1803456,1803459,1803616,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808482,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811
704,1811837-1811839,1811861,1811932,1812088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812489,1812513,1812617,1813919,1814192,1814195,1814567,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815318-1815319,1815325,1815385,1815429,1815441-1815442,1815451,1815459,1815465,1815505,1815615,1815793,1815800,1815802,1815806,1815826,1815829,1815834,1815840,1815903,1815944,1815954,1816076,1816078,1816083,1816087,1816120,1816128,1816140,1816147,1816157,1816338,1816418,1816431,1816443,1816538,1816541,1816545,1816549-1816550,1816563,1816570,1816647,1816695-1816704,1816716,1816780,1816887,1817089,1817092,1817096,1817104,1817126,1817196,1817223
+/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763748,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,176
8283,1768520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-
1778139,1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,17885
50,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790213,1790376,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793716,1793719,1793736,1793746,1793758,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,17
95289,1795298,1795305,1795813,1795893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446
,1803451,1803456,1803459,1803616,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808482,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811
704,1811837-1811839,1811861,1811932,1812088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812489,1812513,1812617,1813919,1814192,1814195,1814567,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815318-1815319,1815325,1815385,1815429,1815441-1815442,1815451,1815459,1815465,1815505,1815615,1815793,1815800,1815802,1815806,1815826,1815829,1815834,1815840,1815903,1815944,1815954,1816076,1816078,1816083,1816087,1816120,1816128,1816140,1816147,1816157,1816338,1816418,1816431,1816443,1816538,1816541,1816545,1816549-1816550,1816563,1816570,1816647,1816695-1816704,1816716,1816780,1816887,1817089,1817092,1817096,1817104,1817126,1817136,1817196,1817223
Modified: tomcat/tc8.5.x/trunk/MERGE.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/MERGE.txt?rev=1817283&r1=1817282&r2=1817283&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/MERGE.txt (original)
+++ tomcat/tc8.5.x/trunk/MERGE.txt Wed Dec 6 10:50:21 2017
@@ -57,7 +57,7 @@ FileUpload
Sub-tree:
src/main/java/org/apache/commons/fileupload
The SHA1 ID for the most recent commit to be merged to Tomcat is:
-86b11bbc1437a12fa64bc1484c4edc0bdd5a0966
+6c00d575a9521c386743891fd34bc5181174cc01
Note: Tomcat's copy of fileupload also includes classes copied manually (rather
than svn copied) from Commons IO.
Propchange: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 6 10:50:21 2017
@@ -1,2 +1,2 @@
/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload:1-1754664
-/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload:1743700,1757180,1757195,1807742
+/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload:1743700,1757180,1757195,1807742,1817136
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java?rev=1817283&r1=1817282&r2=1817283&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/ByteArrayOutputStream.java
Wed Dec 6 10:50:21 2017
@@ -30,9 +30,9 @@ import java.util.List;
* The data can be retrieved using <code>toByteArray()</code> and
* <code>toString()</code>.
* <p>
- * Closing a <tt>ByteArrayOutputStream</tt> has no effect. The methods in
+ * Closing a {@code ByteArrayOutputStream} has no effect. The methods in
* this class can be called after the stream has been closed without
- * generating an <tt>IOException</tt>.
+ * generating an {@code IOException}.
* <p>
* This is an alternative implementation of the {@link
java.io.ByteArrayOutputStream}
* class. The original implementation only allocates 32 bytes at the beginning.
@@ -45,6 +45,8 @@ import java.util.List;
*/
public class ByteArrayOutputStream extends OutputStream {
+ static final int DEFAULT_SIZE = 1024;
+
/** A singleton empty byte array. */
private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
@@ -64,7 +66,7 @@ public class ByteArrayOutputStream exten
* initially 1024 bytes, though its size increases if necessary.
*/
public ByteArrayOutputStream() {
- this(1024);
+ this(DEFAULT_SIZE);
}
/**
@@ -74,7 +76,7 @@ public class ByteArrayOutputStream exten
* @param size the initial size
* @throws IllegalArgumentException if size is negative
*/
- public ByteArrayOutputStream(int size) {
+ public ByteArrayOutputStream(final int size) {
if (size < 0) {
throw new IllegalArgumentException(
"Negative initial size: " + size);
@@ -90,7 +92,7 @@ public class ByteArrayOutputStream exten
*
* @param newcount the size of the buffer if one is created
*/
- private void needNewBuffer(int newcount) {
+ private void needNewBuffer(final int newcount) {
if (currentBufferIndex < buffers.size() - 1) {
//Recycling old buffer
filledBufferSum += currentBuffer.length;
@@ -123,7 +125,7 @@ public class ByteArrayOutputStream exten
* @param len The number of bytes to write
*/
@Override
- public void write(byte[] b, int off, int len) {
+ public void write(final byte[] b, final int off, final int len) {
if ((off < 0)
|| (off > b.length)
|| (len < 0)
@@ -134,11 +136,11 @@ public class ByteArrayOutputStream exten
return;
}
synchronized (this) {
- int newcount = count + len;
+ final int newcount = count + len;
int remaining = len;
int inBufferPos = count - filledBufferSum;
while (remaining > 0) {
- int part = Math.min(remaining, currentBuffer.length -
inBufferPos);
+ final int part = Math.min(remaining, currentBuffer.length -
inBufferPos);
System.arraycopy(b, off + len - remaining, currentBuffer,
inBufferPos, part);
remaining -= part;
if (remaining > 0) {
@@ -155,7 +157,7 @@ public class ByteArrayOutputStream exten
* @param b the byte to write
*/
@Override
- public synchronized void write(int b) {
+ public synchronized void write(final int b) {
int inBufferPos = count - filledBufferSum;
if (inBufferPos == currentBuffer.length) {
needNewBuffer(count + 1);
@@ -176,7 +178,7 @@ public class ByteArrayOutputStream exten
* @throws IOException if an I/O error occurs while reading the input
stream
* @since 1.4
*/
- public synchronized int write(InputStream in) throws IOException {
+ public synchronized int write(final InputStream in) throws IOException {
int readCount = 0;
int inBufferPos = count - filledBufferSum;
int n = in.read(currentBuffer, inBufferPos, currentBuffer.length -
inBufferPos);
@@ -194,12 +196,12 @@ public class ByteArrayOutputStream exten
}
/**
- * Closing a <tt>ByteArrayOutputStream</tt> has no effect. The methods in
+ * Closing a {@code ByteArrayOutputStream} has no effect. The methods in
* this class can be called after the stream has been closed without
- * generating an <tt>IOException</tt>.
+ * generating an {@code IOException}.
*
* @throws IOException never (this method should not declare this exception
- * but it has to now due to backwards compatability)
+ * but it has to now due to backwards compatibility)
*/
@Override
public void close() throws IOException {
@@ -214,10 +216,10 @@ public class ByteArrayOutputStream exten
* @throws IOException if an I/O error occurs, such as if the stream is
closed
* @see java.io.ByteArrayOutputStream#writeTo(OutputStream)
*/
- public synchronized void writeTo(OutputStream out) throws IOException {
+ public synchronized void writeTo(final OutputStream out) throws
IOException {
int remaining = count;
- for (byte[] buf : buffers) {
- int c = Math.min(buf.length, remaining);
+ for (final byte[] buf : buffers) {
+ final int c = Math.min(buf.length, remaining);
out.write(buf, 0, c);
remaining -= c;
if (remaining == 0) {
@@ -227,7 +229,7 @@ public class ByteArrayOutputStream exten
}
/**
- * Gets the curent contents of this byte stream as a byte array.
+ * Gets the current contents of this byte stream as a byte array.
* The result is independent of this stream.
*
* @return the current contents of this output stream, as a byte array
@@ -238,10 +240,10 @@ public class ByteArrayOutputStream exten
if (remaining == 0) {
return EMPTY_BYTE_ARRAY;
}
- byte newbuf[] = new byte[remaining];
+ final byte newbuf[] = new byte[remaining];
int pos = 0;
- for (byte[] buf : buffers) {
- int c = Math.min(buf.length, remaining);
+ for (final byte[] buf : buffers) {
+ final int c = Math.min(buf.length, remaining);
System.arraycopy(buf, 0, newbuf, pos, c);
pos += c;
remaining -= c;
@@ -251,14 +253,4 @@ public class ByteArrayOutputStream exten
}
return newbuf;
}
-
- /**
- * Gets the curent contents of this byte stream as a string.
- * @return the contents of the byte array as a String
- * @see java.io.ByteArrayOutputStream#toString()
- */
- @Override
- public String toString() {
- return new String(toByteArray());
- }
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java?rev=1817283&r1=1817282&r2=1817283&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
Wed Dec 6 10:50:21 2017
@@ -36,12 +36,11 @@ import java.io.OutputStream;
public class DeferredFileOutputStream
extends ThresholdingOutputStream
{
-
// ----------------------------------------------------------- Data members
/**
- * The output stream to which data will be written prior to the theshold
+ * The output stream to which data will be written prior to the threshold
* being reached.
*/
private ByteArrayOutputStream memoryOutputStream;
@@ -81,13 +80,14 @@ public class DeferredFileOutputStream
/**
* Constructs an instance of this class which will trigger an event at the
* specified threshold, and save data to a file beyond that point.
+ * The initial buffer size will default to 1024 bytes which is
ByteArrayOutputStream's default buffer size.
*
* @param threshold The number of bytes at which to trigger an event.
* @param outputFile The file to which data is saved beyond the threshold.
*/
- public DeferredFileOutputStream(int threshold, File outputFile)
+ public DeferredFileOutputStream(final int threshold, final File outputFile)
{
- this(threshold, outputFile, null, null, null);
+ this(threshold, outputFile, null, null, null,
ByteArrayOutputStream.DEFAULT_SIZE);
}
@@ -100,16 +100,18 @@ public class DeferredFileOutputStream
* @param prefix Prefix to use for the temporary file.
* @param suffix Suffix to use for the temporary file.
* @param directory Temporary file directory.
+ * @param initialBufferSize The initial size of the in memory buffer.
*/
- private DeferredFileOutputStream(int threshold, File outputFile, String
prefix, String suffix, File directory) {
+ private DeferredFileOutputStream(final int threshold, final File
outputFile, final String prefix,
+ final String suffix, final File
directory, final int initialBufferSize) {
super(threshold);
this.outputFile = outputFile;
-
- memoryOutputStream = new ByteArrayOutputStream();
- currentOutputStream = memoryOutputStream;
this.prefix = prefix;
this.suffix = suffix;
this.directory = directory;
+
+ memoryOutputStream = new ByteArrayOutputStream(initialBufferSize);
+ currentOutputStream = memoryOutputStream;
}
@@ -122,7 +124,7 @@ public class DeferredFileOutputStream
*
* @return The underlying output stream.
*
- * @exception IOException if an error occurs.
+ * @throws IOException if an error occurs.
*/
@Override
protected OutputStream getStream() throws IOException
@@ -137,7 +139,7 @@ public class DeferredFileOutputStream
* much data is being written to keep in memory, so we elect to switch to
* disk-based storage.
*
- * @exception IOException if an error occurs.
+ * @throws IOException if an error occurs.
*/
@Override
protected void thresholdReached() throws IOException
@@ -145,8 +147,14 @@ public class DeferredFileOutputStream
if (prefix != null) {
outputFile = File.createTempFile(prefix, suffix, directory);
}
- FileOutputStream fos = new FileOutputStream(outputFile);
- memoryOutputStream.writeTo(fos);
+ FileUtils.forceMkdirParent(outputFile);
+ final FileOutputStream fos = new FileOutputStream(outputFile);
+ try {
+ memoryOutputStream.writeTo(fos);
+ } catch (final IOException e){
+ fos.close();
+ throw e;
+ }
currentOutputStream = fos;
memoryOutputStream = null;
}
@@ -209,7 +217,7 @@ public class DeferredFileOutputStream
/**
* Closes underlying output stream, and mark this as closed
*
- * @exception IOException if an error occurs.
+ * @throws IOException if an error occurs.
*/
@Override
public void close() throws IOException
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUtils.java?rev=1817283&r1=1817282&r2=1817283&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUtils.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUtils.java
Wed Dec 6 10:50:21 2017
@@ -38,6 +38,10 @@ import java.io.IOException;
* <li>calculating a checksum
* </ul>
* <p>
+ * Note that a specific charset should be specified whenever possible.
+ * Relying on the platform default means that the code is Locale-dependent.
+ * Only use the default if the files are known to always use the platform
default.
+ * <p>
* Origin of code: Excalibur, Alexandria, Commons-Utils
*/
public class FileUtils {
@@ -53,10 +57,11 @@ public class FileUtils {
/**
* Deletes a directory recursively.
*
- * @param directory directory to delete
- * @throws IOException in case deletion is unsuccessful
+ * @param directory directory to delete
+ * @throws IOException in case deletion is unsuccessful
+ * @throws IllegalArgumentException if {@code directory} does not exist or
is not a directory
*/
- public static void deleteDirectory(File directory) throws IOException {
+ public static void deleteDirectory(final File directory) throws
IOException {
if (!directory.exists()) {
return;
}
@@ -66,8 +71,8 @@ public class FileUtils {
}
if (!directory.delete()) {
- String message =
- "Unable to delete directory " + directory + ".";
+ final String message =
+ "Unable to delete directory " + directory + ".";
throw new IOException(message);
}
}
@@ -76,20 +81,21 @@ public class FileUtils {
* Cleans a directory without deleting it.
*
* @param directory directory to clean
- * @throws IOException in case cleaning is unsuccessful
+ * @throws IOException in case cleaning is unsuccessful
+ * @throws IllegalArgumentException if {@code directory} does not exist or
is not a directory
*/
- public static void cleanDirectory(File directory) throws IOException {
+ public static void cleanDirectory(final File directory) throws IOException
{
if (!directory.exists()) {
- String message = directory + " does not exist";
+ final String message = directory + " does not exist";
throw new IllegalArgumentException(message);
}
if (!directory.isDirectory()) {
- String message = directory + " is not a directory";
+ final String message = directory + " is not a directory";
throw new IllegalArgumentException(message);
}
- File[] files = directory.listFiles();
+ final File[] files = directory.listFiles();
if (files == null) { // null if security restricted
throw new IOException("Failed to list contents of " + directory);
}
@@ -116,25 +122,25 @@ public class FileUtils {
* <ul>
* <li>A directory to be deleted does not have to be empty.</li>
* <li>You get exceptions when a file or directory cannot be deleted.
- * (java.io.File methods returns a boolean)</li>
+ * (java.io.File methods returns a boolean)</li>
* </ul>
*
- * @param file file or directory to delete, must not be {@code null}
- * @throws NullPointerException if the directory is {@code null}
+ * @param file file or directory to delete, must not be {@code null}
+ * @throws NullPointerException if the directory is {@code null}
* @throws FileNotFoundException if the file was not found
- * @throws IOException in case deletion is unsuccessful
+ * @throws IOException in case deletion is unsuccessful
*/
- public static void forceDelete(File file) throws IOException {
+ public static void forceDelete(final File file) throws IOException {
if (file.isDirectory()) {
deleteDirectory(file);
} else {
- boolean filePresent = file.exists();
+ final boolean filePresent = file.exists();
if (!file.delete()) {
- if (!filePresent){
+ if (!filePresent) {
throw new FileNotFoundException("File does not exist: " +
file);
}
- String message =
- "Unable to delete file: " + file;
+ final String message =
+ "Unable to delete file: " + file;
throw new IOException(message);
}
}
@@ -144,11 +150,11 @@ public class FileUtils {
* Schedules a file to be deleted when JVM exits.
* If file is directory delete it and all sub-directories.
*
- * @param file file or directory to delete, must not be {@code null}
+ * @param file file or directory to delete, must not be {@code null}
* @throws NullPointerException if the file is {@code null}
- * @throws IOException in case deletion is unsuccessful
+ * @throws IOException in case deletion is unsuccessful
*/
- public static void forceDeleteOnExit(File file) throws IOException {
+ public static void forceDeleteOnExit(final File file) throws IOException {
if (file.isDirectory()) {
deleteDirectoryOnExit(file);
} else {
@@ -159,11 +165,11 @@ public class FileUtils {
/**
* Schedules a directory recursively for deletion on JVM exit.
*
- * @param directory directory to delete, must not be {@code null}
+ * @param directory directory to delete, must not be {@code null}
* @throws NullPointerException if the directory is {@code null}
- * @throws IOException in case deletion is unsuccessful
+ * @throws IOException in case deletion is unsuccessful
*/
- private static void deleteDirectoryOnExit(File directory) throws
IOException {
+ private static void deleteDirectoryOnExit(final File directory) throws
IOException {
if (!directory.exists()) {
return;
}
@@ -177,11 +183,11 @@ public class FileUtils {
/**
* Cleans a directory without deleting it.
*
- * @param directory directory to clean, must not be {@code null}
+ * @param directory directory to clean, must not be {@code null}
* @throws NullPointerException if the directory is {@code null}
- * @throws IOException in case cleaning is unsuccessful
+ * @throws IOException in case cleaning is unsuccessful
*/
- private static void cleanDirectoryOnExit(File directory) throws
IOException {
+ private static void cleanDirectoryOnExit(final File directory) throws
IOException {
if (!directory.exists()) {
String message = directory + " does not exist";
throw new IllegalArgumentException(message);
@@ -211,6 +217,57 @@ public class FileUtils {
}
}
+ /**
+ * Makes a directory, including any necessary but nonexistent parent
+ * directories. If a file already exists with specified name but it is
+ * not a directory then an IOException is thrown.
+ * If the directory cannot be created (or does not already exist)
+ * then an IOException is thrown.
+ *
+ * @param directory directory to create, must not be {@code null}
+ * @throws NullPointerException if the directory is {@code null}
+ * @throws IOException if the directory cannot be created or the
file already exists but is not a directory
+ */
+ public static void forceMkdir(final File directory) throws IOException {
+ if (directory.exists()) {
+ if (!directory.isDirectory()) {
+ final String message =
+ "File "
+ + directory
+ + " exists and is "
+ + "not a directory. Unable to create
directory.";
+ throw new IOException(message);
+ }
+ } else {
+ if (!directory.mkdirs()) {
+ // Double-check that some other thread or process hasn't made
+ // the directory in the background
+ if (!directory.isDirectory()) {
+ final String message =
+ "Unable to create directory " + directory;
+ throw new IOException(message);
+ }
+ }
+ }
+ }
+
+ /**
+ * Makes any necessary but nonexistent parent directories for a given
File. If the parent directory cannot be
+ * created then an IOException is thrown.
+ *
+ * @param file file with parent to create, must not be {@code null}
+ * @throws NullPointerException if the file is {@code null}
+ * @throws IOException if the parent directory cannot be created
+ * @since 2.5
+ */
+ public static void forceMkdirParent(final File file) throws IOException {
+ final File parent = file.getParentFile();
+ if (parent == null) {
+ return;
+ }
+ forceMkdir(parent);
+ }
+
/**
* Determines whether the specified file is a Symbolic Link rather than an
actual file.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java?rev=1817283&r1=1817282&r2=1817283&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/IOUtils.java
Wed Dec 6 10:50:21 2017
@@ -54,7 +54,7 @@ import java.io.OutputStream;
* Origin of code: Excalibur.
*/
public class IOUtils {
- // NOTE: This class is focussed on InputStream, OutputStream, Reader and
+ // NOTE: This class is focused on InputStream, OutputStream, Reader and
// Writer. Each method should take at least one of these as a parameter,
// or return one of them.
@@ -82,7 +82,7 @@ public class IOUtils {
* finally blocks.
* <p>
* Example code:
- *
+ * </p>
* <pre>
* Closeable closeable = null;
* try {
@@ -95,9 +95,9 @@ public class IOUtils {
* IOUtils.closeQuietly(closeable);
* }
* </pre>
- *
+ * <p>
* Closing all streams:
- *
+ * </p>
* <pre>
* try {
* return IOUtils.copy(inputStream, outputStream);
@@ -107,8 +107,7 @@ public class IOUtils {
* }
* </pre>
*
- * @param closeable
- * the objects to close, may be null or already closed
+ * @param closeable the objects to close, may be null or already closed
* @since 2.0
*/
public static void closeQuietly(final Closeable closeable) {
@@ -124,7 +123,7 @@ public class IOUtils {
// copy from InputStream
//-----------------------------------------------------------------------
/**
- * Copy bytes from an <code>InputStream</code> to an
+ * Copies bytes from an <code>InputStream</code> to an
* <code>OutputStream</code>.
* <p>
* This method buffers the input internally, so there is no need to use a
@@ -135,15 +134,15 @@ public class IOUtils {
* number of bytes cannot be returned as an int. For large streams
* use the <code>copyLarge(InputStream, OutputStream)</code> method.
*
- * @param input the <code>InputStream</code> to read from
- * @param output the <code>OutputStream</code> to write to
+ * @param input the <code>InputStream</code> to read from
+ * @param output the <code>OutputStream</code> to write to
* @return the number of bytes copied, or -1 if > Integer.MAX_VALUE
* @throws NullPointerException if the input or output is null
- * @throws IOException if an I/O error occurs
+ * @throws IOException if an I/O error occurs
* @since 1.1
*/
- public static int copy(InputStream input, OutputStream output) throws
IOException {
- long count = copyLarge(input, output);
+ public static int copy(final InputStream input, final OutputStream output)
throws IOException {
+ final long count = copyLarge(input, output);
if (count > Integer.MAX_VALUE) {
return -1;
}
@@ -151,7 +150,7 @@ public class IOUtils {
}
/**
- * Copy bytes from a large (over 2GB) <code>InputStream</code> to an
+ * Copies bytes from a large (over 2GB) <code>InputStream</code> to an
* <code>OutputStream</code>.
* <p>
* This method buffers the input internally, so there is no need to use a
@@ -159,14 +158,14 @@ public class IOUtils {
* <p>
* The buffer size is given by {@link #DEFAULT_BUFFER_SIZE}.
*
- * @param input the <code>InputStream</code> to read from
- * @param output the <code>OutputStream</code> to write to
+ * @param input the <code>InputStream</code> to read from
+ * @param output the <code>OutputStream</code> to write to
* @return the number of bytes copied
* @throws NullPointerException if the input or output is null
- * @throws IOException if an I/O error occurs
+ * @throws IOException if an I/O error occurs
* @since 1.3
*/
- public static long copyLarge(InputStream input, OutputStream output)
+ public static long copyLarge(final InputStream input, final OutputStream
output)
throws IOException {
byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
@@ -193,7 +192,8 @@ public class IOUtils {
* @throws IOException if a read error occurs
* @since 2.2
*/
- public static int read(final InputStream input, final byte[] buffer, final
int offset, final int length) throws IOException {
+ public static int read(final InputStream input, final byte[] buffer, final
int offset, final int length)
+ throws IOException {
if (length < 0) {
throw new IllegalArgumentException("Length must not be negative: "
+ length);
}
@@ -220,12 +220,13 @@ public class IOUtils {
* @param offset initial offset into buffer
* @param length length to read, must be >= 0
*
- * @throws IOException if there is a problem reading the file
+ * @throws IOException if there is a problem reading the file
* @throws IllegalArgumentException if length is negative
- * @throws EOFException if the number of bytes read was incorrect
+ * @throws EOFException if the number of bytes read was
incorrect
* @since 2.2
*/
- public static void readFully(final InputStream input, final byte[] buffer,
final int offset, final int length) throws IOException {
+ public static void readFully(final InputStream input, final byte[] buffer,
final int offset, final int length)
+ throws IOException {
final int actual = read(input, buffer, offset, length);
if (actual != length) {
throw new EOFException("Length to read: " + length + " actual: " +
actual);
@@ -241,9 +242,9 @@ public class IOUtils {
* @param input where to read input from
* @param buffer destination
*
- * @throws IOException if there is a problem reading the file
+ * @throws IOException if there is a problem reading the file
* @throws IllegalArgumentException if length is negative
- * @throws EOFException if the number of bytes read was incorrect
+ * @throws EOFException if the number of bytes read was
incorrect
* @since 2.2
*/
public static void readFully(final InputStream input, final byte[] buffer)
throws IOException {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java?rev=1817283&r1=1817282&r2=1817283&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
Wed Dec 6 10:50:21 2017
@@ -87,6 +87,7 @@ public class MultipartStream {
* {@link ProgressListener}.
*/
public static class ProgressNotifier {
+
/**
* The listener to invoke.
*/
@@ -226,7 +227,7 @@ public class MultipartStream {
private final byte[] boundary;
/**
- * The table for Knuth-Morris-Pratt search algorithm
+ * The table for Knuth-Morris-Pratt search algorithm.
*/
private int[] boundaryTable;
@@ -302,7 +303,7 @@ public class MultipartStream {
}
this.input = input;
- this.bufSize = Math.max(bufSize, boundaryLength*2);
+ this.bufSize = Math.max(bufSize, boundaryLength * 2);
this.buffer = new byte[this.bufSize];
this.notifier = pNotifier;
@@ -732,7 +733,6 @@ public class MultipartStream {
*/
public static class IllegalBoundaryException extends IOException {
-
/**
* The UID to use when serializing this instance.
*/
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/ThresholdingOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/ThresholdingOutputStream.java?rev=1817283&r1=1817282&r2=1817283&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/ThresholdingOutputStream.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/ThresholdingOutputStream.java
Wed Dec 6 10:50:21 2017
@@ -68,7 +68,7 @@ public abstract class ThresholdingOutput
*
* @param threshold The number of bytes at which to trigger an event.
*/
- public ThresholdingOutputStream(int threshold)
+ public ThresholdingOutputStream(final int threshold)
{
this.threshold = threshold;
}
@@ -82,10 +82,10 @@ public abstract class ThresholdingOutput
*
* @param b The byte to be written.
*
- * @exception IOException if an error occurs.
+ * @throws IOException if an error occurs.
*/
@Override
- public void write(int b) throws IOException
+ public void write(final int b) throws IOException
{
checkThreshold(1);
getStream().write(b);
@@ -99,10 +99,10 @@ public abstract class ThresholdingOutput
*
* @param b The array of bytes to be written.
*
- * @exception IOException if an error occurs.
+ * @throws IOException if an error occurs.
*/
@Override
- public void write(byte b[]) throws IOException
+ public void write(final byte b[]) throws IOException
{
checkThreshold(b.length);
getStream().write(b);
@@ -118,10 +118,10 @@ public abstract class ThresholdingOutput
* @param off The start offset in the byte array.
* @param len The number of bytes to write.
*
- * @exception IOException if an error occurs.
+ * @throws IOException if an error occurs.
*/
@Override
- public void write(byte b[], int off, int len) throws IOException
+ public void write(final byte b[], final int off, final int len) throws
IOException
{
checkThreshold(len);
getStream().write(b, off, len);
@@ -133,7 +133,7 @@ public abstract class ThresholdingOutput
* Flushes this output stream and forces any buffered output bytes to be
* written out.
*
- * @exception IOException if an error occurs.
+ * @throws IOException if an error occurs.
*/
@Override
public void flush() throws IOException
@@ -146,7 +146,7 @@ public abstract class ThresholdingOutput
* Closes this output stream and releases any system resources associated
* with this stream.
*
- * @exception IOException if an error occurs.
+ * @throws IOException if an error occurs.
*/
@Override
public void close() throws IOException
@@ -155,7 +155,7 @@ public abstract class ThresholdingOutput
{
flush();
}
- catch (IOException ignored)
+ catch (final IOException ignored)
{
// ignore
}
@@ -190,9 +190,9 @@ public abstract class ThresholdingOutput
* @param count The number of bytes about to be written to the underlying
* output stream.
*
- * @exception IOException if an error occurs.
+ * @throws IOException if an error occurs.
*/
- protected void checkThreshold(int count) throws IOException
+ protected void checkThreshold(final int count) throws IOException
{
if (!thresholdExceeded && written + count > threshold)
{
@@ -210,7 +210,7 @@ public abstract class ThresholdingOutput
*
* @return The underlying output stream.
*
- * @exception IOException if an error occurs.
+ * @throws IOException if an error occurs.
*/
protected abstract OutputStream getStream() throws IOException;
@@ -220,7 +220,7 @@ public abstract class ThresholdingOutput
* subclass should take whatever action necessary on this event. This may
* include changing the underlying output stream.
*
- * @exception IOException if an error occurs.
+ * @throws IOException if an error occurs.
*/
protected abstract void thresholdReached() throws IOException;
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java?rev=1817283&r1=1817282&r2=1817283&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
Wed Dec 6 10:50:21 2017
@@ -140,6 +140,12 @@ public class DiskFileItem
*/
private FileItemHeaders headers;
+ /**
+ * Default content charset to be used when no explicit charset
+ * parameter is provided by the sender.
+ */
+ private String defaultCharset = DEFAULT_CHARSET;
+
// ----------------------------------------------------------- Constructors
/**
@@ -335,7 +341,7 @@ public class DiskFileItem
byte[] rawdata = get();
String charset = getCharSet();
if (charset == null) {
- charset = DEFAULT_CHARSET;
+ charset = defaultCharset;
}
try {
return new String(rawdata, charset);
@@ -422,7 +428,7 @@ public class DiskFileItem
public void delete() {
cachedContent = null;
File outputFile = getStoreLocation();
- if (outputFile != null && outputFile.exists()) {
+ if (outputFile != null && !isInMemory() && outputFile.exists()) {
outputFile.delete();
}
}
@@ -535,7 +541,7 @@ public class DiskFileItem
*/
@Override
protected void finalize() {
- if (dfos == null) {
+ if (dfos == null || dfos.isInMemory()) {
return;
}
File outputFile = dfos.getFile();
@@ -622,4 +628,21 @@ public class DiskFileItem
headers = pHeaders;
}
+ /**
+ * Returns the default charset for use when no explicit charset
+ * parameter is provided by the sender.
+ * @return the default charset
+ */
+ public String getDefaultCharset() {
+ return defaultCharset;
+ }
+
+ /**
+ * Sets the default charset for use when no explicit charset
+ * parameter is provided by the sender.
+ * @param charset the default charset
+ */
+ public void setDefaultCharset(String charset) {
+ defaultCharset = charset;
+ }
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java?rev=1817283&r1=1817282&r2=1817283&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java
Wed Dec 6 10:50:21 2017
@@ -77,6 +77,12 @@ public class DiskFileItemFactory impleme
*/
private int sizeThreshold = DEFAULT_SIZE_THRESHOLD;
+ /**
+ * Default content charset to be used when no explicit charset
+ * parameter is provided by the sender.
+ */
+ private String defaultCharset = DiskFileItem.DEFAULT_CHARSET;
+
// ----------------------------------------------------------- Constructors
/**
@@ -173,7 +179,27 @@ public class DiskFileItemFactory impleme
@Override
public FileItem createItem(String fieldName, String contentType,
boolean isFormField, String fileName) {
- return new DiskFileItem(fieldName, contentType,
+ DiskFileItem result = new DiskFileItem(fieldName, contentType,
isFormField, fileName, sizeThreshold, repository);
+ result.setDefaultCharset(defaultCharset);
+ return result;
+ }
+
+ /**
+ * Returns the default charset for use when no explicit charset
+ * parameter is provided by the sender.
+ * @return the default charset
+ */
+ public String getDefaultCharset() {
+ return defaultCharset;
+ }
+
+ /**
+ * Sets the default charset for use when no explicit charset
+ * parameter is provided by the sender.
+ * @param pCharset the default charset
+ */
+ public void setDefaultCharset(String pCharset) {
+ defaultCharset = pCharset;
}
}
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=1817283&r1=1817282&r2=1817283&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Dec 6 10:50:21 2017
@@ -98,6 +98,10 @@
Update the internal fork of Commons DBCP 2 to 8a71764 (2017-10-18) to
pick up some bug fixes and enhancements. (markt)
</update>
+ <update>
+ Update the internal fork of Commons FileUpload to 6c00d57 (2017-11-23)
+ to pick up some code clean-up. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
