svn commit: r1782240 - in /tomcat/tc8.5.x/trunk: conf/catalina.properties java/org/apache/tomcat/util/http/parser/HttpParser.java java/org/apache/tomcat/util/http/parser/LocalStrings.properties webapp

2017-02-08 Thread csutherl
Author: csutherl
Date: Wed Feb  8 19:40:51 2017
New Revision: 1782240

URL: http://svn.apache.org/viewvc?rev=1782240=rev
Log:
Followup commit for r1782037, adding warnings and StringManager

Modified:
tomcat/tc8.5.x/trunk/conf/catalina.properties
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
tomcat/tc8.5.x/trunk/webapps/docs/config/systemprops.xml

Modified: tomcat/tc8.5.x/trunk/conf/catalina.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/conf/catalina.properties?rev=1782240=1782239=1782240=diff
==
--- tomcat/tc8.5.x/trunk/conf/catalina.properties (original)
+++ tomcat/tc8.5.x/trunk/conf/catalina.properties Wed Feb  8 19:40:51 2017
@@ -148,4 +148,5 @@ tomcat.util.buf.StringCache.byte.enabled
 #tomcat.util.buf.StringCache.cacheSize=5000
 
 # Allow for changes to HTTP request validation
+# WARNING: Using this option will expose the server to CVE-2016-6816
 #tomcat.util.http.parser.HttpParser.requestTargetAllow=|

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1782240=1782239=1782240=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java 
Wed Feb  8 19:40:51 2017
@@ -22,6 +22,8 @@ import java.io.StringReader;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
+import org.apache.tomcat.util.res.StringManager;
+
 /**
  * HTTP header value parser implementation. Parsing HTTP headers as per RFC2616
  * is not always as simple as it first appears. For headers that only use 
tokens
@@ -37,6 +39,8 @@ import org.apache.juli.logging.LogFactor
  */
 public class HttpParser {
 
+private static final StringManager sm = 
StringManager.getManager(HttpParser.class);
+
 private static final Log log = LogFactory.getLog(HttpParser.class);
 
 private static final int ARRAY_SIZE = 128;
@@ -57,8 +61,7 @@ public class HttpParser {
 if (c == '{' || c == '}' || c == '|') {
 REQUEST_TARGET_ALLOW[c] = true;
 } else {
-log.warn("HttpParser: Character '" + c + "' is not allowed 
and will continue "
-+ "being rejected.");
+
log.warn(sm.getString("httpparser.invalidRequestTargetCharacter", c));
 }
 }
 }

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties?rev=1782240=1782239=1782240=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
 Wed Feb  8 19:40:51 2017
@@ -17,4 +17,5 @@ authorization.unknownType=Unknown Type [
 cookie.fallToDebug=Note: further occurrences of this error will be logged at 
DEBUG level.
 cookie.invalidCookieValue=A cookie header was received [{0}] that contained an 
invalid cookie. That cookie will be ignored.
 cookie.invalidCookieVersion=A cookie header was received using an unrecognised 
cookie version of [{0}]. The header and the cookies it contains will be ignored.
-cookie.valueNotPresent=
\ No newline at end of file
+cookie.valueNotPresent=
+httpparser.invalidRequestTargetCharacter=Character [{0}] is not allowed and 
will continue to be rejected.

Modified: tomcat/tc8.5.x/trunk/webapps/docs/config/systemprops.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/config/systemprops.xml?rev=1782240=1782239=1782240=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/config/systemprops.xml Wed Feb  8 
19:40:51 2017
@@ -644,6 +644,8 @@
   These characters would normally result in a 400 status.
   The acceptable characters for this property are: |, 
{
   , and }
+  WARNING: Use of this option will expose the server 
to CVE-2016-6816.
+  
   If not specified, the default value of null will be 
used.
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1782243 - in /tomcat/tc8.0.x/trunk: ./ conf/catalina.properties java/org/apache/tomcat/util/http/parser/HttpParser.java java/org/apache/tomcat/util/http/parser/LocalStrings.properties web

2017-02-08 Thread csutherl
Author: csutherl
Date: Wed Feb  8 19:43:59 2017
New Revision: 1782243

URL: http://svn.apache.org/viewvc?rev=1782243=rev
Log:
Followup commit for r1782037, adding warnings and StringManager

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/conf/catalina.properties
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
tomcat/tc8.0.x/trunk/webapps/docs/config/systemprops.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  8 19:43:59 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
+/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240
 
/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

svn commit: r1782246 - in /tomcat/tc7.0.x/trunk: ./ conf/catalina.properties java/org/apache/tomcat/util/http/parser/HttpParser.java java/org/apache/tomcat/util/http/parser/LocalStrings.properties web

2017-02-08 Thread csutherl
Author: csutherl
Date: Wed Feb  8 19:57:41 2017
New Revision: 1782246

URL: http://svn.apache.org/viewvc?rev=1782246=rev
Log:
Followup commit for r1782037, adding warnings and StringManager

Added:

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/conf/catalina.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  8 19:57:41 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
-/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,1749375,1749668

svn commit: r1781939 - in /tomcat/trunk/webapps/docs: changelog.xml index.xml

2017-02-06 Thread csutherl
Author: csutherl
Date: Mon Feb  6 20:10:47 2017
New Revision: 1781939

URL: http://svn.apache.org/viewvc?rev=1781939=rev
Log:
Add Specification and Javadoc references for JASPIC to the Docs application.

Modified:
tomcat/trunk/webapps/docs/changelog.xml   (contents, props changed)
tomcat/trunk/webapps/docs/index.xml   (contents, props changed)

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1781939=1781938=1781939=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Feb  6 20:10:47 2017
@@ -156,6 +156,14 @@
   
 
   
+  
+
+  
+Add Specification and Javadoc references for JASPIC to the Docs 
+application. (csutherl)
+  
+
+  
   
 
   

Propchange: tomcat/trunk/webapps/docs/changelog.xml
--
svn:mergeinfo = /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml:1781934

Modified: tomcat/trunk/webapps/docs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/index.xml?rev=1781939=1781938=1781939=diff
==
--- tomcat/trunk/webapps/docs/index.xml (original)
+++ tomcat/trunk/webapps/docs/index.xml Mon Feb  6 20:10:47 2017
@@ -186,6 +186,12 @@ are responsible for installing, configur
 http://docs.oracle.com/javaee/7/api/javax/websocket/package-summary.html;>
 Javadoc
 
+JASPIC 1.1
+https://jcp.org/aboutJava/communityprocess/mrel/jsr196/index.html;>
+Specification and
+http://docs.oracle.com/javaee/7/api/javax/security/auth/message/package-summary.html;>
+Javadoc
+
 
 
 

Propchange: tomcat/trunk/webapps/docs/index.xml
--
svn:mergeinfo = /tomcat/tc8.5.x/trunk/webapps/docs/index.xml:1781934



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1781934 - in /tomcat/tc8.5.x/trunk/webapps/docs: changelog.xml index.xml

2017-02-06 Thread csutherl
Author: csutherl
Date: Mon Feb  6 19:54:02 2017
New Revision: 1781934

URL: http://svn.apache.org/viewvc?rev=1781934=rev
Log:
Add Specification and Javadoc references for JASPIC to the Docs application.

Modified:
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/index.xml

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=1781934=1781933=1781934=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Feb  6 19:54:02 2017
@@ -144,6 +144,14 @@
   
 
   
+  
+
+  
+Add Specification and Javadoc references for JASPIC to the Docs 
+application. (csutherl)
+  
+
+  
   
 
   

Modified: tomcat/tc8.5.x/trunk/webapps/docs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/index.xml?rev=1781934=1781933=1781934=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/index.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/index.xml Mon Feb  6 19:54:02 2017
@@ -185,6 +185,12 @@ are responsible for installing, configur
 http://docs.oracle.com/javaee/7/api/javax/websocket/package-summary.html;>
 Javadoc
 
+JASPIC 1.1
+https://jcp.org/aboutJava/communityprocess/mrel/jsr196/index.html;>
+Specification and
+http://docs.oracle.com/javaee/7/api/javax/security/auth/message/package-summary.html;>
+Javadoc
+
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1782037 - in /tomcat/tc8.5.x/trunk: conf/catalina.properties java/org/apache/tomcat/util/http/parser/HttpParser.java webapps/docs/changelog.xml webapps/docs/config/systemprops.xml

2017-02-07 Thread csutherl
Author: csutherl
Date: Tue Feb  7 18:13:40 2017
New Revision: 1782037

URL: http://svn.apache.org/viewvc?rev=1782037=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60594
Adding implementation of whitelist patch

Modified:
tomcat/tc8.5.x/trunk/conf/catalina.properties
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/systemprops.xml

Modified: tomcat/tc8.5.x/trunk/conf/catalina.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/conf/catalina.properties?rev=1782037=1782036=1782037=diff
==
--- tomcat/tc8.5.x/trunk/conf/catalina.properties (original)
+++ tomcat/tc8.5.x/trunk/conf/catalina.properties Tue Feb  7 18:13:40 2017
@@ -146,3 +146,6 @@ tomcat.util.buf.StringCache.byte.enabled
 #tomcat.util.buf.StringCache.char.enabled=true
 #tomcat.util.buf.StringCache.trainThreshold=50
 #tomcat.util.buf.StringCache.cacheSize=5000
+
+# Allow for changes to HTTP request validation
+#tomcat.util.http.parser.HttpParser.requestTargetAllow=|

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1782037=1782036=1782037=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java 
Tue Feb  7 18:13:40 2017
@@ -19,6 +19,9 @@ package org.apache.tomcat.util.http.pars
 import java.io.IOException;
 import java.io.StringReader;
 
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
 /**
  * HTTP header value parser implementation. Parsing HTTP headers as per RFC2616
  * is not always as simple as it first appears. For headers that only use 
tokens
@@ -34,6 +37,8 @@ import java.io.StringReader;
  */
 public class HttpParser {
 
+private static final Log log = LogFactory.getLog(HttpParser.class);
+
 private static final int ARRAY_SIZE = 128;
 
 private static final boolean[] IS_CONTROL = new boolean[ARRAY_SIZE];
@@ -42,8 +47,22 @@ public class HttpParser {
 private static final boolean[] IS_HEX = new boolean[ARRAY_SIZE];
 private static final boolean[] IS_NOT_REQUEST_TARGET = new 
boolean[ARRAY_SIZE];
 private static final boolean[] IS_HTTP_PROTOCOL = new boolean[ARRAY_SIZE];
+private static final boolean[] REQUEST_TARGET_ALLOW = new 
boolean[ARRAY_SIZE];
 
 static {
+String prop = 
System.getProperty("tomcat.util.http.parser.HttpParser.requestTargetAllow");
+if (prop != null) {
+for (int i = 0; i < prop.length(); i++) {
+char c = prop.charAt(i);
+if (c == '{' || c == '}' || c == '|') {
+REQUEST_TARGET_ALLOW[c] = true;
+} else {
+log.warn("HttpParser: Character '" + c + "' is not allowed 
and will continue "
++ "being rejected.");
+}
+}
+}
+
 for (int i = 0; i < ARRAY_SIZE; i++) {
 // Control> 0-31, 127
 if (i < 32 || i == 127) {
@@ -74,7 +93,9 @@ public class HttpParser {
 if (IS_CONTROL[i] || i > 127 ||
 i == ' ' || i == '\"' || i == '#' || i == '<' || i == '>' 
|| i == '\\' ||
 i == '^' || i == '`'  || i == '{' || i == '|' || i == '}') 
{
-IS_NOT_REQUEST_TARGET[i] = true;
+if (!REQUEST_TARGET_ALLOW[i]) {
+IS_NOT_REQUEST_TARGET[i] = true;
+}
 }
 
 // Not valid for HTTP protocol

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=1782037=1782036=1782037=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Feb  7 18:13:40 2017
@@ -103,6 +103,12 @@
 Ensure that executor thread pools used with connectors, pre-start the
 configured minimum number of idle threads. (markt)
   
+  
+60594: Allow some invalid characters that were recently
+restricted to be processed in requests by using the system property
+    tomcat.util.http.parser.HttpParser.requestTargetAllow.
+(csutherl)
+  
 
   
   

Modified: tomcat/tc8.5.x/trunk/webapps/docs/config/systemprops.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/we

svn commit: r1782041 - in /tomcat/tc8.0.x/trunk: ./ conf/catalina.properties java/org/apache/tomcat/util/http/parser/HttpParser.java webapps/docs/changelog.xml webapps/docs/config/systemprops.xml

2017-02-07 Thread csutherl
Author: csutherl
Date: Tue Feb  7 18:22:36 2017
New Revision: 1782041

URL: http://svn.apache.org/viewvc?rev=1782041=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60594
Adding implementation of whitelist patch

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/conf/catalina.properties
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/config/systemprops.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  7 18:22:36 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
+/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037
 
/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

svn commit: r1782043 - in /tomcat/tc7.0.x/trunk: ./ conf/catalina.properties java/org/apache/tomcat/util/http/parser/HttpParser.java webapps/docs/changelog.xml webapps/docs/config/systemprops.xml

2017-02-07 Thread csutherl
Author: csutherl
Date: Tue Feb  7 18:31:43 2017
New Revision: 1782043

URL: http://svn.apache.org/viewvc?rev=1782043=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60594
Adding implementation of whitelist patch

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/conf/catalina.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  7 18:31:43 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
-/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,1749375,1749668

svn commit: r1784959 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java

2017-03-01 Thread csutherl
Author: csutherl
Date: Wed Mar  1 14:54:38 2017
New Revision: 1784959

URL: http://svn.apache.org/viewvc?rev=1784959=rev
Log:
Follow up to r1784807.
Removing PushToken class reference as it was deleted by r1784807.

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1784959=1784958=1784959=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
Wed Mar  1 14:54:38 2017
@@ -166,7 +166,6 @@ public final class SecurityClassLoad {
 private static final void loadCoyotePackage(ClassLoader loader)
 throws Exception {
 final String basePackage = "org.apache.coyote.";
-loader.loadClass(basePackage + "PushToken");
 loader.loadClass(basePackage + "http11.Constants");
 // Make sure system property is read at this point
 Class clazz = loader.loadClass(basePackage + "Constants");



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1784991 - in /tomcat/site/trunk: docs/security-6.html docs/security-7.html docs/security-8.html docs/security-9.html xdocs/security-6.xml xdocs/security-7.xml xdocs/security-8.xml xdocs/s

2017-03-01 Thread csutherl
Author: csutherl
Date: Wed Mar  1 16:56:54 2017
New Revision: 1784991

URL: http://svn.apache.org/viewvc?rev=1784991=rev
Log:
Fixing typo on the security pages.

Modified:
tomcat/site/trunk/docs/security-6.html
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-6.xml
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-6.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1784991=1784990=1784991=diff
==
--- tomcat/site/trunk/docs/security-6.html (original)
+++ tomcat/site/trunk/docs/security-6.html Wed Mar  1 16:56:54 2017
@@ -372,7 +372,7 @@
connector resulted in the current Processor object being added to the
Processor cache multiple times. This in turn meant that the same
Processor could be used for concurrent requests. Sharing a Processor can
-   result in information leakage between requests including, not not 
limited
+   result in information leakage between requests including, but not 
limited
to, session ID and the response body.
 
 

Modified: tomcat/site/trunk/docs/security-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1784991=1784990=1784991=diff
==
--- tomcat/site/trunk/docs/security-7.html (original)
+++ tomcat/site/trunk/docs/security-7.html Wed Mar  1 16:56:54 2017
@@ -398,7 +398,7 @@
connector resulted in the current Processor object being added to the
Processor cache multiple times. This in turn meant that the same
Processor could be used for concurrent requests. Sharing a Processor can
-   result in information leakage between requests including, not not 
limited
+   result in information leakage between requests including, but not 
limited
to, session ID and the response body.
 
 

Modified: tomcat/site/trunk/docs/security-8.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-8.html?rev=1784991=1784990=1784991=diff
==
--- tomcat/site/trunk/docs/security-8.html (original)
+++ tomcat/site/trunk/docs/security-8.html Wed Mar  1 16:56:54 2017
@@ -350,7 +350,7 @@
connector resulted in the current Processor object being added to the
Processor cache multiple times. This in turn meant that the same
Processor could be used for concurrent requests. Sharing a Processor can
-   result in information leakage between requests including, not not 
limited
+   result in information leakage between requests including, but not 
limited
to, session ID and the response body.
 
 
@@ -380,7 +380,7 @@
connector resulted in the current Processor object being added to the
Processor cache multiple times. This in turn meant that the same
Processor could be used for concurrent requests. Sharing a Processor can
-   result in information leakage between requests including, not not 
limited
+   result in information leakage between requests including, but not 
limited
to, session ID and the response body.
 
 

Modified: tomcat/site/trunk/docs/security-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-9.html?rev=1784991=1784990=1784991=diff
==
--- tomcat/site/trunk/docs/security-9.html (original)
+++ tomcat/site/trunk/docs/security-9.html Wed Mar  1 16:56:54 2017
@@ -314,7 +314,7 @@
connector resulted in the current Processor object being added to the
Processor cache multiple times. This in turn meant that the same
Processor could be used for concurrent requests. Sharing a Processor can
-   result in information leakage between requests including, not not 
limited
+   result in information leakage between requests including, but not 
limited
to, session ID and the response body.
 
 

Modified: tomcat/site/trunk/xdocs/security-6.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-6.xml?rev=1784991=1784990=1784991=diff
==
--- tomcat/site/trunk/xdocs/security-6.xml (original)
+++ tomcat/site/trunk/xdocs/security-6.xml Wed Mar  1 16:56:54 2017
@@ -63,7 +63,7 @@
connector resulted in the current Processor object being added to the
Processor cache multiple times. This in turn meant that the same
Processor could be used for concurrent requests. Sharing a Processor can
-   result in information leakage between requests including, not not 
limited

svn commit: r1763182 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

2016-10-03 Thread csutherl
Author: csutherl
Date: Mon Oct  3 16:05:15 2016
New Revision: 1763182

URL: http://svn.apache.org/viewvc?rev=1763182=rev
Log:
Adding missing changelog entry from r1763178

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1763182=1763181=1763182=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Oct  3 16:05:15 2016
@@ -36,6 +36,7 @@
 Tim Whittington
 Sylvain Laurent
 Christopher Schultz
+Coty Sutherland
 Changelog
   
 
@@ -150,6 +151,11 @@
 ResourceLink fails to specify the type, specifies an
 unknown type or specifies the wrong type. (markt)
   
+  
+Correct basePackage and PrivilegedFindResourceByName
+ in SecurityClassLoad so that tomcat can
+successfully start with the Security Manager enabled. (csutherl)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1763178 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java

2016-10-03 Thread csutherl
Author: csutherl
Date: Mon Oct  3 15:55:16 2016
New Revision: 1763178

URL: http://svn.apache.org/viewvc?rev=1763178=rev
Log:
The SecurityClassLoad loadLoaderPackage had an incorrect basePackage and 
WebappClassLoaderBase class setting. This caused a CNFE on both 
org.apache.catalina.ResourceEntry and org.apache.catalina.WebappClassLoaderBase 
and prevented tomcat from starting with the security manager enabled.

Modified:

tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1763178=1763177=1763178=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
Mon Oct  3 15:55:16 2016
@@ -75,13 +75,13 @@ public final class SecurityClassLoad {
 
 private final static void loadLoaderPackage(ClassLoader loader)
 throws Exception {
-String basePackage = "org.apache.catalina.";
+String basePackage = "org.apache.catalina.loader.";
 loader.loadClass
 (basePackage +
  "ResourceEntry");
 loader.loadClass
 (basePackage +
- "WebappClassLoaderBase$PrivilegedFindResourceByName");
+ "WebappClassLoader$PrivilegedFindResourceByName");
 }
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1773840 - /tomcat/site/trunk/docs/migration.html

2016-12-12 Thread csutherl
Author: csutherl
Date: Mon Dec 12 18:19:20 2016
New Revision: 1773840

URL: http://svn.apache.org/viewvc?rev=1773840=rev
Log:
Fixed typo in migration guide

Modified:
tomcat/site/trunk/docs/migration.html

Modified: tomcat/site/trunk/docs/migration.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1773840=1773839=1773840=diff
==
--- tomcat/site/trunk/docs/migration.html (original)
+++ tomcat/site/trunk/docs/migration.html Mon Dec 12 18:19:20 2016
@@ -231,7 +231,7 @@ configuration of the new version of Apac
 
 
 When migrating from one minor release to another minor release within the
-same major release (e.g. from Tomcat 8.0.27 to Tomcat 7.0.28) you can retain 
the
+same major release (e.g. from Tomcat 7.0.27 to Tomcat 7.0.28) you can retain 
the
 configuration files, but you should check to see if any defaults have changed
 and/or if any new elements have been added and adjust your configuration files
 accordingly.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1778192 - in /tomcat/site/trunk: docs/irc.html xdocs/irc.xml

2017-01-10 Thread csutherl
Author: csutherl
Date: Tue Jan 10 20:31:25 2017
New Revision: 1778192

URL: http://svn.apache.org/viewvc?rev=1778192=rev
Log:
Updating the outdated IRC information with a working solution. Mibbit 
connection (default with Firefox) are no longer supported

Modified:
tomcat/site/trunk/docs/irc.html
tomcat/site/trunk/xdocs/irc.xml

Modified: tomcat/site/trunk/docs/irc.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/irc.html?rev=1778192=1778191=1778192=diff
==
--- tomcat/site/trunk/docs/irc.html (original)
+++ tomcat/site/trunk/docs/irc.html Tue Jan 10 20:31:25 2017
@@ -220,8 +220,10 @@
 
 
 #tomcat at irc.freenode.net.
-Click here to
-connect to the channel using Mozilla. 
+Click https://webchat.freenode.net/; rel="nofollow">here to
+begin using freenode in your browser via freenode's webchat server. You'll 
+need to choose a nickname and type #tomcat in the input box 
+labeled 'Channels' before clicking 'Connect' to access the channel.
 
 
 

Modified: tomcat/site/trunk/xdocs/irc.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/irc.xml?rev=1778192=1778191=1778192=diff
==
--- tomcat/site/trunk/xdocs/irc.xml (original)
+++ tomcat/site/trunk/xdocs/irc.xml Tue Jan 10 20:31:25 2017
@@ -13,8 +13,10 @@
 An IRC channel dedicated to Tomcat exists on Freenode.net. 
 
 #tomcat at irc.freenode.net.
-Click here to
-connect to the channel using Mozilla. 
+Click https://webchat.freenode.net/; rel="nofollow">here to
+begin using freenode in your browser via freenode's webchat server. You'll 
+need to choose a nickname and type #tomcat in the input box 
+labeled 'Channels' before clicking 'Connect' to access the channel.
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1775522 - /tomcat/site/trunk/docs/whichversion.html

2016-12-21 Thread csutherl
Author: csutherl
Date: Wed Dec 21 18:14:56 2016
New Revision: 1775522

URL: http://svn.apache.org/viewvc?rev=1775522=rev
Log:
Adding missing JASPIC spec implementation note for tomcat 8.5

Modified:
tomcat/site/trunk/docs/whichversion.html

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1775522=1775521=1775522=diff
==
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Wed Dec 21 18:14:56 2016
@@ -486,6 +486,14 @@ to that, it includes the following signi
 
 
 
+
+Apache Tomcat 8.5.x supports the same Servlet, JSP, EL, and
+Web Socket Specification versions as Apache Tomcat 8.0.x. In addition to that, 
+it also implements the JASPIC 1.1 specification. There are 
+significant changes in many areas under the hood, resulting in improved 
+performance, stability, and total cost of ownership.  Please refer to the 
+Apache Tomcat 8.5 Changelog for details.
+
 
 
 Apache Tomcat 7.x



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1775524 - /tomcat/site/trunk/docs/whichversion.html

2016-12-21 Thread csutherl
Author: csutherl
Date: Wed Dec 21 18:21:52 2016
New Revision: 1775524

URL: http://svn.apache.org/viewvc?rev=1775524=rev
Log:
Updating instances of 'Web Socket' to remove the space and correctly state 
'WebSocket' which is consistent with the table at the top of this page and the 
spec

Modified:
tomcat/site/trunk/docs/whichversion.html

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1775524=1775523=1775524=diff
==
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Wed Dec 21 18:21:52 2016
@@ -449,7 +449,7 @@ run stably for extended periods of time.
 Apache Tomcat 9.x is the current focus of development, it
 builds on Tomcat 8.0.x and implements the current draft of the Servlet
 4.0 specification and will also implement the
-JSP 2.4?, EL 3.1?, Web Socket 1.2?
+JSP 2.4?, EL 3.1?, WebSocket 1.2?
  and JASPIC 1.1  specifications once work starts on 
 updating those specifications for Java EE 9. In addition to this, it includes 
 the following significant improvements:
@@ -475,7 +475,7 @@ the following significant improvements:
 
 Apache Tomcat 8.x builds on Tomcat 7.0.x and implements the
 Servlet 3.1, JSP 2.3, EL 3.0
-and Web Socket 1.1 specifications. In addition
+and WebSocket 1.1 specifications. In addition
 to that, it includes the following significant improvements:
 
 
@@ -488,7 +488,7 @@ to that, it includes the following signi
 
 
 Apache Tomcat 8.5.x supports the same Servlet, JSP, EL, and
-Web Socket Specification versions as Apache Tomcat 8.0.x. In addition to that, 
+WebSocket Specification versions as Apache Tomcat 8.0.x. In addition to that, 
 it also implements the JASPIC 1.1 specification. There are 
 significant changes in many areas under the hood, resulting in improved 
 performance, stability, and total cost of ownership.  Please refer to the 
@@ -504,7 +504,7 @@ Apache Tomcat 8.5 Changelog for details.
 Apache Tomcat 7.x builds upon the improvements made in
 Tomcat 6.0.x and implements the Servlet 3.0,
 JSP 2.2, EL 2.2 and
-Web Socket 1.1 specifications. In addition
+WebSocket 1.1 specifications. In addition
 to that, it includes the following improvements:
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1775523 - /tomcat/site/trunk/docs/whichversion.html

2016-12-21 Thread csutherl
Author: csutherl
Date: Wed Dec 21 18:18:32 2016
New Revision: 1775523

URL: http://svn.apache.org/viewvc?rev=1775523=rev
Log:
Added missing JASPIC spec implementation note for tomcat 9.0 and updated an 
incorrect reference to Java EE 8.

Modified:
tomcat/site/trunk/docs/whichversion.html

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1775523=1775522=1775523=diff
==
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Wed Dec 21 18:18:32 2016
@@ -449,10 +449,10 @@ run stably for extended periods of time.
 Apache Tomcat 9.x is the current focus of development, it
 builds on Tomcat 8.0.x and implements the current draft of the Servlet
 4.0 specification and will also implement the
-JSP 2.4?, EL 3.1? and
-Web Socket 1.2? specifications once work starts on updating
-those specifications for Java EE 8. In addition to this, it includes the
-following significant improvements:
+JSP 2.4?, EL 3.1?, Web Socket 1.2?
+ and JASPIC 1.1  specifications once work starts on 
+updating those specifications for Java EE 9. In addition to this, it includes 
+the following significant improvements:
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1775535 - /tomcat/site/trunk/docs/whichversion.html

2016-12-21 Thread csutherl
Author: csutherl
Date: Wed Dec 21 19:06:02 2016
New Revision: 1775535

URL: http://svn.apache.org/viewvc?rev=1775535=rev
Log:
Reverting change for EE reference, 8 was right

Modified:
tomcat/site/trunk/docs/whichversion.html

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1775535=1775534=1775535=diff
==
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Wed Dec 21 19:06:02 2016
@@ -451,7 +451,7 @@ builds on Tomcat 8.0.x and implements th
 4.0 specification and will also implement the
 JSP 2.4?, EL 3.1?, WebSocket 1.2?
  and JASPIC 1.1  specifications once work starts on 
-updating those specifications for Java EE 9. In addition to this, it includes 
+updating those specifications for Java EE 8. In addition to this, it includes 
 the following significant improvements:
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1775651 - /tomcat/site/trunk/xdocs/whichversion.xml

2016-12-22 Thread csutherl
Author: csutherl
Date: Thu Dec 22 13:34:36 2016
New Revision: 1775651

URL: http://svn.apache.org/viewvc?rev=1775651=rev
Log:
XML update to accompany my html modifications in r1775524

Modified:
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1775651=1775650=1775651=diff
==
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Thu Dec 22 13:34:36 2016
@@ -195,7 +195,7 @@ run stably for extended periods of time.
 builds on Tomcat 8.0.x and implements the current draft of the Servlet
 4.0 specification and will also implement the
 JSP 2.4?, EL 3.1? and
-Web Socket 1.2? specifications once work starts on updating
+WebSocket 1.2? specifications once work starts on updating
 those specifications for Java EE 8. In addition to this, it includes the
 following significant improvements:
 
@@ -211,7 +211,7 @@ following significant improvements:
 
 Apache Tomcat 8.x builds on Tomcat 7.0.x and implements the
 Servlet 3.1, JSP 2.3, EL 3.0
-and Web Socket 1.1 specifications. In addition
+and WebSocket 1.1 specifications. In addition
 to that, it includes the following significant improvements:
 
 
@@ -236,7 +236,7 @@ Apache Tomcat 8.5 Changelog for details.
 Apache Tomcat 7.x builds upon the improvements made in
 Tomcat 6.0.x and implements the Servlet 3.0,
 JSP 2.2, EL 2.2 and
-Web Socket 1.1 specifications. In addition
+WebSocket 1.1 specifications. In addition
 to that, it includes the following improvements:
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1775649 - in /tomcat/site/trunk: docs/whoweare.html xdocs/whoweare.xml

2016-12-22 Thread csutherl
Author: csutherl
Date: Thu Dec 22 13:19:34 2016
New Revision: 1775649

URL: http://svn.apache.org/viewvc?rev=1775649=rev
Log:
Adding myself to the whoarewe page

Modified:
tomcat/site/trunk/docs/whoweare.html
tomcat/site/trunk/xdocs/whoweare.xml

Modified: tomcat/site/trunk/docs/whoweare.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1775649=1775648=1775649=diff
==
--- tomcat/site/trunk/docs/whoweare.html (original)
+++ tomcat/site/trunk/docs/whoweare.html Thu Dec 22 13:19:34 2016
@@ -443,6 +443,12 @@ A complete list of all the Apache Commit
 
 
 
+
+
+Coty Sutherland (csutherl at apache.org)
+
+
+
 
 Emeritus PMC members
 

Modified: tomcat/site/trunk/xdocs/whoweare.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whoweare.xml?rev=1775649=1775648=1775649=diff
==
--- tomcat/site/trunk/xdocs/whoweare.xml (original)
+++ tomcat/site/trunk/xdocs/whoweare.xml Thu Dec 22 13:19:34 2016
@@ -138,6 +138,9 @@ A complete list of all the Apache Commit
 
 Huxing Zhang (huxing at apache.org)
 
+
+Coty Sutherland (csutherl at apache.org)
+
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1775652 - in /tomcat/site/trunk: docs/whichversion.html xdocs/whichversion.xml

2016-12-22 Thread csutherl
Author: csutherl
Date: Thu Dec 22 13:37:26 2016
New Revision: 1775652

URL: http://svn.apache.org/viewvc?rev=1775652=rev
Log:
XML update to accompany my html modifications in r1775523 and r1775535

Modified:
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1775652=1775651=1775652=diff
==
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Thu Dec 22 13:37:26 2016
@@ -450,8 +450,8 @@ run stably for extended periods of time.
 builds on Tomcat 8.0.x and implements the current draft of the Servlet
 4.0 specification and will also implement the
 JSP 2.4?, EL 3.1?, WebSocket 1.2?
- and JASPIC 1.1  specifications once work starts on 
-updating those specifications for Java EE 8. In addition to this, it includes 
+ and JASPIC 1.1  specifications once work starts on
+updating those specifications for Java EE 8. In addition to this, it includes
 the following significant improvements:
 
 

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1775652=1775651=1775652=diff
==
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Thu Dec 22 13:37:26 2016
@@ -194,10 +194,10 @@ run stably for extended periods of time.
 Apache Tomcat 9.x is the current focus of development, it
 builds on Tomcat 8.0.x and implements the current draft of the Servlet
 4.0 specification and will also implement the
-JSP 2.4?, EL 3.1? and
-WebSocket 1.2? specifications once work starts on updating
-those specifications for Java EE 8. In addition to this, it includes the
-following significant improvements:
+JSP 2.4?, EL 3.1?, WebSocket 1.2?
+ and JASPIC 1.1  specifications once work starts on
+updating those specifications for Java EE 8. In addition to this, it includes
+the following significant improvements:
 
 
 Adds support for HTTP/2 (requires the APR/native library)



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1775650 - in /tomcat/site/trunk: docs/whichversion.html xdocs/whichversion.xml

2016-12-22 Thread csutherl
Author: csutherl
Date: Thu Dec 22 13:32:41 2016
New Revision: 1775650

URL: http://svn.apache.org/viewvc?rev=1775650=rev
Log:
XML update to accompany my html modifications in r1775522

Modified:
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1775650=1775649=1775650=diff
==
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Thu Dec 22 13:32:41 2016
@@ -486,15 +486,18 @@ to that, it includes the following signi
 
 
 
+
 
+
 Apache Tomcat 8.5.x supports the same Servlet, JSP, EL, and
-WebSocket Specification versions as Apache Tomcat 8.0.x. In addition to that, 
-it also implements the JASPIC 1.1 specification. There are 
-significant changes in many areas under the hood, resulting in improved 
-performance, stability, and total cost of ownership.  Please refer to the 
+WebSocket Specification versions as Apache Tomcat 8.0.x. In addition to that,
+it also implements the JASPIC 1.1 specification. There are
+significant changes in many areas under the hood, resulting in improved
+performance, stability, and total cost of ownership.  Please refer to the
 Apache Tomcat 8.5 Changelog for details.
 
 
+
 
 Apache Tomcat 7.x
 

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1775650=1775649=1775650=diff
==
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Thu Dec 22 13:32:41 2016
@@ -219,6 +219,15 @@ to that, it includes the following signi
 extension features provided in earlier versions.
 
 
+
+Apache Tomcat 8.5.x supports the same Servlet, JSP, EL, and
+WebSocket Specification versions as Apache Tomcat 8.0.x. In addition to that,
+it also implements the JASPIC 1.1 specification. There are
+significant changes in many areas under the hood, resulting in improved
+performance, stability, and total cost of ownership.  Please refer to the
+Apache Tomcat 8.5 Changelog for details.
+
+
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1775658 - in /tomcat/site/trunk: docs/whoweare.html xdocs/whoweare.xml

2016-12-22 Thread csutherl
Author: csutherl
Date: Thu Dec 22 13:59:23 2016
New Revision: 1775658

URL: http://svn.apache.org/viewvc?rev=1775658=rev
Log:
Putting my name in the correct order...

Modified:
tomcat/site/trunk/docs/whoweare.html
tomcat/site/trunk/xdocs/whoweare.xml

Modified: tomcat/site/trunk/docs/whoweare.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1775658=1775657=1775658=diff
==
--- tomcat/site/trunk/docs/whoweare.html (original)
+++ tomcat/site/trunk/docs/whoweare.html Thu Dec 22 13:59:23 2016
@@ -409,6 +409,12 @@ A complete list of all the Apache Commit
 
 
 
+Coty Sutherland (csutherl at apache.org)
+
+
+
+
+
 Eiji Takahashi (eijit at apache.org)
 
 
@@ -443,12 +449,6 @@ A complete list of all the Apache Commit
 
 
 
-
-
-Coty Sutherland (csutherl at apache.org)
-
-
-
 
 Emeritus PMC members
 

Modified: tomcat/site/trunk/xdocs/whoweare.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whoweare.xml?rev=1775658=1775657=1775658=diff
==
--- tomcat/site/trunk/xdocs/whoweare.xml (original)
+++ tomcat/site/trunk/xdocs/whoweare.xml Thu Dec 22 13:59:23 2016
@@ -121,6 +121,9 @@ A complete list of all the Apache Commit
 Felix Schumacher (fschumacher at apache.org)
 
 
+Coty Sutherland (csutherl at apache.org)
+
+
 Eiji Takahashi (eijit at apache.org)
 
 
@@ -138,9 +141,6 @@ A complete list of all the Apache Commit
 
 Huxing Zhang (huxing at apache.org)
 
-
-Coty Sutherland (csutherl at apache.org)
-
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1788268 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

2017-03-23 Thread csutherl
Author: csutherl
Date: Thu Mar 23 15:25:13 2017
New Revision: 1788268

URL: http://svn.apache.org/viewvc?rev=1788268=rev
Log:
Updating my uid in changelog entry for consistency

Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1788268=1788267=1788268=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar 23 15:25:13 2017
@@ -121,7 +121,7 @@
   
   
 60683: Security manager failure causing NPEs when doing IO
-on some JVMs. (coty)
+on some JVMs. (csutherl)
   
   
 60688: Update the internal fork of Apache Commons BCEL to



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1788270 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

2017-03-23 Thread csutherl
Author: csutherl
Date: Thu Mar 23 15:27:02 2017
New Revision: 1788270

URL: http://svn.apache.org/viewvc?rev=1788270=rev
Log:
Updating my uid in changelog entry for consistency

Modified:
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1788270=1788269=1788270=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Mar 23 15:27:02 2017
@@ -127,7 +127,7 @@
   
   
 60683: Security manager failure causing NPEs when doing IO
-on some JVMs. (coty)
+on some JVMs. (csutherl)
   
   
 60688: Update the internal fork of Apache Commons BCEL to



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1788271 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

2017-03-23 Thread csutherl
Author: csutherl
Date: Thu Mar 23 15:27:24 2017
New Revision: 1788271

URL: http://svn.apache.org/viewvc?rev=1788271=rev
Log:
Updating my uid in changelog entry for consistency

Modified:
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

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=1788271=1788270=1788271=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Mar 23 15:27:24 2017
@@ -169,7 +169,7 @@
   
   
 60683: Security manager failure causing NPEs when doing IO
-on some JVMs. (coty)
+on some JVMs. (csutherl)
   
   
 60688: Update the internal fork of Apache Commons BCEL to



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1786242 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

2017-03-09 Thread csutherl
Author: csutherl
Date: Thu Mar  9 21:00:54 2017
New Revision: 1786242

URL: http://svn.apache.org/viewvc?rev=1786242=rev
Log:
Moving two changelog entries from incorrect the section (Web Applications) to 
the correct section (Catalina) so that the changelog correctly reflects the 
updates.

Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1786242=1786241=1786242=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar  9 21:00:54 2017
@@ -97,6 +97,15 @@
 ServletRequest.getParameterMap() is fully immutable. Based
 on a patch provided by woosan. (markt)
   
+  
+60824: Correctly cache the Subject in the
+session - if there is a session - when running under a
+SecurityManager. Patch provided by Jan Engehausen. (markt)
+  
+  
+Ensure request and response facades are used when firing application
+listeners. (markt/remm)
+  
 
   
   
@@ -201,15 +210,6 @@
 Ensure the ASF logo image is correctly displayed in docs and
 host-manager applications. (violetagg)
   
-  
-60824: Correctly cache the Subject in the
-session - if there is a session - when running under a
-SecurityManager. Patch provided by Jan Engehausen. (markt)
-  
-  
-Ensure request and response facades are used when firing application
-listeners. (markt/remm)
-  
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1803910 - in /tomcat/native/trunk/xdocs: index.xml news/2017.xml news/project.xml project.xml

2017-08-02 Thread csutherl
Author: csutherl
Date: Wed Aug  2 19:29:35 2017
New Revision: 1803910

URL: http://svn.apache.org/viewvc?rev=1803910=rev
Log:
Update current version from 1.2.10 to 1.2.12, Add 2017 news page, Fix XML 
formatting, and add 8.5 doc link

Added:
tomcat/native/trunk/xdocs/news/2017.xml   (with props)
Modified:
tomcat/native/trunk/xdocs/index.xml
tomcat/native/trunk/xdocs/news/project.xml
tomcat/native/trunk/xdocs/project.xml

Modified: tomcat/native/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/index.xml?rev=1803910=1803909=1803910=diff
==
--- tomcat/native/trunk/xdocs/index.xml (original)
+++ tomcat/native/trunk/xdocs/index.xml Wed Aug  2 19:29:35 2017
@@ -64,16 +64,16 @@ manual is described in more detail below
 
 
 
-5 October 2016 - TC-Native-1.2.10
+26 June 2017 - TC-Native-1.2.12
 released
 The Apache Tomcat team is proud to announce the immediate availability of
-Tomcat Native 1.2.10 Stable.
+Tomcat Native 1.2.12 Stable.
 
 The sources and the binaries for selected platforms are available from the
 Download page.
 
 
-Please see the ChangeLog for a full
+Please see the Changelog for a full
 list of changes.
 
 
@@ -198,10 +198,12 @@ Feb 8, 2015 12:27:41 PM org.apache.catal
 INFO: APR capabilities: IPv6 [true], sendfile [true], accept filters [false], 
random [true].
 Feb 8, 2015 12:27:41 PM org.apache.coyote.http11.Http11AprProtocol init
 INFO: Initializing Coyote HTTP/1.1 on http-8080
+
   
 Refer to the tomcat documentation to configure the connectors
-(See http://tomcat.apache.org/tomcat-8.0-doc/apr.html;>Tomcat 
8.0.x,
-http://tomcat.apache.org/tomcat-7.0-doc/apr.html;>Tomcat 7.0.x
+(See http://tomcat.apache.org/tomcat-8.5-doc/apr.html;>Tomcat 
8.5.x,
+http://tomcat.apache.org/tomcat-8.0-doc/apr.html;>Tomcat 
8.0.x,
+http://tomcat.apache.org/tomcat-7.0-doc/apr.html;>Tomcat 
7.0.x,
 and http://tomcat.apache.org/tomcat-6.0-doc/apr.html;>Tomcat 
6.0.x)
   
 

Added: tomcat/native/trunk/xdocs/news/2017.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/news/2017.xml?rev=1803910=auto
==
Binary file - no diff available.

Propchange: tomcat/native/trunk/xdocs/news/2017.xml
--
svn:mime-type = application/xml

Modified: tomcat/native/trunk/xdocs/news/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/news/project.xml?rev=1803910=1803909=1803910=diff
==
--- tomcat/native/trunk/xdocs/news/project.xml (original)
+++ tomcat/native/trunk/xdocs/news/project.xml Wed Aug  2 19:29:35 2017
@@ -16,34 +16,35 @@
   limitations under the License.
 -->
 http://tomcat.apache.org/;>
+  href="http://tomcat.apache.org/;>
 
-The Apache Tomcat Native - News
+  The Apache Tomcat Native - News
 
-
-  The Apache Tomcat Native - News
-
-
+  
+The Apache Tomcat Native - News
+  
 
+  
 
-
+  
 
 
 
-
+  
 
 
 
-
-
-
-
-
-
-
-
-
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
 
-
+  
 

Modified: tomcat/native/trunk/xdocs/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/project.xml?rev=1803910=1803909=1803910=diff
==
--- tomcat/native/trunk/xdocs/project.xml (original)
+++ tomcat/native/trunk/xdocs/project.xml Wed Aug  2 19:29:35 2017
@@ -16,34 +16,34 @@
   limitations under the License.
 -->
 http://tomcat.apache.org/;>
+  href="http://tomcat.apache.org/;>
 
-Apache Tomcat Native Library
+  Apache Tomcat Native Library
 
-
-  Apache Tomcat Native Library
-
-
+  
+Apache Tomcat Native Library
+  
 
+  
 
-
+  
 
 
 
-
+  
 
 
 
-
-
-
-
-
-
-
-
-
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
-
-
+  
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[GitHub] tomcat issue #5: Add maxStartTime to RequestInfo & RequestGroupInfo.

2017-07-11 Thread csutherl
Github user csutherl commented on the issue:

https://github.com/apache/tomcat/pull/5
  
@kkolinko or @markt-asf can we close this PR? It doesn't have any changes 
in it and is pretty old.


---
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



svn commit: r1801987 - in /tomcat/tc7.0.x/trunk/java/org/apache: catalina/Lifecycle.java coyote/AsyncStateMachine.java

2017-07-14 Thread csutherl
Author: csutherl
Date: Fri Jul 14 20:14:50 2017
New Revision: 1801987

URL: http://svn.apache.org/viewvc?rev=1801987=rev
Log:
Porting r1631350 to tomcat7: Use UTF-8 to fix ASCII art in Javadoc. How ironic.

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java?rev=1801987=1801986=1801987=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java Fri Jul 14 
20:14:50 2017
@@ -30,30 +30,30 @@ package org.apache.catalina;
  *  -
  *  |   |
  *  | init()|
- * NEW ->-- INITIALIZING|
- * | |   |  | 
--<---
+ * NEW -»-- INITIALIZING|
+ * | |   |  | 
--«---
  * | |   |auto  | |
|
  * | |  \|/start() \|/   \|/ auto  auto stop() 
|
- * | |  INITIALIZED -->-- STARTING_PREP -->- STARTING -->- STARTED -->---  
|
+ * | |  INITIALIZED --»-- STARTING_PREP --»- STARTING --»- STARTED 
--»---  |
  * | | ||  
|
  * | |destroy()||  
|
- * | -->-<--<  
^
+ * | --»-«--
«  ^
  * | |  |  
|
  * | | \|/  auto auto  start() 
|
- * | | STOPPING_PREP > STOPPING -->- STOPPED 
->-
+ * | | STOPPING_PREP » STOPPING --»- STOPPED 
-»-
  * |\|/   ^ |  ^
  * | |   stop()   | |  |
  * | |   -- |  |
  * | |   |  |  |
  * | |   |destroy()   destroy() |  |
- * | |FAILED >-- DESTROYING ---<-  |
+ * | |FAILED »-- DESTROYING ---«-  |
  * | |^ |  |
  * | | destroy()  | |auto  |
- * | >-\|/ |
+ * | »-\|/ |
  * | DESTROYED |
  * |   |
  * |stop() |
- * --->-->--
+ * ---»--»--
  *
  * Any state can transition to FAILED.
  *

Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1801987=1801986=1801987=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java Fri Jul 
14 20:14:50 2017
@@ -74,35 +74,35 @@ import org.apache.tomcat.util.security.P
  *is called.
  * ERROR- Something went wrong.
  *
- * |->--|  
|--«MUST_ERROR---«|
+ * |-»--|  
|--«MUST_ERROR---«|
  * |   \|/\|/  
  |
- * |   |--<-E R R O 
R<-<---| |
- * |   |  complete() /|\/|\\ \--<-<-|  
| ^
+ * |   |--«-E R R O 
R<-«---| |
+ * |   |  complete() /|\/|\\ 
\--«-«-|  | ^
  * |   |  |  |  \   |  
| |
- * |   ||->---|  |   \--->--| 

svn propchange: r1801987 - svn:log

2017-07-14 Thread csutherl
Author: csutherl
Revision: 1801987
Modified property: svn:log

Modified: svn:log at Fri Jul 14 20:16:20 2017
--
--- svn:log (original)
+++ svn:log Fri Jul 14 20:16:20 2017
@@ -1 +1 @@
-Porting r1631350 to tomcat7: Use UTF-8 to fix ASCII art in Javadoc. How ironic.
+Porting r1631406 to tomcat7: Use UTF-8 to fix ASCII art in Javadoc. How ironic.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1801982 - /tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java

2017-07-14 Thread csutherl
Author: csutherl
Date: Fri Jul 14 19:45:08 2017
New Revision: 1801982

URL: http://svn.apache.org/viewvc?rev=1801982=rev
Log:
Porting r1631705 to tomcat7: Switch to inline styles to silence the Java 8 
Javadoc warnings for the JSP API

Modified:
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java

Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java?rev=1801982=1801981=1801982=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java Fri 
Jul 14 19:45:08 2017
@@ -81,77 +81,77 @@ package javax.servlet.jsp.tagext;
  * thus where synchronization is needed as illustrated by the table below.
  * Note: the synchronization of the variable(s) will occur 
after
  * the respective method has been called. 
- * 
+ * 
  * 
  * 
- * Variable 
Synchronization
+ * Variable Synchronization
  * Points
  * 
  * 
  * 
- * 
- * doStartTag()
- * doInitBody()
- * doAfterBody()
- * doEndTag()
- * doTag()
+ * 
+ * doStartTag()
+ * doInitBody()
+ * doAfterBody()
+ * doEndTag()
+ * doTag()
  * 
  * 
- * Tag
+ * Tag
  * 
- * AT_BEGIN, NESTED
+ * AT_BEGIN, 
NESTED
  * 
- * 
+ * 
  * 
- * 
+ * 
  * 
- * AT_BEGIN, AT_END
+ * AT_BEGIN, 
AT_END
  * 
- * 
+ * 
  * 
  * 
  * 
- * IterationTag
+ * IterationTag
  * 
- * AT_BEGIN, NESTED
+ * AT_BEGIN, 
NESTED
  * 
- * 
+ * 
  * 
- * AT_BEGIN, NESTED
+ * AT_BEGIN, 
NESTED
  * 
- * AT_BEGIN, AT_END
+ * AT_BEGIN, 
AT_END
  * 
- * 
+ * 
  * 
  * 
  * 
- * BodyTag
+ * BodyTag
  * 
- * AT_BEGIN,
+ * AT_BEGIN,
  * NESTED1
  * 
- * AT_BEGIN,
+ * AT_BEGIN,
  * NESTED1
  * 
- * AT_BEGIN, NESTED
+ * AT_BEGIN, 
NESTED
  * 
- * AT_BEGIN, AT_END
+ * AT_BEGIN, 
AT_END
  * 
- * 
+ * 
  * 
  * 
  * 
- * SimpleTag
+ * SimpleTag
  * 
- * 
+ * 
  * 
- * 
+ * 
  * 
- * 
+ * 
  * 
- * 
+ * 
  * 
- * AT_BEGIN, AT_END
+ * AT_BEGIN, 
AT_END
  * 
  * 
  * 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1801983 - in /tomcat/tc7.0.x/trunk/java/javax/servlet/jsp: JspApplicationContext.java JspContext.java el/ExpressionEvaluator.java tagext/BodyTag.java tagext/IterationTag.java tagext/Tag.j

2017-07-14 Thread csutherl
Author: csutherl
Date: Fri Jul 14 19:58:10 2017
New Revision: 1801983

URL: http://svn.apache.org/viewvc?rev=1801983=rev
Log:
Porting r1631350 to tomcat7: Fix Java8 Javadoc errors in the javax.servlet.jsp 
package

Modified:
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspApplicationContext.java
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspContext.java
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/BodyTag.java
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/IterationTag.java
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/Tag.java
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/TagData.java
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/VariableInfo.java

Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspApplicationContext.java?rev=1801983=1801982=1801983=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspApplicationContext.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspApplicationContext.java Fri 
Jul 14 19:58:10 2017
@@ -48,6 +48,7 @@ public interface JspApplicationContext {
  * 
  * 
  * JSP has a default set of ELResolvers to chain for all EL evaluation:
+ * 
  * 
  * ImplicitObjectELResolver
  * ELResolver instances registered with this method
@@ -57,7 +58,6 @@ public interface JspApplicationContext {
  * BeanELResolver
  * ScopedAttributeELResolver
  * 
- * 
  * 
  * @param resolver
  *an additional resolver

Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspContext.java?rev=1801983=1801982=1801983=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspContext.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/JspContext.java Fri Jul 14 
19:58:10 2017
@@ -252,13 +252,13 @@ public abstract class JspContext {
  * page scope attribute namespace of the JspContext.
  * The returned JspWriter must implement all methods and
  * behave as though it were unbuffered.  More specifically:
+ * 
  * 
  *   clear() must throw an IOException
  *   clearBuffer() does nothing
  *   getBufferSize() always returns 0
  *   getRemaining() always returns 0
  * 
- * 
  *
  * @param writer The Writer for the returned JspWriter to send
  * output to.

Modified: 
tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java?rev=1801983=1801982=1801983=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java Fri 
Jul 14 19:58:10 2017
@@ -44,12 +44,12 @@ package javax.servlet.jsp.el;
  * 
  * 
  * The following are examples of syntactically legal EL expressions:
+ * 
  * 
  * ${person.lastName}
  * ${8 * 8}
  * ${my:reverse('hello')}
  * 
- * 
  * 
  * @since 2.0
  * @deprecated As of JSP 2.1, replaced by javax.el.ExpressionFactory

Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/BodyTag.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/BodyTag.java?rev=1801983=1801982=1801983=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/BodyTag.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/BodyTag.java Fri Jul 14 
19:58:10 2017
@@ -70,7 +70,7 @@ import javax.servlet.jsp.JspException;
  * TryCatchFinally interface; see that interface for details.
  * 
  * 
+ * alt="Lifecycle Details Transition Diagram for BodyTag">
  * 
  * Empty and Non-Empty Action
  * 

Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/IterationTag.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/IterationTag.java?rev=1801983=1801982=1801983=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/IterationTag.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/jsp/tagext/IterationTag.java Fri 
Jul 14 19:58:10 2017
@@ -51,7 +51,7 @@ import javax.servlet.jsp.JspException;
  *
  * 
  * 
+ *  alt="Lifecycle Details Transition Diagram for IterationTag">
  *
  * Empty and Non-Empty Action
  *  If the TagLibraryDescriptor file indicates that the action must

Modified: tomcat/tc7.0.x/tr

svn commit: r1801981 - in /tomcat/tc7.0.x/trunk: java/javax/servlet/annotation/ java/org/apache/catalina/ant/jmx/ java/org/apache/catalina/comet/ java/org/apache/catalina/core/ java/org/apache/catalin

2017-07-14 Thread csutherl
Author: csutherl
Date: Fri Jul 14 19:38:59 2017
New Revision: 1801981

URL: http://svn.apache.org/viewvc?rev=1801981=rev
Log:
Porting r1631157 to tomcat7: Some Javadoc fixes for Java 8  -> 

Modified:
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpConstraint.java
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpMethodConstraint.java
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/MultipartConfig.java
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/ServletSecurity.java
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebFilter.java
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebInitParam.java
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebListener.java
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/WebServlet.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometEvent.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java

tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java

Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpConstraint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpConstraint.java?rev=1801981=1801980=1801981=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpConstraint.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpConstraint.java Fri 
Jul 14 19:38:59 2017
@@ -58,7 +58,7 @@ public @interface HttpConstraint {
  * @return array of names. The array may be of zero length, in which case
  * the EmptyRoleSemantic applies; the returned value determines
  * whether access is to be permitted or denied regardless of the
- * identity and authentication state in either case, PERMIT or 
DENY.
+ * identity and authentication state in either case, PERMIT or 
DENY.
  * Otherwise, when the array contains one or more role names access
  * is permitted if the user a member of at least one of the named
  * roles. The EmptyRoleSemantic is not applied in this case.

Modified: 
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpMethodConstraint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpMethodConstraint.java?rev=1801981=1801980=1801981=diff
==
--- 
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpMethodConstraint.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/javax/servlet/annotation/HttpMethodConstraint.java 
Fri Jul 14 19:38:59 2017
@@ -65,7 +65,7 @@ public @interface HttpMethodConstraint {
  * @return array of names. The array may be of zero length, in which case
  * the EmptyRoleSemantic applies; the returned value determines
  * whether access is to be permitted or denied regardless of the
- * identity and authentication state in either case, PERMIT or 
DENY.
+ * identity and authentication state in either case, PERMIT or 
DENY.
  * Otherwise, when the array contains one or more role names access
  * is permitted if the user a member of at least one of the named
  * roles. The EmptyRoleSemantic is not appl

svn commit: r1802641 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/digester/Digester.java webapps/docs/changelog.xml

2017-07-21 Thread csutherl
Author: csutherl
Date: Fri Jul 21 19:51:01 2017
New Revision: 1802641

URL: http://svn.apache.org/viewvc?rev=1802641=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61253

Add warn message when Digester.updateAttributes throws an exception instead of 
ignoring it.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 21 19:51:01 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693
-/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

svn commit: r1802640 - in /tomcat/tc8.5.x/trunk: java/org/apache/tomcat/util/digester/Digester.java webapps/docs/changelog.xml

2017-07-21 Thread csutherl
Author: csutherl
Date: Fri Jul 21 19:49:01 2017
New Revision: 1802640

URL: http://svn.apache.org/viewvc?rev=1802640=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61253

Add warn message when Digester.updateAttributes throws an exception instead of 
ignoring it.

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1802640=1802639=1802640=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java Fri 
Jul 21 19:49:01 2017
@@ -1988,7 +1988,7 @@ public class Digester extends DefaultHan
 newAttrs.setValue(i, newValue);
 }
 } catch (Exception e) {
-// ignore - let the attribute have its original value
+log.warn("Attribute [" + newAttrs.getLocalName(i) + "] failed 
to update and remains [" + value + "].", e);
 }
 }
 

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=1802640=1802639=1802640=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Fri Jul 21 19:49:01 2017
@@ -52,6 +52,10 @@
 other class loader resources) when the web application is deployed in a
 packed WAR file. (markt)
   
+  
+61253: Add warn message when Digester.updateAttributes
+throws an exception instead of ignoring it. (csutherl)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1802642 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/digester/Digester.java webapps/docs/changelog.xml

2017-07-21 Thread csutherl
Author: csutherl
Date: Fri Jul 21 19:52:13 2017
New Revision: 1802642

URL: http://svn.apache.org/viewvc?rev=1802642=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61253

Add warn message when Digester.updateAttributes throws an exception instead of 
ignoring it.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 21 19:52:13 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,1644525,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,1702
 
739,1702742,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,1
 
725974,1726171-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,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020
 
/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

svn commit: r1802639 - in /tomcat/trunk: java/org/apache/tomcat/util/digester/Digester.java webapps/docs/changelog.xml

2017-07-21 Thread csutherl
Author: csutherl
Date: Fri Jul 21 19:45:38 2017
New Revision: 1802639

URL: http://svn.apache.org/viewvc?rev=1802639=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61253

Add warn message when Digester.updateAttributes throws an exception instead of 
ignoring it.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1802639=1802638=1802639=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Fri Jul 21 
19:45:38 2017
@@ -1923,7 +1923,7 @@ public class Digester extends DefaultHan
 newAttrs.setValue(i, newValue);
 }
 } catch (Exception e) {
-// ignore - let the attribute have its original value
+log.warn("Attribute [" + newAttrs.getLocalName(i) + "] failed 
to update and remains [" + value + "].", e);
 }
 }
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1802639=1802638=1802639=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jul 21 19:45:38 2017
@@ -58,6 +58,10 @@
 work directory for improved performance when deploying packed WAR 
files.
 (markt)
   
+  
+61253: Add warn message when Digester.updateAttributes
+throws an exception instead of ignoring it. (csutherl)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1803183 - in /tomcat/site/trunk: docs/whichversion.html xdocs/whichversion.xml

2017-07-27 Thread csutherl
Author: csutherl
Date: Thu Jul 27 13:38:49 2017
New Revision: 1803183

URL: http://svn.apache.org/viewvc?rev=1803183=rev
Log:
Add EOL statements for all versions to whichversion. Thanks to peetaur2 from 
#tomcat for pointing out that EOL statements were missing for older versions.

Modified:
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1803183=1803182=1803183=diff
==
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Thu Jul 27 13:38:49 2017
@@ -601,6 +601,11 @@ it in production
 
 
 
+Users of Tomcat 5 should be aware that Tomcat 5 has now reached
+end of life. Users of Tomcat 5.x should
+upgrade to Tomcat 6.x or later.
+
+
 
 Apache Tomcat 4.x
 
@@ -653,6 +658,11 @@ also supports web applications built for
 specifications with no changes.
 
 
+Users of Tomcat 4 should be aware that Tomcat 4 has now reached
+end of life. Users of Tomcat 4.x should upgrade to Tomcat 5.x or
+later.
+
+
 
 Apache Tomcat 3.x
 
@@ -722,6 +732,11 @@ strongly encouraged to migrate to the cu
 Apache Tomcat 3.0.x. Initial Apache Tomcat release.
 
 
+Users of Tomcat 3 should be aware that Tomcat 3 has now reached
+end of life. Users of Tomcat 3.x should upgrade to Tomcat 4.x or
+later.
+
+
 
 
 

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1803183=1803182=1803183=diff
==
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Thu Jul 27 13:38:49 2017
@@ -299,6 +299,10 @@ it in production
 Expanded documentation
 
 
+Users of Tomcat 5 should be aware that Tomcat 5 has now reached
+end of life. Users of Tomcat 5.x should
+upgrade to Tomcat 6.x or later.
+
 
 
 
@@ -333,6 +337,10 @@ performance.  Version 4.0 implements the
 also supports web applications built for the Servlet 2.2 and JSP 1.1
 specifications with no changes.
 
+Users of Tomcat 4 should be aware that Tomcat 4 has now reached
+end of life. Users of Tomcat 4.x should upgrade to Tomcat 5.x or
+later.
+
 
 
 
@@ -385,6 +393,10 @@ strongly encouraged to migrate to the cu
 
 Apache Tomcat 3.0.x. Initial Apache Tomcat release.
 
+Users of Tomcat 3 should be aware that Tomcat 3 has now reached
+end of life. Users of Tomcat 3.x should upgrade to Tomcat 4.x or
+later.
+
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1802799 - in /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester: Digester.java LocalStrings.properties

2017-07-24 Thread csutherl
Author: csutherl
Date: Mon Jul 24 12:20:30 2017
New Revision: 1802799

URL: http://svn.apache.org/viewvc?rev=1802799=rev
Log:
Followup to r1802640, Use StringManager in log message

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1802799=1802798=1802799=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java Mon 
Jul 24 12:20:30 2017
@@ -1988,7 +1988,7 @@ public class Digester extends DefaultHan
 newAttrs.setValue(i, newValue);
 }
 } catch (Exception e) {
-log.warn("Attribute [" + newAttrs.getLocalName(i) + "] failed 
to update and remains [" + value + "].", e);
+log.warn(sm.getString("digester.failedToUpdateAttributes", 
newAttrs.getLocalName(i), value), e);
 }
 }
 

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties?rev=1802799=1802798=1802799=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties
 Mon Jul 24 12:20:30 2017
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-disgester.encodingInvalid=The encoding [{0}] is not recognised by the JRE and 
will be ignored
\ No newline at end of file
+disgester.encodingInvalid=The encoding [{0}] is not recognised by the JRE and 
will be ignored
+digester.failedToUpdateAttributes=Attribute [{0}] failed to update and remains 
[{1}]



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1802800 - in /tomcat/trunk: ./ java/org/apache/tomcat/util/digester/Digester.java java/org/apache/tomcat/util/digester/LocalStrings.properties

2017-07-24 Thread csutherl
Author: csutherl
Date: Mon Jul 24 12:22:16 2017
New Revision: 1802800

URL: http://svn.apache.org/viewvc?rev=1802800=rev
Log:
Followup to r1802639, Use StringManager in log message

Modified:
tomcat/trunk/   (props changed)
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties

Propchange: tomcat/trunk/
--
svn:mergeinfo = /tomcat/tc8.5.x/trunk:1802799

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1802800=1802799=1802800=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Mon Jul 24 
12:22:16 2017
@@ -1923,7 +1923,7 @@ public class Digester extends DefaultHan
 newAttrs.setValue(i, newValue);
 }
 } catch (Exception e) {
-log.warn("Attribute [" + newAttrs.getLocalName(i) + "] failed 
to update and remains [" + value + "].", e);
+log.warn(sm.getString("digester.failedToUpdateAttributes", 
newAttrs.getLocalName(i), value), e);
 }
 }
 

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties?rev=1802800=1802799=1802800=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties 
Mon Jul 24 12:22:16 2017
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-disgester.encodingInvalid=The encoding [{0}] is not recognised by the JRE and 
will be ignored
\ No newline at end of file
+disgester.encodingInvalid=The encoding [{0}] is not recognised by the JRE and 
will be ignored
+digester.failedToUpdateAttributes=Attribute [{0}] failed to update and remains 
[{1}]



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1798505 - in /tomcat/trunk: CONTRIBUTING.md README.md

2017-06-12 Thread csutherl
Author: csutherl
Date: Mon Jun 12 18:37:20 2017
New Revision: 1798505

URL: http://svn.apache.org/viewvc?rev=1798505=rev
Log:
Add README and CONTRIBUTING documents to help users that are utilizing the 
github mirror rather than SVN.

Added:
tomcat/trunk/CONTRIBUTING.md
tomcat/trunk/README.md

Added: tomcat/trunk/CONTRIBUTING.md
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/CONTRIBUTING.md?rev=1798505=auto
==
--- tomcat/trunk/CONTRIBUTING.md (added)
+++ tomcat/trunk/CONTRIBUTING.md Mon Jun 12 18:37:20 2017
@@ -0,0 +1,144 @@
+# Contributing to Apache Tomcat
+
+Firstly, thanks for your interest in contributing! I hope that this will be a
+pleasant first experience for you, and that you will return to continue
+contributing.
+
+Please visit our [Get Involved page](http://tomcat.apache.org/getinvolved.html)
+for more information on how to contribute.
+
+## Code of Conduct
+
+This project and everyone participating in it is governed by the Apache
+software Foundation's
+[Code of Conduct](http://www.apache.org/foundation/policies/conduct.html). By
+participating, you are expected to adhere to this code. If you are aware of
+unacceptable behavior, please visit the
+[Reporting Guidelines 
page](http://www.apache.org/foundation/policies/conduct.html#reporting-guidelines)
+and follow the instructions there.
+
+## How Can I Contribute?
+
+Most of the contributions that we receive are code contributions, but you can
+also contribute to the documentation, wiki, etc., or simply report solid bugs
+for us to fix.
+
+### Reporting Bugs
+
+Please review our [guide](http://tomcat.apache.org/bugreport.html) on how to
+submit a bug report. This page also has links to other resources to assist
+you.
+
+### Your First Code Contribution
+
+### Trouble Deciding How to Contribute?
+
+Unsure where to begin contributing to Tomcat? You can start by taking a look at
+the issues marked 'Beginner', link below. Please note that the Beginner keyword
+is pretty new to the project, so if there aren't any issues in the filter feel
+free to ask on the [dev list](http://tomcat.apache.org/lists.html#tomcat-dev).
+
+* [Beginner 
issues](https://bz.apache.org/bugzilla/buglist.cgi?bug_status=NEW_status=ASSIGNED_status=REOPENED_status=NEEDINFO=Beginner_type=allwords_id=160824=Tomcat%207=Tomcat%208=Tomcat%209_format=advanced)
 -
+issues which should only require a few lines of code, and a test or two to
+resolve.
+
+The list above shows all bugs that are marked 'Beginner' and are open in the
+currently supported Tomcat versions (7, 8, and 9).
+
+If you prefer C over Java, you may also take a look at the tomcat-native and
+Tomcat Connectors products in Bugzilla.
+
+### How to Provide Your First Patch
+
+Excited yet? This section will guide you through providing a patch to the
+committers of the project for review and acceptance.
+
+# Chose Your Method of Submission
+
+You can provide a patch in one of the following ways (in order of preference):
+
+* Patch attachment to the Bugzilla issue
+* Github Pull Request
+> **Note:** Github is a mirror of the SVN repository that Tomcat is stored in
+and therefore it can't be merged outright. Your contribution will be converted
+into an SVN patch and committed with a mention of your name for credit.
+* Email the patch to the developer list. This is not preferred, but if no bug
+is associated with the patch, or you would like a developer review, an email
+may be appropriate.
+
+# Get the Sources
+
+Now that you've chosen how you want to submit a patch, you need to get the
+source code.
+
+## Download The Source Distribution
+
+This method works if you want to submit a patch (like you would do for SVN), 
but
+the difference in using the sources distribution and a VCS is that you have to
+manually generate the patch file by using diff. If this is what you want, you
+can download the sources from the "Source Code Distributions" section of the
+[Download Page](https://tomcat.apache.org/download-90.cgi).
+
+## SVN
+
+If you have chosen to attach a patch to the Bugzilla issue (or email
+one), then you'll need to checkout the SVN version. Instructions for new
+committers to learn how to do this are found
+[here](http://www.apache.org/dev/contributors.html#svnbasics). However, in the
+interest of a fast ramp up, the short version is below. Note that the root of
+the SVN repository is
+[tomcat/trunk](http://svn.apache.org/repos/asf/tomcat/trunk),
+but you can clone specific versions too, such as
+[tc8.5.x](http://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk/) or even tags (
+[TOMCAT_8_5_15](http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_15/)).
+
+```
+$ svn co http://svn.apache.org/repos/asf/tomcat/trunk/
+```
+
+# Github
+
+For Github, it's almost the same. Chose the major version that you want (for
+now they're in different repositories), fork the repository, and then clone
+yo

svn commit: r1799246 - in /tomcat/tc8.0.x/trunk: ./ CONTRIBUTING.md README.md

2017-06-19 Thread csutherl
Author: csutherl
Date: Mon Jun 19 18:01:53 2017
New Revision: 1799246

URL: http://svn.apache.org/viewvc?rev=1799246=rev
Log:
Add README and CONTRIBUTING documents to help users that are utilizing the 
github mirror rather than SVN.

Added:
tomcat/tc8.0.x/trunk/CONTRIBUTING.md
  - copied unchanged from r1798505, tomcat/trunk/CONTRIBUTING.md
tomcat/tc8.0.x/trunk/README.md
  - copied unchanged from r1798505, tomcat/trunk/README.md
Modified:
tomcat/tc8.0.x/trunk/   (props changed)

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 19 18:01:53 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162
-/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

svn commit: r1799249 - in /tomcat/tc7.0.x/trunk: ./ README.md

2017-06-19 Thread csutherl
Author: csutherl
Date: Mon Jun 19 18:03:03 2017
New Revision: 1799249

URL: http://svn.apache.org/viewvc?rev=1799249=rev
Log:
Add links to the corresponding documents.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/README.md

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 19 18:03:03 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,1799214
 
/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,1749375,1749668

svn commit: r1799248 - in /tomcat/tc7.0.x/trunk: ./ CONTRIBUTING.md README.md

2017-06-19 Thread csutherl
Author: csutherl
Date: Mon Jun 19 18:02:44 2017
New Revision: 1799248

URL: http://svn.apache.org/viewvc?rev=1799248=rev
Log:
Add README and CONTRIBUTING documents to help users that are utilizing the 
github mirror rather than SVN.

Added:
tomcat/tc7.0.x/trunk/CONTRIBUTING.md
  - copied unchanged from r1798505, tomcat/trunk/CONTRIBUTING.md
tomcat/tc7.0.x/trunk/README.md
  - copied unchanged from r1798505, tomcat/trunk/README.md
Modified:
tomcat/tc7.0.x/trunk/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 19 18:02:44 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,1799214
 
/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

svn commit: r1799247 - in /tomcat/tc8.0.x/trunk: ./ README.md

2017-06-19 Thread csutherl
Author: csutherl
Date: Mon Jun 19 18:02:16 2017
New Revision: 1799247

URL: http://svn.apache.org/viewvc?rev=1799247=rev
Log:
Add links to the corresponding documents.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/README.md

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 19 18:02:16 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162
-/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,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675

svn commit: r1799244 - in /tomcat/tc8.5.x/trunk: ./ CONTRIBUTING.md README.md

2017-06-19 Thread csutherl
Author: csutherl
Date: Mon Jun 19 18:00:01 2017
New Revision: 1799244

URL: http://svn.apache.org/viewvc?rev=1799244=rev
Log:
Add README and CONTRIBUTING documents to help users that are utilizing the 
github mirror rather than SVN.

Added:
tomcat/tc8.5.x/trunk/CONTRIBUTING.md
  - copied unchanged from r1798505, tomcat/trunk/CONTRIBUTING.md
tomcat/tc8.5.x/trunk/README.md
  - copied unchanged from r1798505, tomcat/trunk/README.md
Modified:
tomcat/tc8.5.x/trunk/   (props changed)

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 19 18:00:01 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

svn commit: r1799245 - in /tomcat/tc8.5.x/trunk: ./ README.md

2017-06-19 Thread csutherl
Author: csutherl
Date: Mon Jun 19 18:00:47 2017
New Revision: 1799245

URL: http://svn.apache.org/viewvc?rev=1799245=rev
Log:
Add links to the corresponding documents.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/README.md

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 19 18:00:47 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,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798

svn commit: r1808880 - in /tomcat/tc8.5.x/trunk: java/org/apache/tomcat/util/http/ServerCookies.java webapps/docs/changelog.xml

2017-09-19 Thread csutherl
Author: csutherl
Date: Tue Sep 19 14:07:02 2017
New Revision: 1808880

URL: http://svn.apache.org/viewvc?rev=1808880=rev
Log:
Update fix for bug 59904 so that values less than zero are accepted instead of 
throwing a NegativeArraySizeException.

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/ServerCookies.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/ServerCookies.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/ServerCookies.java?rev=1808880=1808879=1808880=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/ServerCookies.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/ServerCookies.java 
Tue Sep 19 14:07:02 2017
@@ -49,7 +49,7 @@ public class ServerCookies {
 }
 
 if (cookieCount >= serverCookies.length) {
-int newSize = Math.min(2*cookieCount, limit);
+int newSize = limit > -1 ? Math.min(2*cookieCount, limit) : 
2*cookieCount;
 ServerCookie scookiesTmp[] = new ServerCookie[newSize];
 System.arraycopy(serverCookies, 0, scookiesTmp, 0, cookieCount);
 serverCookies = scookiesTmp;

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=1808880=1808879=1808880=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Sep 19 14:07:02 2017
@@ -59,6 +59,14 @@
   
 
   
+  
+
+  
+Update fix for 59904 so that values less than zero are 
accepted
+instead of throwing a NegativeArraySizeException. (remm)
+  
+
+  
 
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1808881 - in /tomcat/trunk: ./ java/org/apache/tomcat/util/http/ServerCookies.java webapps/docs/changelog.xml

2017-09-19 Thread csutherl
Author: csutherl
Date: Tue Sep 19 14:10:12 2017
New Revision: 1808881

URL: http://svn.apache.org/viewvc?rev=1808881=rev
Log:
Cherry-pick r1808880 from 8.5.x/trunk

Modified:
tomcat/trunk/   (props changed)
tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookies.java
tomcat/trunk/webapps/docs/changelog.xml   (contents, props changed)

Propchange: tomcat/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 19 14:10:12 2017
@@ -1 +1 @@
-/tomcat/tc8.5.x/trunk:1802799
+/tomcat/tc8.5.x/trunk:1802799,1808880

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookies.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookies.java?rev=1808881=1808880=1808881=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookies.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookies.java Tue Sep 19 
14:10:12 2017
@@ -49,7 +49,7 @@ public class ServerCookies {
 }
 
 if (cookieCount >= serverCookies.length) {
-int newSize = Math.min(2*cookieCount, limit);
+int newSize = limit > -1 ? Math.min(2*cookieCount, limit) : 
2*cookieCount;
 ServerCookie scookiesTmp[] = new ServerCookie[newSize];
 System.arraycopy(serverCookies, 0, scookiesTmp, 0, cookieCount);
 serverCookies = scookiesTmp;

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1808881=1808880=1808881=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Sep 19 14:10:12 2017
@@ -74,6 +74,14 @@
   
 
   
+  
+
+  
+Update fix for 59904 so that values less than zero are 
accepted
+instead of throwing a NegativeArraySizeException. (remm)
+  
+
+  
 
 
   

Propchange: tomcat/trunk/webapps/docs/changelog.xml
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 19 14:10:12 2017
@@ -1 +1 @@
-/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml:1781934
+/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml:1781934,1808880



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1808887 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/Cookies.java webapps/docs/changelog.xml

2017-09-19 Thread csutherl
Author: csutherl
Date: Tue Sep 19 14:22:06 2017
New Revision: 1808887

URL: http://svn.apache.org/viewvc?rev=1808887=rev
Log:
Update fix for bug 59904 so that values less than zero are accepted instead of 
throwing a NegativeArraySizeException.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 19 14:22:06 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,1644525,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,1702
 
739,1702742,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,1
 
725974,1726171-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,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,1802814,180361
 8,1806107,1806733,1807082-1807083,1808707
-/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

svn commit: r1808884 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/http/ServerCookies.java webapps/docs/changelog.xml

2017-09-19 Thread csutherl
Author: csutherl
Date: Tue Sep 19 14:17:12 2017
New Revision: 1808884

URL: http://svn.apache.org/viewvc?rev=1808884=rev
Log:
Update fix for bug 59904 so that values less than zero are accepted instead of 
throwing a NegativeArraySizeException.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookies.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 19 14:17:12 2017
@@ -1,2 +1,2 @@
-/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080
+/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880
 
/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

svn commit: r1809645 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/LocalStrings_es.properties webapps/docs/changelog.xml

2017-09-25 Thread csutherl
Author: csutherl
Date: Mon Sep 25 17:47:08 2017
New Revision: 1809645

URL: http://svn.apache.org/viewvc?rev=1809645=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61563
Correct typo in Spanish translation.
Patch provided by Gonzalo Vásquez.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 25 17:47:08 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,1644525,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,1702
 
739,1702742,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,1
 
725974,1726171-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,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,1802814,180361
 8,1806107,1806733,1807082-1807083,1808707,1808884,1809267
+/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

svn commit: r1809644 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/manager/LocalStrings_es.properties webapps/docs/changelog.xml

2017-09-25 Thread csutherl
Author: csutherl
Date: Mon Sep 25 17:44:37 2017
New Revision: 1809644

URL: http://svn.apache.org/viewvc?rev=1809644=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61563
Correct typo in Spanish translation.
Patch provided by Gonzalo Vásquez.

Modified:

tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties?rev=1809644=1809643=1809644=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
 Mon Sep 25 17:44:37 2017
@@ -75,7 +75,7 @@ managerServlet.findleaksFail = FALLO - H
 managerServlet.findleaksList = OK - Hallados fallos potenciales de memoria en 
las siguientes aplicaciones\:
 managerServlet.findleaksNone = OK - No se han hallado fallos de memoria
 managerServlet.invalidPath = FALLO - Se ha especificado una trayectoria 
inv\u00E1lida de contexto {0}
-managerServlet.listed = OK - Aplicaciones listadas para m\u00E1quinda virutal 
{0}
+managerServlet.listed = OK - Aplicaciones listadas para m\u00E1quina virtual 
{0}
 managerServlet.listitem = {0}\:{1}\:{2}\:{3}
 managerServlet.mkdirFail = FALLO - No pude crear directorio [{0}]
 managerServlet.noCommand = FALLO - No se ha especificado comando

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1809644=1809643=1809644=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Sep 25 17:44:37 2017
@@ -221,6 +221,10 @@
 Update fix for 59904 so that values less than zero are 
accepted
 instead of throwing a NegativeArraySizeException. (remm)
   
+  
+61563: Correct typos in Spanish translation. Patch provided 
by
+Gonzalo Vásquez. (csutherl)
+  
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1809646 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/manager/LocalStrings_es.properties webapps/docs/changelog.xml

2017-09-25 Thread csutherl
Author: csutherl
Date: Mon Sep 25 17:51:06 2017
New Revision: 1809646

URL: http://svn.apache.org/viewvc?rev=1809646=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61563
Correct typo in Spanish translation.
Patch provided by Gonzalo Vásquez.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 25 17:51:06 2017
@@ -1 +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,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

svn commit: r1809648 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

2017-09-25 Thread csutherl
Author: csutherl
Date: Mon Sep 25 17:54:44 2017
New Revision: 1809648

URL: http://svn.apache.org/viewvc?rev=1809648=rev
Log:
Moving changelog entry for bz#61563 to the correct release

Modified:
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

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=1809648=1809647=1809648=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Sep 25 17:54:44 2017
@@ -92,6 +92,10 @@
 Update fix for 59904 so that values less than zero are 
accepted
 instead of throwing a NegativeArraySizeException. (remm)
   
+  
+61563: Correct typos in Spanish translation. Patch provided 
by
+Gonzalo Vásquez. (csutherl)
+  
 
   
 
@@ -308,10 +312,6 @@
 pick up the latest Windows binaries built with APR 1.6.2 and OpenSSL
 1.0.2l. (markt)
   
-  
-61563: Correct typos in Spanish translation. Patch provided 
by
-Gonzalo Vásquez. (csutherl)
-  
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1809647 - in /tomcat/trunk: ./ java/org/apache/catalina/manager/LocalStrings_es.properties webapps/docs/changelog.xml

2017-09-25 Thread csutherl
Author: csutherl
Date: Mon Sep 25 17:54:11 2017
New Revision: 1809647

URL: http://svn.apache.org/viewvc?rev=1809647=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61563
Correct typo in Spanish translation.
Patch provided by Gonzalo Vásquez.

Modified:
tomcat/trunk/   (props changed)
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
tomcat/trunk/webapps/docs/changelog.xml   (contents, props changed)

Propchange: tomcat/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 25 17:54:11 2017
@@ -1 +1,2 @@
-/tomcat/tc8.5.x/trunk:1802799,1808880
+/tomcat/tc8.0.x/trunk:1809644
+/tomcat/tc8.5.x/trunk:1802799,1808880,1809646

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties?rev=1809647=1809646=1809647=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties 
Mon Sep 25 17:54:11 2017
@@ -75,7 +75,7 @@ managerServlet.findleaksFail = FALLO - H
 managerServlet.findleaksList = OK - Hallados fallos potenciales de memoria en 
las siguientes aplicaciones:
 managerServlet.findleaksNone = OK - No se han hallado fallos de memoria
 managerServlet.invalidPath = FALLO - Se ha especificado una trayectoria 
inv\u00E1lida de contexto [{0}]
-managerServlet.listed = OK - Aplicaciones listadas para m\u00E1quinda virutal 
[{0}]
+managerServlet.listed = OK - Aplicaciones listadas para m\u00E1quina virtual 
[{0}]
 managerServlet.listitem = {0}:{1}:{2}:{3}
 managerServlet.mkdirFail = FALLO - No pude crear directorio [{0}]
 managerServlet.noCommand = FALLO - No se ha especificado comando

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1809647=1809646=1809647=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 25 17:54:11 2017
@@ -53,6 +53,14 @@
   
 
   
+  
+
+  
+61563: Correct typos in Spanish translation. Patch provided 
by
+Gonzalo Vásquez. (csutherl)
+  
+
+  
 
 
   

Propchange: tomcat/trunk/webapps/docs/changelog.xml
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 25 17:54:11 2017
@@ -1 +1 @@
-/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml:1781934,1808880
+/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml:1781934,1808880,1809646



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1818594 - /tomcat/native/trunk/download_deps.sh

2017-12-18 Thread csutherl
Author: csutherl
Date: Mon Dec 18 17:17:12 2017
New Revision: 1818594

URL: http://svn.apache.org/viewvc?rev=1818594=rev
Log:
Update download_deps.sh. Links were outdated and produced empty directories. 
Also removed some of the mutliple extra blank lines.

Modified:
tomcat/native/trunk/download_deps.sh

Modified: tomcat/native/trunk/download_deps.sh
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/download_deps.sh?rev=1818594=1818593=1818594=diff
==
--- tomcat/native/trunk/download_deps.sh (original)
+++ tomcat/native/trunk/download_deps.sh Mon Dec 18 17:17:12 2017
@@ -3,14 +3,12 @@
 # Small script to get a recent openssl, with npn support
 # Will run configure and build_libs to generate the .s files
 
-
-
 SSL=openssl-1.0.2g.tar.gz
 APR=apr-1.5.2.tar.gz
 mkdir -p deps
 
 if [ ! -f deps/$SSL ] ; then
-  curl http://openssl.org/source/$SSL -o deps/$SSL
+  curl https://www.openssl.org/source/$SSL -o deps/$SSL
 fi 
 if [ ! -d deps/src/openssl ] ; then
   mkdir -p deps/src/openssl 
@@ -22,15 +20,10 @@ fi
 
 (cd deps/src/openssl; make build_libs )
 
-  
 if [ ! -f deps/$APR ] ; then
-  curl http://mirrors.ibiblio.org/apache/apr/$APR -o deps/$APR
+  curl https://archive.apache.org/dist/apr/$APR -o deps/$APR
 fi 
 if [ ! -d deps/src/apr ] ; then
   mkdir -p deps/src/apr 
   (cd deps/src/apr; tar  -xvz --strip-components=1 -f ../../$APR)
 fi
-
-  
-  
- 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1817791 - /tomcat/trunk/webapps/docs/config/listeners.xml

2017-12-11 Thread csutherl
Author: csutherl
Date: Mon Dec 11 16:31:45 2017
New Revision: 1817791

URL: http://svn.apache.org/viewvc?rev=1817791=rev
Log:
Follow-up to r1816546 The Listener was removed, removing documentation 
reference.

Modified:
tomcat/trunk/webapps/docs/config/listeners.xml

Modified: tomcat/trunk/webapps/docs/config/listeners.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=1817791=1817790=1817791=diff
==
--- tomcat/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/trunk/webapps/docs/config/listeners.xml Mon Dec 11 16:31:45 2017
@@ -571,15 +571,6 @@
 
   
 
-  
-
-This listener performs system property replacement using the property
- source configured on the digester. When ${parameter}
- denoted parameters are found in the values of system properties,
- the property source will be invoked to attempt to replace it.
-
-  
-
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1832856 - in /tomcat/trunk: java/org/apache/tomcat/util/digester/Digester.java webapps/docs/changelog.xml

2018-06-04 Thread csutherl
Author: csutherl
Date: Mon Jun  4 15:07:57 2018
New Revision: 1832856

URL: http://svn.apache.org/viewvc?rev=1832856=rev
Log:
Fix potential NullPointerException in replaceSystemProperties() seemingly 
caused by changing StringManager sm declaration to static

Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1832856=1832855=1832856=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Mon Jun  4 
15:07:57 2018
@@ -84,6 +84,7 @@ public class Digester extends DefaultHan
 
 protected static IntrospectionUtils.PropertySource propertySource;
 private static boolean propertySourceSet = false;
+protected static final StringManager sm = 
StringManager.getManager(Digester.class);
 
 static {
 String className = 
System.getProperty("org.apache.tomcat.util.digester.PROPERTY_SOURCE");
@@ -309,7 +310,6 @@ public class Digester extends DefaultHan
  * The Log to which most logging calls will be made.
  */
 protected Log log = LogFactory.getLog(Digester.class);
-protected static final StringManager sm = 
StringManager.getManager(Digester.class);
 
 /**
  * The Log to which all SAX event related logging calls will be made.

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1832856=1832855=1832856=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jun  4 15:07:57 2018
@@ -191,6 +191,10 @@
 not contain leading zeros in the IPv4 part. Based on a patch by Katya
 Stoycheva. (markt)
   
+  
+Fix NullPointerException thrown from 
+replaceSystemProperties() when trying to log messages. 
(csutherl)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1832857 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/digester/Digester.java webapps/docs/changelog.xml

2018-06-04 Thread csutherl
Author: csutherl
Date: Mon Jun  4 15:09:26 2018
New Revision: 1832857

URL: http://svn.apache.org/viewvc?rev=1832857=rev
Log:
Fix potential NullPointerException in replaceSystemProperties() seemingly 
caused by changing StringManager sm declaration to static

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun  4 15:09:26 2018
@@ -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

svn commit: r1830594 - /tomcat/trunk/webapps/docs/changelog.xml

2018-04-30 Thread csutherl
Author: csutherl
Date: Mon Apr 30 15:59:11 2018
New Revision: 1830594

URL: http://svn.apache.org/viewvc?rev=1830594=rev
Log:
Fix typo

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1830594=1830593=1830594=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Apr 30 15:59:11 2018
@@ -116,7 +116,7 @@
 attribute allowMultipleLeadingForwardSlashInPath. (markt)
   
   
-Improve handing of overflow in the UTF-8 decoder with supplementary
+Improve handling of overflow in the UTF-8 decoder with supplementary
 characters. (markt)
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[GitHub] tomcat issue #79: remove placeholders from introduction doc

2017-10-19 Thread csutherl
Github user csutherl commented on the issue:

https://github.com/apache/tomcat/pull/79
  
This is a least the fourth time I've seen someone asking about this. Should 
we make a note or use a sarcasm font or something? :) It's funny, but seems to 
be confusing new folks.


---

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1813449 - in /tomcat/site/trunk: docs/security-7.html docs/security-8.html xdocs/security-7.xml xdocs/security-8.xml

2017-10-26 Thread csutherl
Author: csutherl
Date: Thu Oct 26 18:51:20 2017
New Revision: 1813449

URL: http://svn.apache.org/viewvc?rev=1813449=rev
Log:
Add release date for 8.0.47 and 7.0.82

Modified:
tomcat/site/trunk/docs/security-7.html
tomcat/site/trunk/docs/security-8.html
tomcat/site/trunk/xdocs/security-7.xml
tomcat/site/trunk/xdocs/security-8.xml

Modified: tomcat/site/trunk/docs/security-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1813449=1813448=1813449=diff
==
--- tomcat/site/trunk/docs/security-7.html (original)
+++ tomcat/site/trunk/docs/security-7.html Thu Oct 26 18:51:20 2017
@@ -379,7 +379,7 @@
   
 
 
-TBD October 2017 Fixed in Apache Tomcat 
7.0.82
+4 October 2017 Fixed in Apache Tomcat 
7.0.82
 
 
 

Modified: tomcat/site/trunk/docs/security-8.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-8.html?rev=1813449=1813448=1813449=diff
==
--- tomcat/site/trunk/docs/security-8.html (original)
+++ tomcat/site/trunk/docs/security-8.html Thu Oct 26 18:51:20 2017
@@ -346,7 +346,7 @@
   
 
 
-TBD October 2017 Fixed in Apache Tomcat 
8.0.47
+4 October 2017 Fixed in Apache Tomcat 
8.0.47
 
 
 

Modified: tomcat/site/trunk/xdocs/security-7.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-7.xml?rev=1813449=1813448=1813449=diff
==
--- tomcat/site/trunk/xdocs/security-7.xml (original)
+++ tomcat/site/trunk/xdocs/security-7.xml Thu Oct 26 18:51:20 2017
@@ -50,7 +50,7 @@
 
   
 
-  
+  
 
 Important: Remote Code Execution
CVE-2017-12617

Modified: tomcat/site/trunk/xdocs/security-8.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-8.xml?rev=1813449=1813448=1813449=diff
==
--- tomcat/site/trunk/xdocs/security-8.xml (original)
+++ tomcat/site/trunk/xdocs/security-8.xml Thu Oct 26 18:51:20 2017
@@ -50,7 +50,7 @@
 
   
 
-  
+  
 
 Important: Remote Code Execution
CVE-2017-12617



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1820317 - /tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java

2018-01-05 Thread csutherl
Author: csutherl
Date: Fri Jan  5 16:27:41 2018
New Revision: 1820317

URL: http://svn.apache.org/viewvc?rev=1820317=rev
Log:
Update javadoc in VirtualDirContext to put the code into a code block rather 
than in line

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java?rev=1820317=1820316=1820317=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java 
Fri Jan  5 16:27:41 2018
@@ -38,17 +38,17 @@ import org.apache.naming.NamingEntry;
  * This should be used in conjunction with
  * {@link org.apache.catalina.loader.VirtualWebappLoader}.
  *
- * Sample context xml configuration:
+ * Sample context xml configuration:
  *
- * 
- * Context path="/mywebapp" 
docBase="/Users/theuser/mywebapp/src/main/webapp" >
- *   Resources className="org.apache.naming.resources.VirtualDirContext"
+ * {@code
+ * 
+ *   
- *   Loader className="org.apache.catalina.loader.VirtualWebappLoader"
+ *   
- *   JarScanner scanAllDirectories="true" />
- * /Context>
- * 
+ *   
+ * 
+ * }
  *
  *
  * This is not meant to be used for production.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1820191 - in /tomcat/site/trunk: docs/irc.html xdocs/irc.xml

2018-01-04 Thread csutherl
Author: csutherl
Date: Thu Jan  4 20:03:03 2018
New Revision: 1820191

URL: http://svn.apache.org/viewvc?rev=1820191=rev
Log:
Update freenode's webchat link to include #tomcat channel name

Modified:
tomcat/site/trunk/docs/irc.html
tomcat/site/trunk/xdocs/irc.xml

Modified: tomcat/site/trunk/docs/irc.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/irc.html?rev=1820191=1820190=1820191=diff
==
--- tomcat/site/trunk/docs/irc.html (original)
+++ tomcat/site/trunk/docs/irc.html Thu Jan  4 20:03:03 2018
@@ -213,11 +213,12 @@
 
 
 
+  
 #tomcat at irc.freenode.net.
-Click https://webchat.freenode.net/; rel="nofollow">here to
-begin using freenode in your browser via freenode's webchat server. You'll 
-need to choose a nickname and type #tomcat in the input box 
-labeled 'Channels' before clicking 'Connect' to access the channel.
+  Click http://webchat.freenode.net/?channels=tomcat; rel="nofollow">
+  here to begin using freenode in your browser via freenode's webchat 
+  server.
+
 
 
 

Modified: tomcat/site/trunk/xdocs/irc.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/irc.xml?rev=1820191=1820190=1820191=diff
==
--- tomcat/site/trunk/xdocs/irc.xml (original)
+++ tomcat/site/trunk/xdocs/irc.xml Thu Jan  4 20:03:03 2018
@@ -12,11 +12,12 @@
 
 An IRC channel dedicated to Tomcat exists on Freenode.net. 
 
-#tomcat at irc.freenode.net.
-Click https://webchat.freenode.net/; rel="nofollow">here to
-begin using freenode in your browser via freenode's webchat server. You'll 
-need to choose a nickname and type #tomcat in the input box 
-labeled 'Channels' before clicking 'Connect' to access the channel.
+
+  #tomcat at irc.freenode.net.
+  Click http://webchat.freenode.net/?channels=tomcat; rel="nofollow">
+  here to begin using freenode in your browser via freenode's webchat 
+  server.
+
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1822001 - in /tomcat/trunk: java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml

2018-01-23 Thread csutherl
Author: csutherl
Date: Tue Jan 23 13:15:09 2018
New Revision: 1822001

URL: http://svn.apache.org/viewvc?rev=1822001=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62023
Log error reporting multiple SSLHostConfig elements when using the APR 
Connector instead of crashing Tomcat.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1822001=1822000=1822001=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Jan 23 
13:15:09 2018
@@ -625,12 +625,12 @@ public class AprEndpoint extends Abstrac
 @Override
 protected void releaseSSLContext(SSLHostConfig sslHostConfig) {
 Long ctx = sslHostConfig.getOpenSslContext();
-if (ctx != null) {
+if (ctx != null && ctx != 0) {
 SSLContext.free(ctx.longValue());
 sslHostConfig.setOpenSslContext(null);
 }
 Long cctx = sslHostConfig.getOpenSslConfContext();
-if (cctx != null) {
+if (cctx != null && cctx != 0) {
 SSLConf.free(cctx.longValue());
 sslHostConfig.setOpenSslConfContext(null);
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1822001=1822000=1822001=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jan 23 13:15:09 2018
@@ -53,6 +53,14 @@
   
 
   
+  
+
+  
+62023: Log error reporting multiple SSLHostConfig elements
+when using the APR Connector instead of crashing Tomcat. (csutherl)
+  
+
+  
 
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1822004 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml

2018-01-23 Thread csutherl
Author: csutherl
Date: Tue Jan 23 13:19:34 2018
New Revision: 1822004

URL: http://svn.apache.org/viewvc?rev=1822004=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62023
> Log error reporting multiple SSLHostConfig elements when using the APR 
> Connector instead of crashing Tomcat.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 23 13:19:34 2018
@@ -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,1

svn commit: r1822150 - in /tomcat/trunk: java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/jsse/ webapps/docs/

2018-01-24 Thread csutherl
Author: csutherl
Date: Wed Jan 24 19:45:00 2018
New Revision: 1822150

URL: http://svn.apache.org/viewvc?rev=1822150=rev
Log:
Fixed https://bz.apache.org/bugzilla/show_bug.cgi?id=62032
Fix NullPointerException when certificateFile is not defined on an 
SSLHostConfig and unify the behavior when a certificateFile is defined but the 
file does not exist for both JKS and PEM file types.

I also fixed one TODO in SSLHostConfig and changed how the 
IllegalArgumentException is thrown in AbstractJsseEndpoint so that it's message 
is consistent with other logging messages.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1822150=1822149=1822150=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Wed 
Jan 24 19:45:00 2018
@@ -111,7 +111,7 @@ public abstract class AbstractJsseEndpoi
 sslContext = sslUtil.createSSLContext(negotiableProtocols);
 sslContext.init(sslUtil.getKeyManagers(), 
sslUtil.getTrustManagers(), null);
 } catch (Exception e) {
-throw new IllegalArgumentException(e);
+throw new IllegalArgumentException(e.getMessage(), e);
 }
 
 SSLSessionContext sessionContext = 
sslContext.getServerSessionContext();

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1822150=1822149=1822150=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Wed 
Jan 24 19:45:00 2018
@@ -146,6 +146,7 @@ sslHostConfig.prefix_missing=The protoco
 sslHostConfigCertificate.mismatch=The property [{0}] was set on the 
SSLHostConfigCertificate named [{1}] and is for certificate storage type [{2}] 
but the certificate is being used with a storage of type [{3}]
 sslHostConfig.opensslconf.null=Attempt to set null OpenSSLConf ignored
 sslHostConfig.opensslconf.alreadyset=Attempt to set another OpenSSLConf ignored
+sslHostConfig.fileNotFound=Configured file [{0}] does not exist
 
 sslImplementation.cnfe= Unable to create SSLImplementation for class [{0}]
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1822150=1822149=1822150=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Wed Jan 24 
19:45:00 2018
@@ -17,6 +17,7 @@
 package org.apache.tomcat.util.net;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.Serializable;
 import java.security.KeyStore;
@@ -824,7 +825,7 @@ public class SSLHostConfig implements Se
 
 // - Support 
methods
 
-public static String adjustRelativePath(String path) {
+public static String adjustRelativePath(String path) throws 
FileNotFoundException {
 // Empty or null path can't point to anything useful. The assumption is
 // that the value is deliberately empty / null so leave it that way.
 if (path == null || path.length() == 0) {
@@ -837,8 +838,7 @@ public class SSLHostConfig implements Se
 f = new File(newPath);
 }
 if (!f.exists()) {
-// TODO i18n, sm
-log.warn("configured file:["+newPath+"] does not exist.");
+throw new 
FileNotFoundException(sm.getString("sslHostConfig.fileNotFound", newPath));
 }
 return newPath;
 }

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java?rev=1822150=1822149=1822150=diff
==
--- tomcat/trunk/j

svn commit: r1822152 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/jsse/ webapps/docs/

2018-01-24 Thread csutherl
Author: csutherl
Date: Wed Jan 24 19:49:03 2018
New Revision: 1822152

URL: http://svn.apache.org/viewvc?rev=1822152=rev
Log:
Fixed https://bz.apache.org/bugzilla/show_bug.cgi?id=62032
Fix NullPointerException when certificateFile is not defined on an 
SSLHostConfig and unify the behavior when a certificateFile is defined but the 
file does not exist for both JKS and PEM file types.

I also fixed one TODO in SSLHostConfig and changed how the 
IllegalArgumentException is thrown in AbstractJsseEndpoint so that it's message 
is consistent with other logging messages.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 24 19:49:03 2018
@@ -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

svn commit: r1825649 - /tomcat/jk/trunk/xdocs/webserver_howto/iis.xml

2018-03-01 Thread csutherl
Author: csutherl
Date: Thu Mar  1 14:27:09 2018
New Revision: 1825649

URL: http://svn.apache.org/viewvc?rev=1825649=rev
Log:
Correct typo

Modified:
tomcat/jk/trunk/xdocs/webserver_howto/iis.xml

Modified: tomcat/jk/trunk/xdocs/webserver_howto/iis.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/iis.xml?rev=1825649=1825648=1825649=diff
==
--- tomcat/jk/trunk/xdocs/webserver_howto/iis.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/iis.xml Thu Mar  1 14:27:09 2018
@@ -256,7 +256,7 @@ and the executable should be the full pa
 configured, click OK.
 
 
-Still using the IIS managament console, configure the ISAPI redirector as
+Still using the IIS management console, configure the ISAPI redirector as
 allowed. Select your server (not the web site) and then double-click on 
ISAPI
 and CGI Restrictions. From the action pane, click Add Select the
 isapi_redirect.dll, add a descripion (e.g. tomcat) and select the Allow



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1829084 - /tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java

2018-04-13 Thread csutherl
Author: csutherl
Date: Fri Apr 13 15:28:12 2018
New Revision: 1829084

URL: http://svn.apache.org/viewvc?rev=1829084=rev
Log:
Fix logic bug from my initial patch.

Modified:
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java

Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1829084=1829083=1829084=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Fri 
Apr 13 15:28:12 2018
@@ -963,8 +963,8 @@ public class NamingContextListener
 log.error(sm.getString("naming.bindFailed", e));
 }
 
-if ("javax.sql.DataSource".equals(ref.getClassName())  ||
-"javax.sql.XADataSource".equals(ref.getClassName()) &&
+if (("javax.sql.DataSource".equals(ref.getClassName())  ||
+"javax.sql.XADataSource".equals(ref.getClassName())) &&
 resource.getSingleton()) {
 try {
 ObjectName on = createObjectName(resource);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1829082 - in /tomcat/trunk: java/org/apache/catalina/core/NamingContextListener.java webapps/docs/changelog.xml

2018-04-13 Thread csutherl
Author: csutherl
Date: Fri Apr 13 14:59:19 2018
New Revision: 1829082

URL: http://svn.apache.org/viewvc?rev=1829082=rev
Log:
Register MBean when DataSource Resource type="javax.sql.XADataSource". Patch 
provided by Masafumi Miura. (csutherl)

Modified:
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1829082=1829081=1829082=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Fri 
Apr 13 14:59:19 2018
@@ -963,7 +963,8 @@ public class NamingContextListener
 log.error(sm.getString("naming.bindFailed", e));
 }
 
-if ("javax.sql.DataSource".equals(ref.getClassName()) &&
+if ("javax.sql.DataSource".equals(ref.getClassName())  ||
+"javax.sql.XADataSource".equals(ref.getClassName()) &&
 resource.getSingleton()) {
 try {
 ObjectName on = createObjectName(resource);

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1829082=1829081=1829082=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Apr 13 14:59:19 2018
@@ -57,6 +57,11 @@
 the error has caused the connection to the client to be closed as 
no-one
 will ever see the error page. (markt)
   
+  
+Register MBean when DataSource Resource 
+type="javax.sql.XADataSource". Patch provided by Masafumi Miura.
+(csutherl)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1829310 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/NamingContextListener.java webapps/docs/changelog.xml

2018-04-16 Thread csutherl
Author: csutherl
Date: Mon Apr 16 18:29:54 2018
New Revision: 1829310

URL: http://svn.apache.org/viewvc?rev=1829310=rev
Log:
Register MBean when DataSource Resource type=javax.sql.XADataSource. Patch 
provided by Masafumi Miura.

This commit also includes a follow up from trunk, r1829084

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 16 18:29:54 2018
@@ -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

svn commit: r1829311 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/NamingContextListener.java webapps/docs/changelog.xml

2018-04-16 Thread csutherl
Author: csutherl
Date: Mon Apr 16 18:32:23 2018
New Revision: 1829311

URL: http://svn.apache.org/viewvc?rev=1829311=rev
Log:
Register MBean when DataSource Resource type=javax.sql.XADataSource. Patch 
provided by Masafumi Miura.

This commit also includes a follow up from trunk, r1829084

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 16 18:32:23 2018
@@ -1,2 +1,2 @@
-/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207,1822186,1823164,1823497,1824960,1826872-1826873,1827862
-/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

svn commit: r1829312 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/NamingContextListener.java webapps/docs/changelog.xml

2018-04-16 Thread csutherl
Author: csutherl
Date: Mon Apr 16 18:35:50 2018
New Revision: 1829312

URL: http://svn.apache.org/viewvc?rev=1829312=rev
Log:
Register MBean when DataSource Resource type=javax.sql.XADataSource. Patch 
provided by Masafumi Miura.

This commit also includes a follow up from trunk, r1829084

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 16 18:35:50 2018
@@ -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,1644525,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,1702
 
739,1702742,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,1
 
725974,1726171-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,1758563,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,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576

svn commit: r1843685 - in /tomcat/native/trunk/native: build/buildcheck.sh buildconf

2018-10-12 Thread csutherl
Author: csutherl
Date: Fri Oct 12 16:02:57 2018
New Revision: 1843685

URL: http://svn.apache.org/viewvc?rev=1843685=rev
Log:
Update buildconf and buildcheck.sh to detect and run under Python 3 or 2. Same 
logic as apr-1.7.x uses, see commit apr r1834494.

Modified:
tomcat/native/trunk/native/build/buildcheck.sh
tomcat/native/trunk/native/buildconf

Modified: tomcat/native/trunk/native/build/buildcheck.sh
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/buildcheck.sh?rev=1843685=1843684=1843685=diff
==
--- tomcat/native/trunk/native/build/buildcheck.sh (original)
+++ tomcat/native/trunk/native/build/buildcheck.sh Fri Oct 12 16:02:57 2018
@@ -19,14 +19,14 @@
 echo "buildconf: checking installation..."
 
 # any python
-python=`build/PrintPath python`
+python=${PYTHON-`build/PrintPath python3 python2 python`}
 if test -z "$python"; then
 echo "buildconf: python not found."
 echo "   You need python installed"
 echo "   to build Tomcat Native from SVN."
 exit 1
 else
-py_version=`python -c 'import sys; print sys.version' 2>&1|sed 's/ .*//;q'`
+py_version=`$python -c 'import sys; print sys.version' 2>&1|sed 's/ .*//;q'`
 echo "buildconf: python version $py_version (ok)"
 fi
 

Modified: tomcat/native/trunk/native/buildconf
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/buildconf?rev=1843685=1843684=1843685=diff
==
--- tomcat/native/trunk/native/buildconf (original)
+++ tomcat/native/trunk/native/buildconf Fri Oct 12 16:02:57 2018
@@ -79,8 +79,10 @@ fi
 #
 # Generate build-outputs.mk for the build systme
 #
+PYTHON=${PYTHON-`build/PrintPath python3 python2 python`}
+
 echo "Generating 'make' outputs ..."
-$apr_src_dir/build/gen-build.py make
+${PYTHON} $apr_src_dir/build/gen-build.py make
 if [ $? -gt 0 ]; then
   echo "Creating build-outputs.mk failed"
   exit 1



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1851494 - in /tomcat/trunk: java/org/apache/catalina/connector/Connector.java java/org/apache/catalina/connector/LocalStrings.properties java/org/apache/catalina/core/AprLifecycleListener

2019-01-16 Thread csutherl
Author: csutherl
Date: Thu Jan 17 02:25:03 2019
New Revision: 1851494

URL: http://svn.apache.org/viewvc?rev=1851494=rev
Log:
Log a message when using a Connector that requires Apr without enabling the 
AprLifecycleListener first

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1851494=1851493=1851494=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Thu Jan 17 
02:25:03 2019
@@ -957,8 +957,12 @@ public class Connector extends Lifecycle
 setParseBodyMethods(getParseBodyMethods());
 }
 
+if (protocolHandler.isAprRequired() && 
!AprLifecycleListener.isInstanceCreated()) {
+throw new 
LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoAprListener",
+getProtocolHandlerClassName()));
+}
 if (protocolHandler.isAprRequired() && 
!AprLifecycleListener.isAprAvailable()) {
-throw new 
LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoApr",
+throw new 
LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoAprLibrary",
 getProtocolHandlerClassName()));
 }
 if (AprLifecycleListener.isAprAvailable() && 
AprLifecycleListener.getUseOpenSSL() &&

Modified: 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1851494=1851493=1851494=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
[UTF-8] Thu Jan 17 02:25:03 2019
@@ -29,7 +29,8 @@ coyoteConnector.parseBodyMethodNoTrace=T
 coyoteConnector.protocolHandlerDestroyFailed=Protocol handler destroy failed
 coyoteConnector.protocolHandlerInitializationFailed=Protocol handler 
initialization failed
 coyoteConnector.protocolHandlerInstantiationFailed=Protocol handler 
instantiation failed
-coyoteConnector.protocolHandlerNoApr=The configured protocol [{0}] requires 
the APR/native library which is not available
+coyoteConnector.protocolHandlerNoAprListener=The configured protocol [{0}] 
requires the AprLifecycleListener which is not available
+coyoteConnector.protocolHandlerNoAprLibrary=The configured protocol [{0}] 
requires the APR/native library which is not available
 coyoteConnector.protocolHandlerPauseFailed=Protocol handler pause failed
 coyoteConnector.protocolHandlerResumeFailed=Protocol handler resume failed
 coyoteConnector.protocolHandlerStartFailed=Protocol handler start failed

Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1851494=1851493=1851494=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Thu 
Jan 17 02:25:03 2019
@@ -421,4 +421,8 @@ public class AprLifecycleListener
 return useOpenSSL;
 }
 
+public static boolean isInstanceCreated() {
+return instanceCreated;
+}
+
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1851494=1851493=1851494=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 17 02:25:03 2019
@@ -84,6 +84,10 @@
 Correct a bug exposed in 9.0.14 and ensure that the Tomcat terminates 
in
 a timely manner when running as a service. (markt)
   
+  
+Log a message when using a Connector that requires Apr without enabling
+the AprLifecycleListener first. (csutherl)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1848904 [2/3] - in /tomcat/jk/trunk/xdocs: ./ ajp/ common_howto/ images/ images/fonts/ miscellaneous/ reference/ webserver_howto/

2018-12-13 Thread csutherl
Modified: tomcat/jk/trunk/xdocs/reference/apache.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/apache.xml?rev=1848904=1848903=1848904=diff
==
--- tomcat/jk/trunk/xdocs/reference/apache.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/apache.xml Thu Dec 13 22:03:14 2018
@@ -42,10 +42,10 @@ Exceptions from this rule are again expl
 See especially JkMountCopy.
 
 
-Warning: If Apache and Tomcat are configured to serve content from
+Warning: If Apache and Tomcat are 
configured to serve content from
 the same file system location then care must be taken to ensure that Apache is
 not able to serve inappropriate content such as the contents of the WEB-INF
-directory or JSP source code.
+directory or JSP source code.
 
 
 This could occur if the Apache DocumentRoot
@@ -524,12 +524,9 @@ We'll discuss here the mod_jk directive
 JkWorkersFile specify the location where mod_jk will find the workers 
definitions.
 Take a look at Workers documentation for detailed 
description.
 
-
-  JkWorkersFile /etc/httpd/conf/workers.properties
+JkWorkersFile /etc/httpd/conf/workers.properties
 
 
-
-
 
 
 
@@ -539,8 +536,7 @@ Take a look at Wo
 JkLogFile specify the location where mod_jk is going to place its log 
file.
 
 
-
-  JkLogFile /var/log/httpd/mod_jk.log
+JkLogFile /var/log/httpd/mod_jk.log
 
 
 
@@ -548,8 +544,7 @@ Since JK 1.2.3 for Apache 2.x and JK 1.2
 be used for piped logging:
 
 
-
-  JkLogFile "|/usr/bin/rotatelogs /var/log/httpd/mod_jk.log 86400"
+JkLogFile "|/usr/bin/rotatelogs /var/log/httpd/mod_jk.log 86400"
 
 
 
@@ -575,14 +570,11 @@ set the log level between:
 
 
 
-  
-  JkLogLevelinfo
+JkLogLevelinfo
 
 
 
 info should be your default selection for normal operations.
-
-
 
 
 
@@ -590,16 +582,10 @@ set the log level between:
 See above for details.
 
 
-
-  JkLogStampFormat "[%Y-%m-%d %H:%M:%S.%Q] "
+JkLogStampFormat "[%Y-%m-%d %H:%M:%S.%Q] "
 
 
 
-
-
-
-
-
 You can log mod_jk information using the Apache standard module 
mod_log_config.
 The module sets several notes in the Apache notes table.
 Most of them are are only useful in combination with a load balancer worker.
@@ -635,14 +621,11 @@ Most of them are are only useful in comb
   Load balancer: Error 
state for the last worker tried
 
 
-
-  LogFormat "%h %l %u %t \"%r\" %>s %b %{JK_WORKER_NAME}n 
%{JK_LB_FIRST_NAME}n \
- %{JK_LB_FIRST_BUSY}n %{JK_LB_LAST_NAME}n %{JK_LB_LAST_BUSY}n" 
mod_jk_log
-  CustomLog logs/access_log mod_jk_log
+LogFormat "%h %l %u %t \"%r\" %>s %b %{JK_WORKER_NAME}n 
%{JK_LB_FIRST_NAME}n \
+   %{JK_LB_FIRST_BUSY}n %{JK_LB_LAST_NAME}n %{JK_LB_LAST_BUSY}n" 
mod_jk_log
+CustomLog logs/access_log mod_jk_log
 
 
-
-
 
 
 
@@ -673,12 +656,9 @@ here is a list of the available request
   Real worker name
 
 
-
-  JkRequestLogFormat "%w %V %T"
+JkRequestLogFormat "%w %V %T"
 
 
-
-
 
 
 
@@ -687,8 +667,6 @@ here is a list of the available request
 
 The directive JkOptions allow you to set many forwarding options which will 
enable (+)
 or disable (-) following option. Without any leading signs, options will be 
enabled.
-
-
 
 
 
@@ -700,8 +678,6 @@ It was "ForwardURICompatUnparsed" in ver
 You can turn the default off by switching on one of the other two options.
 You should leave this at it's default value, unless you have a very good
 reason to change it.
-
-
 
 
 
@@ -709,10 +685,7 @@ All options are inherited from the globa
 Options that support enabling (plus options) and disabling (minus options),
 are inherited in the following way:
 
-
 options(vhost) = plus_options(global) - minus_options(global) + 
plus_options(vhost) - minus_options(vhost)
-
-
 
 
 
@@ -721,12 +694,9 @@ will be partially reencoded after proces
 before forwarding to Tomcat. This will be compatible with local
 URL manipulation by mod_rewrite and with URL encoded session ids.
 
-
-  JkOptions +ForwardURIProxy
+JkOptions +ForwardURIProxy
 
 
-
-
 
 
 
@@ -736,12 +706,9 @@ It will always forward the original requ
 URIs with mod_rewrite and then forwarding the rewritten URI
 will not work.
 
-
-  JkOptions +ForwardURICompatUnparsed
+JkOptions +ForwardURICompatUnparsed
 
 
-
-
 
 
 
@@ -752,12 +719,9 @@ This is less spec compliant and is no
 prefix JkMount. This option will allow to rewrite URIs with
 mod_rewrite before forwarding.
 
-
-  JkOptions +ForwardURICompat
+JkOptions +ForwardURICompat
 
 
-
-
 
 
 
@@ -767,20 +731,15 @@ Explicit path components like ".." will
 This will not work in combination with URL encoded session IDs,
 but it will allow to rewrite URIs with mod_rewrite before forwarding.
 
-
-  JkOptions +ForwardURIEscaped
+JkOptions +ForwardURIEscaped
 
 
-
-
 
 
 
 JkOptions RejectUnsafeURI will block all
 URLs, which contain percent signs '%' or backslashes '\'
 after decoding.
-
-
 
 
 Most web apps do not use such 

svn commit: r1848904 [1/3] - in /tomcat/jk/trunk/xdocs: ./ ajp/ common_howto/ images/ images/fonts/ miscellaneous/ reference/ webserver_howto/

2018-12-13 Thread csutherl
Author: csutherl
Date: Thu Dec 13 22:03:14 2018
New Revision: 1848904

URL: http://svn.apache.org/viewvc?rev=1848904=rev
Log:
Use Tomcat stylesheet on the connector website to unify the web UIs of the two 
projects

Added:
tomcat/jk/trunk/xdocs/images/asf-logo.svg   (with props)
tomcat/jk/trunk/xdocs/images/cors-flowchart.png   (with props)
tomcat/jk/trunk/xdocs/images/docs-stylesheet.css
tomcat/jk/trunk/xdocs/images/fonts/
tomcat/jk/trunk/xdocs/images/fonts/OpenSans400.woff   (with props)
tomcat/jk/trunk/xdocs/images/fonts/OpenSans400italic.woff   (with props)
tomcat/jk/trunk/xdocs/images/fonts/OpenSans600.woff   (with props)
tomcat/jk/trunk/xdocs/images/fonts/OpenSans600italic.woff   (with props)
tomcat/jk/trunk/xdocs/images/fonts/OpenSans700.woff   (with props)
tomcat/jk/trunk/xdocs/images/fonts/OpenSans700italic.woff   (with props)
tomcat/jk/trunk/xdocs/images/fonts/fonts.css
tomcat/jk/trunk/xdocs/images/tomcat.png   (with props)
tomcat/jk/trunk/xdocs/tomcat-docs.xsl
Removed:
tomcat/jk/trunk/xdocs/style.css
tomcat/jk/trunk/xdocs/style.xsl
Modified:
tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml
tomcat/jk/trunk/xdocs/ajp/ajpv13ext.xml
tomcat/jk/trunk/xdocs/build.xml
tomcat/jk/trunk/xdocs/common_howto/loadbalancers.xml
tomcat/jk/trunk/xdocs/common_howto/proxy.xml
tomcat/jk/trunk/xdocs/common_howto/quick.xml
tomcat/jk/trunk/xdocs/common_howto/timeouts.xml
tomcat/jk/trunk/xdocs/common_howto/workers.xml
tomcat/jk/trunk/xdocs/index.xml
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
tomcat/jk/trunk/xdocs/miscellaneous/doccontrib.xml
tomcat/jk/trunk/xdocs/miscellaneous/faq.xml
tomcat/jk/trunk/xdocs/miscellaneous/jkstatustasks.xml
tomcat/jk/trunk/xdocs/reference/apache.xml
tomcat/jk/trunk/xdocs/reference/iis.xml
tomcat/jk/trunk/xdocs/reference/status.xml
tomcat/jk/trunk/xdocs/reference/uriworkermap.xml
tomcat/jk/trunk/xdocs/reference/workers.xml
tomcat/jk/trunk/xdocs/webserver_howto/apache.xml
tomcat/jk/trunk/xdocs/webserver_howto/iis.xml
tomcat/jk/trunk/xdocs/webserver_howto/nes.xml

Modified: tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml?rev=1848904=1848903=1848904=diff
==
--- tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml (original)
+++ tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml Thu Dec 13 22:03:14 2018
@@ -348,8 +348,7 @@ Each of the above messages has a differe
 
 For messages from the server to the container of type "Forward Request":
 
-
-AJP13_FORWARD_REQUEST :=
+AJP13_FORWARD_REQUEST :=
 prefix_code  (byte) 0x02 = JK_AJP13_FORWARD_REQUEST
 method   (byte)
 protocol (string)
@@ -367,8 +366,7 @@ AJP13_FORWARD_REQUEST :=
 
 The request_headers have the following structure:
 
-
-req_header_name := 
+req_header_name := 
 sc_req_header_name | (string)  [see below for how this is parsed]
 
 sc_req_header_name := 0xA0xx (integer)
@@ -379,11 +377,9 @@ req_header_value := (string)
 
 The attributes are optional and have the following structure:
 
-
-attribute_name := sc_a_name | (sc_a_req_attribute string)
+attribute_name := sc_a_name | (sc_a_req_attribute string)
 
 attribute_value := (string)
-
 
 
 Not that the all-important header is "content-length', because it
@@ -573,8 +569,7 @@ additional methods, even if they are not
 
 For messages which the container can send back to the server.
 
-
-AJP13_SEND_BODY_CHUNK := 
+AJP13_SEND_BODY_CHUNK := 
   prefix_code   3
   chunk_length  (integer)
   chunk*(byte)

Modified: tomcat/jk/trunk/xdocs/ajp/ajpv13ext.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/ajp/ajpv13ext.xml?rev=1848904=1848903=1848904=diff
==
--- tomcat/jk/trunk/xdocs/ajp/ajpv13ext.xml (original)
+++ tomcat/jk/trunk/xdocs/ajp/ajpv13ext.xml Thu Dec 13 22:03:14 2018
@@ -183,8 +183,7 @@ crypto used, and misc datas (timeout...)
 
 
 
-
-++--+-+
+++--+-+
 | LOGIN INIT CMD | NEGOCIATION DATA | WEB SERVER INFO |
 ++--+-+
 
@@ -222,8 +221,7 @@ WEB SERVER INFO, SERVLET ENGINE INFO are
 
 The secret key will be set by a new property in
 workers.properties: secretkey
-
-worker.ajp13.port=8009
+worker.ajp13.port=8009
 worker.ajp13.host=localhost
 worker.ajp13.type=ajp13
 worker.ajp13.secretkey=myverysecretkey
@@ -235,8 +233,7 @@ worker.ajp13.secretkey=myverysecretkey
 
 AJP13 miss a functionality of AJP12, which is shutdown command.
 A logout will tell servlet engine to shutdown itself.
-
-+--++
++--++
 | SHUTDOWN CMD | MD5 of RAND

svn commit: r1848904 [3/3] - in /tomcat/jk/trunk/xdocs: ./ ajp/ common_howto/ images/ images/fonts/ miscellaneous/ reference/ webserver_howto/

2018-12-13 Thread csutherl
Modified: tomcat/jk/trunk/xdocs/webserver_howto/nes.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/nes.xml?rev=1848904=1848903=1848904=diff
==
--- tomcat/jk/trunk/xdocs/webserver_howto/nes.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/nes.xml Thu Dec 13 22:03:14 2018
@@ -192,32 +192,27 @@ Edit your server magnus.conf and
 
 
 
-
-  
-  Init fn="load-modules" funcs="jk_init,jk_service" 
shlib="c:/jk/lib/nsapi_redirect.dll" shlib_flags="(global|now)"
-  Init fn="jk_init" worker_file="c:/jk/conf/workers.properties" 
log_level="debug" log_file="c:/jk/logs/nsapi.log" shm_file="c:/jk/logs/jk_shm"
+Init fn="load-modules" funcs="jk_init,jk_service" 
shlib="c:/jk/lib/nsapi_redirect.dll" shlib_flags="(global|now)"
+Init fn="jk_init" worker_file="c:/jk/conf/workers.properties" 
log_level="debug" log_file="c:/jk/logs/nsapi.log" shm_file="c:/jk/logs/jk_shm"
 
 
 
 Edit your server obj.conf and add the following lines:
 
 
-
-
-  
-  In the default object NameTrans section
-  Object name="default"
-  
-  NameTrans fn="assign-name" from="/examples(|/*)" name="jknsapi" 
-  
-  /Object
-  
-  Create a new configuration object by adding the following lines to the end 
of the obj.conf file
-  
-  Object name="jknsapi"
-  ObjectType fn=force-type type=text/plain
-  Service fn="jk_service" method="*" worker="worker1"
-  /Object
+In the default object NameTrans section
+Object name="default"
+
+NameTrans fn="assign-name" from="/examples(|/*)" name="jknsapi" 
+
+/Object
+  
+Create a new configuration object by adding the following lines to the end of 
the obj.conf file
+  
+Object name="jknsapi"
+ObjectType fn=force-type type=text/plain
+Service fn="jk_service" method="*" worker="worker1"
+/Object
 
 
 
@@ -226,15 +221,14 @@ Edit your worker definition file work
 
 
 
-
-  #An entry that lists all the workers defined. For example:
-  worker.list=worker1
-  
-  # Entries that define the host and port associated with these workers.
-  worker.worker1.host=localhost
-  worker.worker1.port=8009
-  worker.worker1.type=ajp13
-  worker.worker1.connection_pool_size=50
+#An entry that lists all the workers defined. For example:
+worker.list=worker1
+  
+# Entries that define the host and port associated with these workers.
+worker.worker1.host=localhost
+worker.worker1.port=8009
+worker.worker1.type=ajp13
+worker.worker1.connection_pool_size=50
 
 
 
@@ -271,8 +265,7 @@ Assigning the NSAPI redirector to handle
 all you need to do is to edit obj.conf and add a NameTrans line that 
looks like:
 
 
-
-  NameTrans fn="assign-name" from="/context_name/*" name="jknsapi"
+NameTrans fn="assign-name" from="/context_name/*" 
name="jknsapi"
 
 
 
@@ -314,8 +307,7 @@ covers the c:\tomcat\webapps\examples
 To add a new virtual directory add the following line to your obj.conf:
 
 
-
-  NameTrans fn=pfx2dir from=/examples dir="c:/tomcat/webapps/examples"
+NameTrans fn=pfx2dir from=/examples dir="c:/tomcat/webapps/examples"
 
 
 
@@ -325,9 +317,8 @@ A second directory that should be protec
 Those directories can be protected by adding the following line to the 
PathCheck section in the default configuration object:
 
 
-
-  PathCheck fn="deny-existence" path="*/WEB-INF/*"
-  PathCheck fn="deny-existence" path="*/META-INF/*"
+PathCheck fn="deny-existence" path="*/WEB-INF/*"
+PathCheck fn="deny-existence" path="*/META-INF/*"
 
 
 These lines instruct the web server to reject any request with a URL that 
contains the path /WEB-INF/
@@ -343,15 +334,14 @@ you will need to specify the exact URL-P
 This requires a change to NameTrans portion of obj.conf. 
 
 
-
-  For the examples context it requires to replace the following line:
+For the examples context it requires to replace the following line:
   
-  NameTrans fn="assign-name" from="/examples/*" name="jknsapi"
+NameTrans fn="assign-name" from="/examples/*" name="jknsapi"
   
-  with the following two lines:
+with the following two lines:
   
-  NameTrans fn="assign-name" from="/examples/jsp/*.jsp" name="jknsapi"
-  NameTrans fn="assign-name" from="/examples/servlet/*" name="jknsapi"
+NameTrans fn="assign-name" from="/examples/jsp/*.jsp" name="jknsapi"
+NameTrans fn="assign-name" from="/examples/servlet/*" name="jknsapi"
 
 
 
@@ -364,10 +354,9 @@ the web server to assign the redirector
 You can be even more explicit and provide lines such as:
 
 
-
-  NameTrans fn="assign-name" from="/examples/servlets/chat" name="jknsapi"
+NameTrans fn="assign-name" from="/examples/servlets/chat" 
name="jknsapi"
   
-  Instructs the web server to assign the redirector requests whose URL path 
equals /example/servlets/chat
+Instructs the web server to assign the redirector requests whose URL path 
equals /example/servlets/chat
 
 
 
@@ -383,18 +372,17 @@ To achieve such goal you will need to de
 Defining workers is done in workers.properties, this file includes two 
types of entries:
 
 
-

svn commit: r1849118 [8/9] - in /tomcat/site/trunk/docs/connectors-doc: ./ ajp/ ajp/printer/ common_howto/ common_howto/printer/ miscellaneous/ miscellaneous/printer/ news/ news/printer/ printer/ refe

2018-12-17 Thread csutherl
Modified: tomcat/site/trunk/docs/connectors-doc/reference/printer/status.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/reference/printer/status.html?rev=1849118=1849117=1849118=diff
==
--- tomcat/site/trunk/docs/connectors-doc/reference/printer/status.html 
(original)
+++ tomcat/site/trunk/docs/connectors-doc/reference/printer/status.html Mon Dec 
17 17:40:26 2018
@@ -1,5 +1,5 @@
 
-The Apache Tomcat Connectors: mod_jk, ISAPI redirector, 
NSAPI redirector (1.2.x) - Status Worker Reference
+The Apache Tomcat Connectors - Reference Guide (1.2.x) - 
Status Worker Reference