[Bug 61105] Roll log files by default
https://bz.apache.org/bugzilla/show_bug.cgi?id=61105
--- Comment #5 from Konstantin Kolinko ---
(In reply to Violeta Georgieva from comment #3)
> Hi,
>
> What do you think about this approach?
> https://github.com/apache/tomcat/pull/60
>
+public static final int DEFAULT_MAX_DAYS = 90;
+private int maxDays = DEFAULT_MAX_DAYS;
I do not like the idea of built-in default limit in java code.
I am open to discuss whether it is feasible for Tomcat 9,
but such built-in limit cannot be backported to stable versions (8.5 and
earlier).
I think it is better to add limits explicitly to the default logging.properties
configuration.
+String sMaxDays = getProperty(className + ".maxDays",
String.valueOf(DEFAULT_MAX_DAYS));
+if (maxDays <= 0) {
+try {
+maxDays = Integer.parseInt(sMaxDays);
+} catch (NumberFormatException ignore) {
+// no-op
+}
+}
I think the above try/catch block is never executed, as "if (maxDays <= 0)" is
always false, as maxDays is "90" by default.
+private DirectoryStream streamFilesForDelete() throws IOException {
+FileTime maxDaysOffset = FileTime.from(Instant.now().minus(maxDays,
ChronoUnit.DAYS));
+return Files.newDirectoryStream(new File(directory).toPath(), path ->
{
+String fileName = path.getFileName().toString();
+return fileName.startsWith(prefix) && fileName.endsWith(suffix)
+&&
Files.getLastModifiedTime(path).compareTo(maxDaysOffset) < 0;
+});
+}
I do not like the above.
1. "fileName.startsWith(prefix)" will result in false positives.
2. I'd prefer to test the date in the file name, not file modification date.
BTW, for access logs I usually have an empty prefix, grouping the files into
separate directories by month:
fileDateFormat="-MM'/webappname.'-MM-dd"
prefix=""
suffix=".access.log"
Such feature is not implemented for JULI logging yet. If it were, the
"fileName.startsWith(prefix)" here would be true for every file.
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-8-trunk
The Buildbot has detected a new failure on builder tomcat-8-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-8-trunk/builds/1027 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1797830 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Documentation Contribution: Tomcat Container Managed Security
On 03/06/17 04:00, Adrian Bartlett wrote: > Thanks for your feedback Mark. Its been a while, but I made some updates to > address your comments. And the updated dashboards are here: > * https://design.codelytics.io/tomcat/security-login-form > * https://design.codelytics.io/tomcat/security-login > > If I was to work with one of Tomcat's expert/senior contributors, we could > document the entire Tomcat architecture. An example of a dashboard more at > the architectural level is here: > https://design.codelytics.io/tomcat/jdbc-query. Notice in the sequence > diagram how the objects have been grouped into packages, which enables a > higher level of abstraction at the architectural level. > > This documentation would give new contributors the ability: > * To get up to speed quickly on the inner workings of Tomcat, and > contributing sooner > * To better align their work with Tomcat's existing architecture > > Users could also read the documentation to gain a greater understanding of > Tomcat, and improved ability to self serve. > > We could tie the documentation generation into your CI/CD system, so the > documentation was always up to date and hosted on your own servers. > > If you think this can add value, send through an email of someone > interested in helping. And we can go about capturing Tomcat's important > concepts. I'm probably one of the worst people to ask if this would be useful since I'm pretty familiar with most of the Tomcat code base. Some input from people newer to Tomcat and still finding their way around some areas would be better placed to point your efforts in the most useful direction. Mark > > I have been using Tomcat since 1999 and would be tickled pink if I could > help out in this way. > > > > On Fri, Mar 10, 2017 at 10:18 PM, Mark Thomas wrote: > >> On 10/03/17 11:19, Adrian Bartlett wrote: >>> Hi All, >>> >>> I documented the: */jsp/security/protected/index.html*, example that >>> comes bundled with Tomcat. It is documented using Sequence Diagrams and >>> Class Diagrams in the following two dashboards: >>> https://design.codelytics.io/?dashboardId=tomcat.cms.login_form >>> https://design.codelytics.io/?dashboardId=tomcat.cms.login >>> >>> If you feel that this type of documentation is useful for Tomcat users >> and >>> developers. I can document other aspects of Tomcat, like Realms, >> Connection >>> Pooling, Valves etc. >> >> Anything that helps users understand how things like this work is good. >> >> I found the UI a little clunky and my personal preference is to see more >> information on the screen at once. >> >> You need to include part 2 of the security constraint in the excerpt >> from web.xml in the intro. >> >> I suggest asking for feedback on the users list to see which areas are >> of greatest interest. >> >> Kind regards, >> >> Mark >> >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> >> > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1797392 - in /tomcat/trunk/java: javax/el/Util.java org/apache/el/util/ReflectionUtil.java
On 02/06/17 16:34, Mark Thomas wrote:
> On 2 June 2017 15:06:00 BST, schu...@apache.org wrote:
>> Author: schultz
>> Date: Fri Jun 2 14:06:00 2017
>> New Revision: 1797392
>>
>> URL: http://svn.apache.org/viewvc?rev=1797392&view=rev
>> Log:
>> Add equals() and hashCode() methods to Util.MatchResult for
>> completeness.
>>
>> Modified:
>>tomcat/trunk/java/javax/el/Util.java
>>tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
>
> This is a spec class you are modifying. Those sort of changes make me
> nervous. Can you expand on why you think this code is necessary?
>
> Does it change behaviour? If yes, what is the spec justification for doing
> so? If no, why bother?
Ping.
Mark
>
> Mark
>
>
>>
>> Modified: tomcat/trunk/java/javax/el/Util.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/Util.java?rev=1797392&r1=1797391&r2=1797392&view=diff
>> ==
>> --- tomcat/trunk/java/javax/el/Util.java (original)
>> +++ tomcat/trunk/java/javax/el/Util.java Fri Jun 2 14:06:00 2017
>> @@ -772,5 +772,29 @@ class Util {
>> }
>> return cmp;
>> }
>> +
>> +@Override
>> +public boolean equals(Object o)
>> +{
>> +return o == this
>> +|| (null != o
>> +&& this.getClass().equals(o.getClass())
>> +&& ((MatchResult)o).getExact() == this.getExact()
>> +&& ((MatchResult)o).getAssignable() ==
>> this.getAssignable()
>> +&& ((MatchResult)o).getCoercible() ==
>> this.getCoercible()
>> +&& ((MatchResult)o).isBridge() == this.isBridge()
>> +)
>> +;
>> +}
>> +
>> +@Override
>> +public int hashCode()
>> +{
>> +return (this.isBridge() ? 1 << 24 : 0)
>> +^ this.getExact() << 16
>> +^ this.getAssignable() << 8
>> +^ this.getCoercible()
>> +;
>> +}
>> }
>> }
>>
>> Modified: tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java?rev=1797392&r1=1797391&r2=1797392&view=diff
>> ==
>> --- tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java (original)
>> +++ tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java Fri Jun 2
>> 14:06:00 2017
>> @@ -502,6 +502,30 @@ public class ReflectionUtil {
>> }
>> return cmp;
>> }
>> +
>> +@Override
>> +public boolean equals(Object o)
>> +{
>> +return o == this
>> +|| (null != o
>> +&& this.getClass().equals(o.getClass())
>> +&& ((MatchResult)o).getExact() == this.getExact()
>> +&& ((MatchResult)o).getAssignable() ==
>> this.getAssignable()
>> +&& ((MatchResult)o).getCoercible() ==
>> this.getCoercible()
>> +&& ((MatchResult)o).isBridge() == this.isBridge()
>> +)
>> +;
>> +}
>> +
>> +@Override
>> +public int hashCode()
>> +{
>> +return (this.isBridge() ? 1 << 24 : 0)
>> +^ this.getExact() << 16
>> +^ this.getAssignable() << 8
>> +^ this.getCoercible()
>> +;
>> +}
>> }
>>
>> }
>>
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797831 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/AbstractProcessor.java webapps/docs/changelog.xml
Author: markt Date: Tue Jun 6 21:33:36 2017 New Revision: 1797831 URL: http://svn.apache.org/viewvc?rev=1797831&view=rev Log: Revert a change introduced in the fix for bug 60718 that changed the status code recorded in the access log when the client dropped the connection from 200 to 500. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 6 21:33:36 2017 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702 742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1 726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523 -/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,1740981,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,1743118,1743126,1743139-1743140,1743718,1743722,1743724,1744059,1744127,1744151,1744232,1744377,1744687,1744698,1744706,1745228,1746940,1748548,1748716,1749288,17493
svn commit: r1797830 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/coyote/AbstractProcessor.java webapps/docs/changelog.xml
Author: markt Date: Tue Jun 6 21:32:54 2017 New Revision: 1797830 URL: http://svn.apache.org/viewvc?rev=1797830&view=rev Log: Revert a change introduced in the fix for bug 60718 that changed the status code recorded in the access log when the client dropped the connection from 200 to 500. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 6 21:32:54 2017 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452 7,1684549-1684550,1685556,1685591,16
svn commit: r1797829 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/AbstractProcessor.java webapps/docs/changelog.xml
Author: markt Date: Tue Jun 6 21:32:25 2017 New Revision: 1797829 URL: http://svn.apache.org/viewvc?rev=1797829&view=rev Log: Revert a change introduced in the fix for bug 60718 that changed the status code recorded in the access log when the client dropped the connection from 200 to 500. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProcessor.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 6 21:32:25 2017 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747 536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1 756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216 8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,176341
svn commit: r1797828 - in /tomcat/trunk: java/org/apache/coyote/AbstractProcessor.java webapps/docs/changelog.xml
Author: markt
Date: Tue Jun 6 21:31:44 2017
New Revision: 1797828
URL: http://svn.apache.org/viewvc?rev=1797828&view=rev
Log:
Revert a change introduced in the fix for bug 60718 that changed the status
code recorded in the access log when the client dropped the connection from 200
to 500.
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1797828&r1=1797827&r2=1797828&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Tue Jun 6
21:31:44 2017
@@ -80,7 +80,10 @@ public abstract class AbstractProcessor
protected void setErrorState(ErrorState errorState, Throwable t) {
boolean blockIo = this.errorState.isIoAllowed() &&
!errorState.isIoAllowed();
this.errorState = this.errorState.getMostSevere(errorState);
-if (response.getStatus() < 400) {
+// Don't change the status code for IOException since that is almost
+// certainly a client disconnect in which case it is preferable to keep
+// the original status code
http://markmail.org/message/4cxpwmxhtgnrwh7n
+if (response.getStatus() < 400 && !(t instanceof IOException)) {
response.setStatus(500);
}
if (t != null) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1797828&r1=1797827&r2=1797828&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun 6 21:31:44 2017
@@ -93,6 +93,11 @@
61120: Do not ignore path parameters when processing HTTP/2
requests. (markt)
+
+Revert a change introduced in the fix for bug 60718 that
+changed the status code recorded in the access log when the client
+dropped the connection from 200 to 500. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Timescale for 8.0.x EOL
On Tue, Jun 6, 2017 at 3:24 PM, Felix Schumacher wrote: > > > Am 6. Juni 2017 20:39:44 MESZ schrieb Violeta Georgieva > : >>Hi, >> >>2017-06-05 16:51 GMT+03:00 Mark Thomas : >>> >>> On 19/05/17 23:19, Christopher Schultz wrote: >>> >>> >>> >>> > My proposal, adapted from the thread before discussion ceased last >>summer: >>> > >>> > 1. Set Tomcat 8.0.x EOL date for 31 May 2018 >>> > 2. Discontinue monthly release cadence for Tomcat 8.0.x after >>8.0.45 >>> > 3. Make these announcements as soon as we have agreed to the >>details for >>> > #1 and #2 >>> >>> Yet again I managed to respond to the sender rather than the list... >>> >>> +1, for #1 and #3 assuming that we make this 30 June 2018. >>> >>> I'm neutral on #2 since it is unlikely to be me doing the releases. >>I've >>> no objection to monthly releases if someone wants to take that on. I >>> suspect every 2 to 3 months would be sufficient. >> >>In case there are enough people that can test the releases and vote I >>can >>do the releases for example every 2 months. > > I will try to test and vote. +1, me too :) > > Felix > >> >>Regards, >>Violeta >> >>> >>> Mark >>> >>> - >>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >>> For additional commands, e-mail: dev-h...@tomcat.apache.org >>> > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Timescale for 8.0.x EOL
Am 6. Juni 2017 20:39:44 MESZ schrieb Violeta Georgieva : >Hi, > >2017-06-05 16:51 GMT+03:00 Mark Thomas : >> >> On 19/05/17 23:19, Christopher Schultz wrote: >> >> >> >> > My proposal, adapted from the thread before discussion ceased last >summer: >> > >> > 1. Set Tomcat 8.0.x EOL date for 31 May 2018 >> > 2. Discontinue monthly release cadence for Tomcat 8.0.x after >8.0.45 >> > 3. Make these announcements as soon as we have agreed to the >details for >> > #1 and #2 >> >> Yet again I managed to respond to the sender rather than the list... >> >> +1, for #1 and #3 assuming that we make this 30 June 2018. >> >> I'm neutral on #2 since it is unlikely to be me doing the releases. >I've >> no objection to monthly releases if someone wants to take that on. I >> suspect every 2 to 3 months would be sufficient. > >In case there are enough people that can test the releases and vote I >can >do the releases for example every 2 months. I will try to test and vote. Felix > >Regards, >Violeta > >> >> Mark >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Timescale for 8.0.x EOL
Hi, 2017-06-05 16:51 GMT+03:00 Mark Thomas : > > On 19/05/17 23:19, Christopher Schultz wrote: > > > > > My proposal, adapted from the thread before discussion ceased last summer: > > > > 1. Set Tomcat 8.0.x EOL date for 31 May 2018 > > 2. Discontinue monthly release cadence for Tomcat 8.0.x after 8.0.45 > > 3. Make these announcements as soon as we have agreed to the details for > > #1 and #2 > > Yet again I managed to respond to the sender rather than the list... > > +1, for #1 and #3 assuming that we make this 30 June 2018. > > I'm neutral on #2 since it is unlikely to be me doing the releases. I've > no objection to monthly releases if someone wants to take that on. I > suspect every 2 to 3 months would be sufficient. In case there are enough people that can test the releases and vote I can do the releases for example every 2 months. Regards, Violeta > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
[Bug 61105] Roll log files by default
https://bz.apache.org/bugzilla/show_bug.cgi?id=61105 --- Comment #4 from Violeta Georgieva --- Hi, In the PR [1] there is a proposal for merging the proposed functionality with https://github.com/apache/tomee/blob/master/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java I checked the TomEE's LocalFileHandler and it provides many useful features. If there is a demand I can port it to Tomcat. Regards, Violeta [1] https://github.com/apache/tomcat/pull/60 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60461] SIGSEGV in SSLSocket.getInfos
https://bz.apache.org/bugzilla/show_bug.cgi?id=60461 --- Comment #29 from Christopher Schultz --- Ludovic, why are you building OpenSSL in "no-shared" mode? If you are building OpenSSL in no-shared mode, how is OpenSSL 1.0.2j being loaded into the JVM process? Are you statically-linking OpenSSL into libtcnative? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60461] SIGSEGV in SSLSocket.getInfos
https://bz.apache.org/bugzilla/show_bug.cgi?id=60461 --- Comment #28 from Christopher Schultz --- This *is* tcnative. It extends beyond the scope of the APR connector. Can you reproduce this in a testing environment? I have a small patch for sslinfo.c: At line 293, add this: s = (tcn_ssl_conn_t *)(a->opaque);// <--- this is existing line 292 assert(NULL != sock); assert(NULL != a); assert(NULL != s); assert(NULL != s->ssl); Re-build and let me know if it aborts on any of those lines. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60461] SIGSEGV in SSLSocket.getInfos
https://bz.apache.org/bugzilla/show_bug.cgi?id=60461 --- Comment #27 from matt...@cacorp.com --- (In reply to Remy Maucherat from comment #20) > Are you really going to update this BZ every two weeks whenever you > experience a JVM crash ? Surely you realize posting the same thing ten times > isn't going to help, right ? > > I'd recommend trying NIO(1 or 2) with OpenSSL at this point, since this > isn't going to be fixed for a while, most likely. Ok, so my server is now running NIO with OpenSSL and I got another crash. It seems to be related to this as it has a common origin. j org.apache.tomcat.jni.SSL.getCipherForSSL(J)Ljava/lang/String;+0 j org.apache.tomcat.util.net.openssl.OpenSSLEngine$OpenSSLSession.getCipherSuite()Ljava/lang/String;+30 j org.apache.tomcat.util.net.jsse.JSSESupport.getCipherSuite()Ljava/lang/String;+13 j org.apache.coyote.AbstractProcessor.populateSslRequestAttributes()V+11 vs J 63194 org.apache.tomcat.jni.SSLSocket.getInfoS(JI)Ljava/lang/String; (0 bytes) @ 0x016e3a04 [0x016e39c0+0x44] j org.apache.tomcat.util.net.AprSSLSupport.getCipherSuite()Ljava/lang/String;+24 j org.apache.coyote.AbstractProcessor.populateSslRequestAttributes()V+11 So it appears that the problem extends beyond tcnative. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61160] Missing reason phrase breaks BitKinex WebDAV client
https://bz.apache.org/bugzilla/show_bug.cgi?id=61160 --- Comment #2 from Olivier Jaquemet --- I completely agree with you on that, this is a BitKinex bug. However - as you know, sendReasonPhrase option is not going to be available anymore in Tomcat 9 as a workaround. - I wanted to enter this bug so the tomcat team would precisely know that this regression has been introduced for this (old and probably unmaintained) WebDAV client. Just in case it would change your decision on this breaking change. This bug now exists a reference on this subject. I did not expect more than that :) Thanks for your work on TC. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61160] Missing reason phrase breaks BitKinex WebDAV client
https://bz.apache.org/bugzilla/show_bug.cgi?id=61160 Christopher Schultz changed: What|Removed |Added Resolution|--- |INVALID OS||All Status|NEW |RESOLVED --- Comment #1 from Christopher Schultz --- This is not a bug in Tomcat, but in the BitKinex client. Tomcat 8.5 has a configuration parameter on the to re-enable the reason phrase: sendReasonPhrase https://tomcat.apache.org/tomcat-8.5-doc/config/http.html -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 60362] Missing reason phrase in response
https://bz.apache.org/bugzilla/show_bug.cgi?id=60362 --- Comment #65 from Olivier Jaquemet --- Hi, Just so you know, BitKinex WebDAV client is impacted by this missing reason phrase and it can no longer access any webdav servlet configured in Tomcat unless sendReasonPhrase="true" is configured. I just created the following bug report to make sure it gets identified if some user look for those symptoms : https://bz.apache.org/bugzilla/show_bug.cgi?id=61160 It might help you revise current tomcat decision to remove the phrase, if you were to consider BitKinex a widespread enough client. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61160] New: Missing reason phrase breaks BitKinex WebDAV client
https://bz.apache.org/bugzilla/show_bug.cgi?id=61160 Bug ID: 61160 Summary: Missing reason phrase breaks BitKinex WebDAV client Product: Tomcat 8 Version: 8.5.15 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: olivier.jaque...@jalios.com Target Milestone: To reproduce : * Configure Tomcat WebDAV servlet in any webapp, for example with the following configuration : webdav org.apache.catalina.servlets.WebdavServlet debug 0 listings true readonly false webdav /* * Attempt to connect to this webdav server using BitKinex WebDAV client (http://www.bitkinex.com) --> BUG : connection fails * Update the connector configuration in server.xml to reintroduce the reason phrase : * Attempt the BitKinex connexion again --> connection succeeed I guess this bug will be be marked as a duplicate of #60362, but : * I wanted to make it obvious for any user looking for this information. * I think it add another argument to keep the reason phrase for legacy clients (even though I completely understand that Tomcat adheres the spec, and that BitKinex is not properly handling the status response) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61156] ExpiresFilter is not working
https://bz.apache.org/bugzilla/show_bug.cgi?id=61156 --- Comment #2 from Brian McGinity --- Thank you for your response. So I understand what to ask the mailing list... You're saying is /cache/* will match paths along the lines of: http://site.com/cache/cache/file.js http://site.com/cache/cache/file.css and it will not match: http://site.com/cache/file.js http://site.com/cache/file.css That seems odd, not sure if I understand that. I will ask the mailing list. Also thank you for letting me know about context definitions inside of server.xml. Yeah, I just read that this is bad practice because it cannot be changed without restarting. It looks like this can be moved to /META-INF/context.xml. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 45931] trimSpaces incorrectly modifies output
https://bz.apache.org/bugzilla/show_bug.cgi?id=45931 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #11 from Mark Thomas --- A variation of this patch has been applied to 9.0.x for 9.0.0.M22 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797782 - in /tomcat/trunk: conf/ java/org/apache/jasper/ java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ webapps/docs/
Author: markt
Date: Tue Jun 6 12:10:04 2017
New Revision: 1797782
URL: http://svn.apache.org/viewvc?rev=1797782&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=45931
Extend Jasper's timeSpaces option to add support for single which replaces
template text that consists entirely of whitespace with a single space
character.
Based on a patch by Meetesh Karia.
Added:
tomcat/trunk/java/org/apache/jasper/TrimSpacesOption.java (with props)
Modified:
tomcat/trunk/conf/web.xml
tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/Options.java
tomcat/trunk/java/org/apache/jasper/compiler/TextOptimizer.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/jasper-howto.xml
Modified: tomcat/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1797782&r1=1797781&r2=1797782&view=diff
==
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Tue Jun 6 12:10:04 2017
@@ -233,7 +233,13 @@
-
+
+
+
+
+
+
+
Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1797782&r1=1797781&r2=1797782&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original)
+++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Tue Jun 6
12:10:04 2017
@@ -63,9 +63,9 @@ public final class EmbeddedServletOption
private boolean keepGenerated = true;
/**
- * Should template text that consists entirely of whitespace be removed?
+ * How should template text that consists entirely of whitespace be
handled?
*/
-private boolean trimSpaces = false;
+private TrimSpacesOption trimSpaces = TrimSpacesOption.FALSE;
/**
* Determines whether tag handler pooling is enabled.
@@ -238,11 +238,8 @@ public final class EmbeddedServletOption
return keepGenerated;
}
-/**
- * Should template text that consists entirely of whitespace be removed?
- */
@Override
-public boolean getTrimSpaces() {
+public TrimSpacesOption getTrimSpaces() {
return trimSpaces;
}
@@ -499,13 +496,11 @@ public final class EmbeddedServletOption
String trimsp = config.getInitParameter("trimSpaces");
if (trimsp != null) {
-if (trimsp.equalsIgnoreCase("true")) {
-trimSpaces = true;
-} else if (trimsp.equalsIgnoreCase("false")) {
-trimSpaces = false;
-} else {
+try {
+trimSpaces = TrimSpacesOption.valueOf(trimsp.toUpperCase());
+} catch (IllegalArgumentException iae) {
if (log.isWarnEnabled()) {
-log.warn(Localizer.getMessage("jsp.warning.trimspaces"));
+log.warn(Localizer.getMessage("jsp.warning.trimspaces"),
iae);
}
}
}
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1797782&r1=1797781&r2=1797782&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Tue Jun 6 12:10:04 2017
@@ -167,7 +167,7 @@ public class JspC extends Task implement
protected String classPath = null;
protected ClassLoader loader = null;
-protected boolean trimSpaces = false;
+protected TrimSpacesOption trimSpaces = TrimSpacesOption.FALSE;
protected boolean genStringAsCharArray = false;
protected boolean validateTld;
protected boolean validateXml;
@@ -348,7 +348,13 @@ public class JspC extends Task implement
} else if (tok.equals(SWITCH_XPOWERED_BY)) {
xpoweredBy = true;
} else if (tok.equals(SWITCH_TRIM_SPACES)) {
-setTrimSpaces(true);
+tok = nextArg();
+if (TrimSpacesOption.SINGLE.toString().equalsIgnoreCase(tok)) {
+setTrimSpaces(TrimSpacesOption.SINGLE);
+} else {
+setTrimSpaces(TrimSpacesOption.TRUE);
+argPos--;
+}
} else if (tok.equals(SWITCH_CACHE)) {
tok = nextArg();
svn commit: r1797781 - in /tomcat/trunk/java/org/apache/jasper/resources: LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties LocalStrings_ja.properties
Author: markt
Date: Tue Jun 6 12:04:08 2017
New Revision: 1797781
URL: http://svn.apache.org/viewvc?rev=1797781&view=rev
Log:
Make usage message consistent. Use English version for an option if a
translation is not available.
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1797781&r1=1797780&r2=1797781&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Tue
Jun 6 12:04:08 2017
@@ -157,38 +157,38 @@ jspc.compilation.result=Compilation comp
jspc.implicit.uriRoot=uriRoot implicitly set to [{0}]
jspc.usage=Usage: jspc [--] \n\
where jsp files is\n\
-\-webapp A directory containing a web-app, whose JSP pages\n\
-\ will be processed recursively\n\
+\-webapp A directory containing a web-app, whose JSP pages\n\
+\ will be processed recursively\n\
or any number of\n\
-\ A file to be parsed as a JSP page\n\
+\A file to be parsed as a JSP page\n\
where options include:\n\
-\-help Print this help message\n\
-\-v Verbose mode\n\
-\-dOutput Directory (default -Djava.io.tmpdir)\n\
-\-l Outputs the name of the JSP page upon failure\n\
-\-s Outputs the name of the JSP page upon success\n\
-\-p Name of target package (default org.apache.jsp)\n\
-\-c Name of target class name (only applies to first JSP
page)\n\
-\-mappedGenerates separate write() calls for each HTML line in
the JSP\n\
-\-die[#]Generates an error return code (#) on fatal errors
(default 1)\n\
-\-uribase The uri directory compilations should be relative to\n\
-\ (default "/")\n\
-\-uriroot Same as -webapp\n\
-\-compile Compiles generated servlets\n\
-\-failFast Stop on first compile error\n\
-\-webinc Creates a partial servlet mappings in the file\n\
-\-webxml Creates a complete web.xml in the file\n\
+\-help Print this help message\n\
+\-vVerbose mode\n\
+\-d Output Directory (default -Djava.io.tmpdir)\n\
+\-lOutputs the name of the JSP page upon failure\n\
+\-sOutputs the name of the JSP page upon success\n\
+\-p Name of target package (default org.apache.jsp)\n\
+\-c Name of target class name (only applies to first
JSP page)\n\
+\-mapped Generates separate write() calls for each HTML line
in the JSP\n\
+\-die[#] Generates an error return code (#) on fatal errors
(default 1)\n\
+\-uribase The uri directory compilations should be relative
to\n\
+\ (default "/")\n\
+\-uriroot Same as -webapp\n\
+\-compile Compiles generated servlets\n\
+\-failFast Stop on first compile error\n\
+\-webinc Creates a partial servlet mappings in the file\n\
+\-webxml Creates a complete web.xml in the file\n\
\-webxmlencoding Set the encoding charset used to read and write the
web.xml\n\
-\ file (default is UTF-8)\n\
-\-addwebxmlmappings Merge generated web.xml fragment into the web.xml file
of the\n\
-\ web-app, whose JSP pages we are processing\n\
-\-ieplugin Java Plugin classid for Internet Explorer\n\
-\-classpath Overrides java.class.path system property\n\
-\-xpoweredByAdd X-Powered-By response header\n\
-\-trimSpaces Remove template text that consists entirely of
whitespace\n\
-\-javaEncoding Set the encoding charset for Java classes (default
UTF-8)\n\
-\-sourceSet the -source argument to the compiler (default
1.8)\n\
-\-targetSet the -target argument to the compiler (default
1.8)\n\
+\ file (default is UTF-8)\n\
+\-addwebxmlmappingsMerge generated web.xml fragment into the web.xml
file of the\n\
+\ web-app, whose JSP pages we are processing\n\
+\-ieplugin Java Plugin classid for Internet Explorer\n\
+\-classpath Overrides java.class.path system property\n\
+\-xpoweredBy Add X-Powered-By respo
[GitHub] tomcat issue #60: Introduce new logging configuration per handler - maxDays.
Github user rmannibucau commented on the issue: https://github.com/apache/tomcat/pull/60 @violetagg hello Violeta, would it be interesting to merge it with tomee handler (https://github.com/apache/tomee/blob/master/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java) ? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61105] Roll log files by default
https://bz.apache.org/bugzilla/show_bug.cgi?id=61105 --- Comment #3 from Violeta Georgieva --- Hi, What do you think about this approach? https://github.com/apache/tomcat/pull/60 Thanks, Violeta -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request #60: Introduce new logging configuration per handler - m...
GitHub user violetagg opened a pull request: https://github.com/apache/tomcat/pull/60 Introduce new logging configuration per handler - maxDays. This configuration gives the possibility to specify the maximum days that the log files will be kept on the file system. This can be applied on a handler level. If the specified value is <= 0 then the log files will be kept forever, otherwise they will be kept the specified maximum days and after that they will be deleted. The default value is 90 days. You can merge this pull request into a Git repository by running: $ git pull https://github.com/violetagg/tomcat delete-old-log-files Alternatively you can review and apply these changes as the patch at: https://github.com/apache/tomcat/pull/60.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #60 commit 3bcaa4b162a9af789c133372b26d114f2c0efca0 Author: Violeta Georgieva Date: 2017-06-06T10:44:34Z Introduce new logging configuration per handler - maxDays. This configuration gives the possibility to specify the maximum days that the log files will be kept on the file system. This can be applied on a handler level. If the specified value is <= 0 then the log files will be kept forever, otherwise they will be kept the specified maximum days and after that they will be deleted. The default value is 90 days. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[SECURITY] CVE-2017-5664 Apache Tomcat Security Constraint Bypass
Severity: Important Vendor: The Apache Software Foundation Versions Affected: Apache Tomcat 9.0.0.M1 to 9.0.0.M20 Apache Tomcat 8.5.0 to 8.5.14 Apache Tomcat 8.0.0.RC1 to 8.0.43 Apache Tomcat 7.0.0 to 7.0.77 Earlier, unsupported versions have not been analysed but are likely to be affected Description: The error page mechanism of the Java Servlet Specification requires that, when an error occurs and an error page is configured for the error that occurred, the original request and response are forwarded to the error page. This means that the request is presented to the error page with the original HTTP method. If the error page is a static file, expected behaviour is to serve content of the file as if processing a GET request, regardless of the actual HTTP method. Tomcat's Default Servlet did not do this. Depending on the original request this could lead to unexpected and undesirable results for static error pages including, if the DefaultServlet is configured to permit writes, the replacement or removal of the custom error page. Notes for other user provided error pages: - Unless explicitly coded otherwise, JSPs ignore the the HTTP method. JSPs used as error pages must must ensure that they handle any error dispatch as a GET request, regardless of the actual method. - By default, the response generated by a Servlet does depend on the HTTP method. Custom Servlets used as error pages must ensure that they handle any error dispatch as a GET request, regardless of the actual method. Mitigation: Users of the affected versions should apply one of the following mitigations: - Upgrade to Apache Tomcat 9.0.0.M21 or later - Upgrade to Apache Tomcat 8.5.15 or later - Upgrade to Apache Tomcat 8.0.44 or later - Upgrade to Apache Tomcat 7.0.78 or later Credit: This issue was reported responsibly to the Apache Tomcat Security Team by Aniket Nandkishor Kulkarni from Tata Consultancy Services Ltd, Mumbai, India as a vulnerability that allowed the restrictions on OPTIONS and TRACE requests to be bypassed. The full implications of this issue were then identified by the Tomcat Security Team. History: 2017-06-06 Original advisory References: [1] http://tomcat.apache.org/security-9.html [2] http://tomcat.apache.org/security-8.html [3] http://tomcat.apache.org/security-7.html - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797770 - in /tomcat/site/trunk: docs/security-7.html docs/security-8.html docs/security-9.html xdocs/security-7.xml xdocs/security-8.xml xdocs/security-9.xml
Author: markt Date: Tue Jun 6 10:21:52 2017 New Revision: 1797770 URL: http://svn.apache.org/viewvc?rev=1797770&view=rev Log: Add CVE-2017-5664 Modified: tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/docs/security-8.html tomcat/site/trunk/docs/security-9.html tomcat/site/trunk/xdocs/security-7.xml tomcat/site/trunk/xdocs/security-8.xml tomcat/site/trunk/xdocs/security-9.xml Modified: tomcat/site/trunk/docs/security-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1797770&r1=1797769&r2=1797770&view=diff == --- tomcat/site/trunk/docs/security-7.html (original) +++ tomcat/site/trunk/docs/security-7.html Tue Jun 6 10:21:52 2017 @@ -227,6 +227,9 @@ Apache Tomcat 7.x vulnerabilities +Fixed in Apache Tomcat 7.0.78 + + Fixed in Apache Tomcat 7.0.77 @@ -380,6 +383,64 @@ + +16 May 2017 Fixed in Apache Tomcat 7.0.78 + + + + +Important: Security Constraint Bypass + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-5664"; rel="nofollow">CVE-2017-5664 + + + +The error page mechanism of the Java Servlet Specification requires that, + when an error occurs and an error page is configured for the error that + occurred, the original request and response are forwarded to the error + page. This means that the request is presented to the error page with the + original HTTP method. + + +If the error page is a static file, expected behaviour is to serve content + of the file as if processing a GET request, regardless of the actual HTT + method. Tomcat's Default Servlet did not do this. Depending on the + original request this could lead to unexpected and undesirable results for + static error pages including, if the DefaultServlet is configured to + permit writes, the replacement or removal of the custom error page. + + +Notes for other user provided error pages: + + + +Unless explicitly coded otherwise, JSPs ignore the the HTTP method. + JSPs used as error pages must must ensure that they handle any error + dispatch as a GET request, regardless of the actual method. + +By default, the response generated by a Servlet does depend on the + HTTP method. Custom Servlets used as error pages must ensure that + they handle any error dispatch as a GET request, regardless of the + actual method. + + + + +This was fixed in revisions http://svn.apache.org/viewvc?view=rev&rev=1793471";>1793471 and + http://svn.apache.org/viewvc?view=rev&rev=1793491";>1793491. + + +This issue was reported responsibly to the Apache Tomcat Security Team by + Aniket Nandkishor Kulkarni from Tata Consultancy Services Ltd, Mumbai, + India as a vulnerability that allowed the restrictions on OPTIONS and + TRACE requests to be bypassed on 21 April 2017. The full implications of + this issue were identified by the Tomcat Security Team on 24 April 2017. + This issue was made public on 6 June 2017. + + +Affects: 7.0.0 to 7.0.77 + + + 2 April 2017 Fixed in Apache Tomcat 7.0.77 Modified: tomcat/site/trunk/docs/security-8.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-8.html?rev=1797770&r1=1797769&r2=1797770&view=diff == --- tomcat/site/trunk/docs/security-8.html (original) +++ tomcat/site/trunk/docs/security-8.html Tue Jun 6 10:21:52 2017 @@ -227,6 +227,12 @@ Apache Tomcat 8.x vulnerabilities +Fixed in Apache Tomcat 8.0.44 + + +Fixed in Apache Tomcat 8.5.15 + + Fixed in Apache Tomcat 8.0.43 @@ -341,6 +347,122 @@ + +16 May 2017 Fixed in Apache Tomcat 8.0.44 + + + + +Important: Security Constraint Bypass + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-5664"; rel="nofollow">CVE-2017-5664 + + + +The error page mechanism of the Java Servlet Specification requires that, + when an error occurs and an error page is configured for the error that + occurred, the original request and response are forwarded to the error + page. This means that the request is presented to the error page with the + original HTTP method. + + +If the error page is a static file, expected behaviour is to serve content + of the file as if processing a GET request, regardless of the actual HTT + method. Tomcat's Default Servlet did not do this. Depending on the + original request this could lead to unexpected and undesirable results for + static error pages including, if the DefaultServlet is configured to + permit writes, the replacement or removal of the custom error page. + + +Notes for other user provided error pages: + + + +Unless explicitly coded otherwise, JSPs ignore the the HTTP method. + JSPs used as error pag
svn commit: r1797767 - in /tomcat/site/trunk: docs/security-3.html docs/security-4.html docs/security-5.html docs/security-6.html xdocs/security-3.xml xdocs/security-4.xml xdocs/security-5.xml xdocs/s
Author: markt Date: Tue Jun 6 10:19:09 2017 New Revision: 1797767 URL: http://svn.apache.org/viewvc?rev=1797767&view=rev Log: Update upgrade recommendation for security fixes now that 6.0.x is EOL. Modified: tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/xdocs/security-3.xml tomcat/site/trunk/xdocs/security-4.xml tomcat/site/trunk/xdocs/security-5.xml tomcat/site/trunk/xdocs/security-6.xml Modified: tomcat/site/trunk/docs/security-3.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-3.html?rev=1797767&r1=1797766&r2=1797767&view=diff == --- tomcat/site/trunk/docs/security-3.html (original) +++ tomcat/site/trunk/docs/security-3.html Tue Jun 6 10:19:09 2017 @@ -269,8 +269,8 @@ Please note that Tomcat 3 is no longer supported. Further vulnerabilities - in the 3.x branches will not be fixed. Users should upgrade to - 6.x or 7.x to obtain security fixes. + in the 3.x branches will not be fixed. Users should upgrade to 7.x or + later to obtain security fixes. Please send comments or corrections for these vulnerabilities to the Modified: tomcat/site/trunk/docs/security-4.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?rev=1797767&r1=1797766&r2=1797767&view=diff == --- tomcat/site/trunk/docs/security-4.html (original) +++ tomcat/site/trunk/docs/security-4.html Tue Jun 6 10:19:09 2017 @@ -297,7 +297,7 @@ Please note that Tomcat 4.0.x and 4.1.x are no longer supported. Further vulnerabilities in the 4.0.x and 4.1.x branches will not be fixed. Users - should upgrade to 6.x or 7.x to obtain security fixes. + should upgrade to 7.x or later to obtain security fixes. Please send comments or corrections for these vulnerabilities to the Modified: tomcat/site/trunk/docs/security-5.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=1797767&r1=1797766&r2=1797767&view=diff == --- tomcat/site/trunk/docs/security-5.html (original) +++ tomcat/site/trunk/docs/security-5.html Tue Jun 6 10:19:09 2017 @@ -314,10 +314,10 @@ Please note that Tomcat 5.0.x and 5.5.x are no longer supported. Further - vulnerabilities in the 5.0.x and 5.5.x branches will not be fixed. Users should - upgrade to 6.x or 7.x to obtain security fixes. Vulnerabilities fixed - in Tomcat 5.5.26 onwards have not been assessed to determine if they are - present in the 5.0.x branch. + vulnerabilities in the 5.0.x and 5.5.x branches will not be fixed. Users + should upgrade to 7.x or later to obtain security fixes. Vulnerabilities + fixed in Tomcat 5.5.26 onwards have not been assessed to determine if + they are present in the 5.0.x branch. Please note that binary patches are never provided. If you need to Modified: tomcat/site/trunk/docs/security-6.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1797767&r1=1797766&r2=1797767&view=diff == --- tomcat/site/trunk/docs/security-6.html (original) +++ tomcat/site/trunk/docs/security-6.html Tue Jun 6 10:19:09 2017 @@ -325,6 +325,11 @@ provides a workaround are listed at the end of this page. +Please note that Tomcat 6.0.x is no longer supported. Further + vulnerabilities in the 6.0.x branch will not be fixed. Users should + upgrade to 7.x or later to obtain security fixes. + + Please note that binary patches are never provided. If you need to apply a source code patch, use the building instructions for the Apache Tomcat version that you are using. For Tomcat 6.0 those are Modified: tomcat/site/trunk/xdocs/security-3.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-3.xml?rev=1797767&r1=1797766&r2=1797767&view=diff == --- tomcat/site/trunk/xdocs/security-3.xml (original) +++ tomcat/site/trunk/xdocs/security-3.xml Tue Jun 6 10:19:09 2017 @@ -22,8 +22,8 @@ version with a question mark. Please note that Tomcat 3 is no longer supported. Further vulnerabilities - in the 3.x branches will not be fixed. Users should upgrade to - 6.x or 7.x to obtain security fixes. + in the 3.x branches will not be fixed. Users should upgrade to 7.x or + later to obtain security fixes. Please send comments or corrections for these vulnerabilities to the Tomcat Security Team. Modified: tomcat/site/trunk/xdocs/security-4.xml UR
[Bug 60461] SIGSEGV in SSLSocket.getInfos
https://bz.apache.org/bugzilla/show_bug.cgi?id=60461 --- Comment #26 from Ludovic Pénet --- I can. For GNU/Linux. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797756 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml
Author: markt Date: Tue Jun 6 08:48:25 2017 New Revision: 1797756 URL: http://svn.apache.org/viewvc?rev=1797756&view=rev Log: Tweak to keep Whimsy's "Do TLPs have the correct links on their home page" checks happy. Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1797756&r1=1797755&r2=1797756&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Tue Jun 6 08:48:25 2017 @@ -235,7 +235,7 @@ Process. The Apache Tomcat software is developed in an open and participatory environment and released under the -http://www.apache.org/licenses";>Apache License version 2. The +http://www.apache.org/licenses/";>Apache License version 2. The Apache Tomcat project is intended to be a collaboration of the best-of-breed developers from around the world. We invite you to participate in this open development project. To learn more about getting involved, Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1797756&r1=1797755&r2=1797756&view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Tue Jun 6 08:48:25 2017 @@ -23,7 +23,7 @@ Process. The Apache Tomcat software is developed in an open and participatory environment and released under the -http://www.apache.org/licenses";>Apache License version 2. The +http://www.apache.org/licenses/";>Apache License version 2. The Apache Tomcat project is intended to be a collaboration of the best-of-breed developers from around the world. We invite you to participate in this open development project. To learn more about getting involved, - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797752 - in /tomcat/tc7.0.x/trunk: ./ conf/ java/org/apache/jasper/ java/org/apache/jasper/resources/ webapps/docs/
Author: markt Date: Tue Jun 6 08:28:04 2017 New Revision: 1797752 URL: http://svn.apache.org/viewvc?rev=1797752&view=rev Log: Better document the meaning of the trimSpaces option for Jasper. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/conf/web.xml tomcat/tc7.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/Options.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/jasper-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 6 08:28:04 2017 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702 742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1 726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,179
svn commit: r1797751 - in /tomcat/tc8.0.x/trunk: ./ conf/ java/org/apache/jasper/ java/org/apache/jasper/resources/ webapps/docs/
Author: markt Date: Tue Jun 6 08:26:00 2017 New Revision: 1797751 URL: http://svn.apache.org/viewvc?rev=1797751&view=rev Log: Better document the meaning of the trimSpaces option for Jasper. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/conf/web.xml tomcat/tc8.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspC.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/Options.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml tomcat/tc8.0.x/trunk/webapps/docs/jasper-howto.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 6 08:26:00 2017 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676
svn commit: r1797750 - in /tomcat/tc8.5.x/trunk: ./ conf/ java/org/apache/jasper/ java/org/apache/jasper/resources/ webapps/docs/
Author: markt Date: Tue Jun 6 08:23:58 2017 New Revision: 1797750 URL: http://svn.apache.org/viewvc?rev=1797750&view=rev Log: Better document the meaning of the trimSpaces option for Jasper. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/conf/web.xml tomcat/tc8.5.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java tomcat/tc8.5.x/trunk/java/org/apache/jasper/Options.java tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml tomcat/tc8.5.x/trunk/webapps/docs/jasper-howto.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 6 08:23:58 2017 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747 536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1 756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,
svn commit: r1797749 - in /tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes: group/GroupChannel.java membership/McastService.java
Author: markt
Date: Tue Jun 6 08:22:31 2017
New Revision: 1797749
URL: http://svn.apache.org/viewvc?rev=1797749&view=rev
Log:
Fix IDE warnings about missing @Override markers
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1797749&r1=1797748&r2=1797749&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
Tue Jun 6 08:22:31 2017
@@ -643,6 +643,7 @@ public class GroupChannel extends Channe
* @see #setOptionCheck(boolean)
* @return boolean
*/
+@Override
public boolean getOptionCheck() {
return optionCheck;
}
@@ -651,6 +652,7 @@ public class GroupChannel extends Channe
* @see #setHeartbeat(boolean)
* @return boolean
*/
+@Override
public boolean getHeartbeat() {
return heartbeat;
}
@@ -660,6 +662,7 @@ public class GroupChannel extends Channe
* sleep in between invocations of Channel.heartbeat()
* @return long
*/
+@Override
public long getHeartbeatSleeptime() {
return heartbeatSleeptime;
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1797749&r1=1797748&r2=1797749&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Tue Jun 6 08:22:31 2017
@@ -136,6 +136,7 @@ public class McastService
/**
* @return the local member name
*/
+@Override
public String getLocalMemberName() {
return localMember.toString() ;
}
@@ -558,6 +559,7 @@ public class McastService
return payload;
}
+@Override
public byte[] getDomain() {
return domain;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1797748 - in /tomcat/trunk: conf/ java/org/apache/jasper/ java/org/apache/jasper/resources/ webapps/docs/
Author: markt
Date: Tue Jun 6 08:20:22 2017
New Revision: 1797748
URL: http://svn.apache.org/viewvc?rev=1797748&view=rev
Log:
Better document the meaning of the trimSpaces option for Jasper.
Modified:
tomcat/trunk/conf/web.xml
tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/Options.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/jasper-howto.xml
Modified: tomcat/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1797748&r1=1797747&r2=1797748&view=diff
==
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Tue Jun 6 08:20:22 2017
@@ -232,8 +232,8 @@
-
-
+
+
Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1797748&r1=1797747&r2=1797748&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original)
+++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Tue Jun 6
08:20:22 2017
@@ -63,7 +63,7 @@ public final class EmbeddedServletOption
private boolean keepGenerated = true;
/**
- * Should white spaces between directives or actions be trimmed?
+ * Should template text that consists entirely of whitespace be removed?
*/
private boolean trimSpaces = false;
@@ -239,7 +239,7 @@ public final class EmbeddedServletOption
}
/**
- * Should white spaces between directives or actions be trimmed?
+ * Should template text that consists entirely of whitespace be removed?
*/
@Override
public boolean getTrimSpaces() {
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1797748&r1=1797747&r2=1797748&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Tue Jun 6 08:20:22 2017
@@ -438,7 +438,9 @@ public class JspC extends Task implement
}
/**
- * Sets the option to trim white spaces between directives or actions.
+ * Sets the option to remove template text that consists entirely of
+ * whitespace.
+ *
* @param ts New value
*/
public void setTrimSpaces(boolean ts) {
Modified: tomcat/trunk/java/org/apache/jasper/Options.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/Options.java?rev=1797748&r1=1797747&r2=1797748&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/Options.java (original)
+++ tomcat/trunk/java/org/apache/jasper/Options.java Tue Jun 6 08:20:22 2017
@@ -98,8 +98,8 @@ public interface Options {
public boolean isSmapDumped();
/**
- * @return true to trim white spaces between
- * directives or actions.
+ * @return true to remove template text that consists entirely
+ * of whitespace
*/
public boolean getTrimSpaces();
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1797748&r1=1797747&r2=1797748&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Tue
Jun 6 08:20:22 2017
@@ -185,7 +185,7 @@ where options include:\n\
\-ieplugin Java Plugin classid for Internet Explorer\n\
\-classpath Overrides java.class.path system property\n\
\-xpoweredByAdd X-Powered-By response header\n\
-\-trimSpacesTrim spaces in template text between actions,
directives\n\
+\-trimSpaces Remove template text that consists entirely of
whitespace\n\
\-javaEncoding Set the encoding charset for Java classes (default
UTF-8)\n\
\-sourceSet the -source argument to the compiler (default
1.8)\n\
\-targetSet the -target argument to the compiler (default
1.8)\n\
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apac
svn commit: r1797741 - in /tomcat/trunk/java/org/apache/juli: AsyncFileHandler.java FileHandler.java
Author: violetagg
Date: Tue Jun 6 07:04:26 2017
New Revision: 1797741
URL: http://svn.apache.org/viewvc?rev=1797741&view=rev
Log:
Format the code. No functional changes.
Modified:
tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
tomcat/trunk/java/org/apache/juli/FileHandler.java
Modified: tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java?rev=1797741&r1=1797740&r2=1797741&view=diff
==
--- tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java Tue Jun 6 07:04:26
2017
@@ -71,7 +71,7 @@ public class AsyncFileHandler extends Fi
protected volatile boolean closed = false;
public AsyncFileHandler() {
-this(null,null,null);
+this(null, null, null);
}
public AsyncFileHandler(String directory, String prefix, String suffix) {
@@ -81,14 +81,18 @@ public class AsyncFileHandler extends Fi
@Override
public void close() {
-if (closed) return;
+if (closed) {
+return;
+}
closed = true;
super.close();
}
@Override
protected void open() {
-if(!closed) return;
+if (!closed) {
+return;
+}
closed = false;
super.open();
}
@@ -102,7 +106,7 @@ public class AsyncFileHandler extends Fi
// fill source entries, before we hand the record over to another
// thread with another class loader
record.getSourceMethodName();
-LogEntry entry = new LogEntry(record,this);
+LogEntry entry = new LogEntry(record, this);
boolean added = false;
try {
while (!added && !queue.offer(entry)) {
@@ -118,7 +122,7 @@ public class AsyncFileHandler extends Fi
break;
}
case OVERFLOW_DROP_FLUSH: {
-added = queue.offer(entry,1000,TimeUnit.MILLISECONDS);
+added = queue.offer(entry, 1000,
TimeUnit.MILLISECONDS);
break;
}
case OVERFLOW_DROP_CURRENT: {
@@ -127,7 +131,7 @@ public class AsyncFileHandler extends Fi
}
}//switch
}//while
-}catch (InterruptedException x) {
+} catch (InterruptedException x) {
// Allow thread to be interrupted and back out of the publish
// operation. No further action required.
}
@@ -142,7 +146,7 @@ public class AsyncFileHandler extends Fi
protected final boolean run = true;
public LoggerThread() {
this.setDaemon(true);
-
this.setName("AsyncFileHandlerWriter-"+System.identityHashCode(this));
+this.setName("AsyncFileHandlerWriter-" +
System.identityHashCode(this));
}
@Override
@@ -150,7 +154,9 @@ public class AsyncFileHandler extends Fi
while (run) {
try {
LogEntry entry = queue.poll(LOGGER_SLEEP_TIME,
TimeUnit.MILLISECONDS);
-if (entry!=null) entry.flush();
+if (entry != null) {
+entry.flush();
+}
} catch (InterruptedException x) {
// Ignore the attempt to interrupt the thread.
} catch (Exception x) {
Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=1797741&r1=1797740&r2=1797741&view=diff
==
--- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/FileHandler.java Tue Jun 6 07:04:26 2017
@@ -76,9 +76,7 @@ import java.util.logging.LogRecord;
*java.util.logging.SimpleFormatter
*
*/
-public class FileHandler
-extends Handler {
-
+public class FileHandler extends Handler {
// Constructor
@@ -199,13 +197,14 @@ public class FileHandler
}
try {
-if (writer!=null) {
+if (writer != null) {
writer.write(result);
if (bufferSize < 0) {
writer.flush();
}
} else {
-reportError("FileHandler is closed or not yet initialized,
unable to log ["+result+"]", null, ErrorManager.WRITE_FAILURE);
+reportError("FileHandler is closed or not yet initialized,
unable to log ["
++ result + "]", null, ErrorManager.WRITE_FAILURE);
}
} catch (Exception e) {
