svn commit: r1845770 - in /tomcat/trunk: conf/logging.properties webapps/docs/changelog.xml webapps/docs/config/filter.xml webapps/docs/logging.xml

2018-11-05 Thread markt
Author: markt
Date: Mon Nov  5 10:46:26 2018
New Revision: 1845770

URL: http://svn.apache.org/viewvc?rev=1845770&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62788
Add explicit logging configuration to write log files using UTF-8 to align with 
Tomcat's use of UTF-8 by default elsewhere.

Modified:
tomcat/trunk/conf/logging.properties
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/filter.xml
tomcat/trunk/webapps/docs/logging.xml

Modified: tomcat/trunk/conf/logging.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/logging.properties?rev=1845770&r1=1845769&r2=1845770&view=diff
==
--- tomcat/trunk/conf/logging.properties (original)
+++ tomcat/trunk/conf/logging.properties Mon Nov  5 10:46:26 2018
@@ -26,24 +26,29 @@ handlers = 1catalina.org.apache.juli.Asy
 1catalina.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
 1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.
 1catalina.org.apache.juli.AsyncFileHandler.maxDays = 90
+1catalina.org.apache.juli.AsyncFileHandler.encoding = UTF-8
 
 2localhost.org.apache.juli.AsyncFileHandler.level = FINE
 2localhost.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
 2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.
 2localhost.org.apache.juli.AsyncFileHandler.maxDays = 90
+2localhost.org.apache.juli.AsyncFileHandler.encoding = UTF-8
 
 3manager.org.apache.juli.AsyncFileHandler.level = FINE
 3manager.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs
 3manager.org.apache.juli.AsyncFileHandler.prefix = manager.
 3manager.org.apache.juli.AsyncFileHandler.maxDays = 90
+3manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
 
 4host-manager.org.apache.juli.AsyncFileHandler.level = FINE
 4host-manager.org.apache.juli.AsyncFileHandler.directory = 
${catalina.base}/logs
 4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager.
 4host-manager.org.apache.juli.AsyncFileHandler.maxDays = 90
+4host-manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
 
 java.util.logging.ConsoleHandler.level = FINE
 java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
+java.util.logging.ConsoleHandler.encoding = UTF-8
 
 
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1845770&r1=1845769&r2=1845770&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov  5 10:46:26 2018
@@ -45,6 +45,15 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+62788: Add explicit logging configuration to write log files
+using UTF-8 to align with Tomcat's use of UTF-8 by default
+elsewhere. (markt)
+  
+
+  
 
 
   

Modified: tomcat/trunk/webapps/docs/config/filter.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=1845770&r1=1845769&r2=1845770&view=diff
==
--- tomcat/trunk/webapps/docs/config/filter.xml (original)
+++ tomcat/trunk/webapps/docs/config/filter.xml Mon Nov  5 10:46:26 2018
@@ -1696,6 +1696,7 @@ FINE: Request "/docs/config/manager.html
 1request-dumper.org.apache.juli.FileHandler.level = INFO
 1request-dumper.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
 1request-dumper.org.apache.juli.FileHandler.prefix = request-dumper.
+1request-dumper.org.apache.juli.FileHandler.encoding = UTF-8
 1request-dumper.org.apache.juli.FileHandler.formatter = 
org.apache.juli.VerbatimFormatter
 org.apache.catalina.filters.RequestDumperFilter.level = INFO
 org.apache.catalina.filters.RequestDumperFilter.handlers = \

Modified: tomcat/trunk/webapps/docs/logging.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/logging.xml?rev=1845770&r1=1845769&r2=1845770&view=diff
==
--- tomcat/trunk/webapps/docs/logging.xml (original)
+++ tomcat/trunk/webapps/docs/logging.xml Mon Nov  5 10:46:26 2018
@@ -335,19 +335,25 @@ java.util.logging.ConsoleHandler.level=A
 1catalina.org.apache.juli.FileHandler.level = FINE
 1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
 1catalina.org.apache.juli.FileHandler.prefix = catalina.
+1catalina.org.apache.juli.FileHandler.maxDays = 90
+1catalina.org.apache.juli.FileHandler.encoding = UTF-8
 
 2localhost.org.apache.juli.FileHandler.level = FINE
 2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
 2localhost.org.apache.juli.FileHandler.prefix = localhost.
+2localhost.org.apache.juli.FileHandler.maxDays = 90
+2localhost.org.apache.juli.FileHandler.encoding = 

svn commit: r1845771 - in /tomcat/tc8.5.x/trunk: ./ conf/logging.properties webapps/docs/changelog.xml webapps/docs/config/filter.xml webapps/docs/logging.xml

2018-11-05 Thread markt
Author: markt
Date: Mon Nov  5 10:48:24 2018
New Revision: 1845771

URL: http://svn.apache.org/viewvc?rev=1845771&view=rev
Log:
Add explicit logging configuration to write log files using UTF-8 to align with 
Tomcat's use of UTF-8 by default elsewhere.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/conf/logging.properties
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/filter.xml
tomcat/tc8.5.x/trunk/webapps/docs/logging.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  5 10:48:24 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,

svn commit: r1845772 - in /tomcat/tc7.0.x/trunk: ./ conf/logging.properties webapps/docs/changelog.xml webapps/docs/config/filter.xml webapps/docs/logging.xml

2018-11-05 Thread markt
Author: markt
Date: Mon Nov  5 10:50:02 2018
New Revision: 1845772

URL: http://svn.apache.org/viewvc?rev=1845772&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62788
Add explicit logging configuration to write log files using UTF-8 to align with 
Tomcat's use of UTF-8 by default elsewhere.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/conf/logging.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml
tomcat/tc7.0.x/trunk/webapps/docs/logging.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  5 10:50:02 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-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,18149

[Bug 62788] Add explicit ".encoding=UTF-8" to FileHandler configurations in logging.properties

2018-11-05 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62788

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #2 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.14 onwards
- 8.5.x for 8.5.36 onwards
- 7.0.x for 7.0.92 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



buildbot failure in on tomcat-trunk

2018-11-05 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building 
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/3706

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1845770
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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



Tomcat 7.0.91 : Issue with Kerberos Authentication

2018-11-05 Thread Vipul Mehta
We have upgraded from tomcat version 7.0.84 to 7.0.91.
Users authenticate with our web app service using Kerberos logged in user
credential. After upgrade, login started to fail.

It was because of this change due to which the modified method started
returning null:

https://github.com/apache/tomcat70/commit/7b7b5932b6618d13042732c77a4e19ea89b432e3#diff-6fec32edbbb606fe1d1888c99d74e665


User principal was KerberosPrincipal and the class was not specified in
userClassNames in JAAS config of web application for tomcat. So, I added
'KerberosPrincipal' class in JAAS configuration.

=>
"org.apache.catalina.realm.GenericPrincipal,javax.security.auth.kerberos.KerberosPrincipal"


Now we are facing new issue. The principal being returned by
JAASRealm->createPrincipal() is KerberosPrincipal and not
GenericUserPrincipal which breaks our code.

KerberosPrincipal does not have delegated credential.


On debugging i found that, in JAASRealm->authenticate() method,
loginContext.getSubject() returns server's subject and not client's. So,
later in createPrincipal() call username is client's username but subject
belongs to server. Is this an issue ?


-- 
Regards,
Vipul


svn commit: r1845799 - in /tomcat/trunk: java/org/apache/catalina/servlets/DefaultServlet.java webapps/docs/changelog.xml

2018-11-05 Thread remm
Author: remm
Date: Mon Nov  5 14:14:41 2018
New Revision: 1845799

URL: http://svn.apache.org/viewvc?rev=1845799&view=rev
Log:
As reported by Konstantin, it could be beneficial in some cases that the 
default servlet does not override the content type.

Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1845799&r1=1845798&r2=1845799&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Mon Nov  
5 14:14:41 2018
@@ -994,7 +994,10 @@ public class DefaultServlet extends Http
 if (debug > 0)
 log("DefaultServlet.serveFile:  contentType='" +
 contentType + "'");
-response.setContentType(contentType);
+// Don't override a previously set content type
+if (response.getContentType() == null) {
+response.setContentType(contentType);
+}
 }
 if (resource.isFile() && contentLength >= 0 &&
 (!serveContent || ostream != null)) {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1845799&r1=1845798&r2=1845799&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov  5 14:14:41 2018
@@ -52,6 +52,10 @@
 using UTF-8 to align with Tomcat's use of UTF-8 by default
 elsewhere. (markt)
   
+  
+The default Servlet should not override a previously set content-type.
+(remm)
+  
 
   
 



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



svn commit: r1845800 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/servlets/DefaultServlet.java webapps/docs/changelog.xml

2018-11-05 Thread remm
Author: remm
Date: Mon Nov  5 14:17:56 2018
New Revision: 1845800

URL: http://svn.apache.org/viewvc?rev=1845800&view=rev
Log:
Default servlet will no longer override content-type

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  5 14:17:56 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-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,17635

Re: svn commit: r1845800 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/servlets/DefaultServlet.java webapps/docs/changelog.xml

2018-11-05 Thread Rémy Maucherat
On Mon, Nov 5, 2018 at 3:17 PM  wrote:

> Author: remm
> Date: Mon Nov  5 14:17:56 2018
> New Revision: 1845800
>
> URL: http://svn.apache.org/viewvc?rev=1845800&view=rev
> Log:
> Default servlet will no longer override content-type
>

And I won't backport it to 7.0 since the behavior might well be used ...
Who knows.

Rémy

>
> Modified:
> tomcat/tc8.5.x/trunk/   (props changed)
>
> tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
> tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
>
> Propchange: tomcat/tc8.5.x/trunk/
>
> --
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Mon Nov  5 14:17:56 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,

Re: [VOTE] Release Apache Tomcat 9.0.13

2018-11-05 Thread Coty Sutherland
On Fri, Nov 2, 2018 at 12:11 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 9.0.13 release is now available for voting.
>
> The major changes compared to the 9.0.13 release are:
>
> - support for TLSv1.3 when used with a JRE or OPenSSl version that
>   supports it
>
> - added support for encrypting cluster traffic
>
> - added automatic reloading of tomcat-users.xml after a change
>
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.13/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1196/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_13/
>
> The proposed 9.0.13 release is:
> [ ] Broken - do not release
> [x] Stable - go ahead and release as 9.0.13
>

+1


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


buildbot success in on tomcat-trunk

2018-11-05 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/3707

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1845799
Blamelist: remm

Build succeeded!

Sincerely,
 -The Buildbot




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



[GitHub] tomcat pull request #131: qqq

2018-11-05 Thread xkljh
GitHub user xkljh opened a pull request:

https://github.com/apache/tomcat/pull/131

qqq

qqq

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/xkljh/tomcat trunk

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/tomcat/pull/131.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #131


commit 3499b30e9cf84def6a12456496eeb6ec5ce07f9e
Author: xkljh <44626731+xkljh@...>
Date:   2018-11-05T14:46:04Z

Update README.md

commit 1551654a1c739abb5a39e8fa4a6b40cd93978f9d
Author: xkljh <44626731+xkljh@...>
Date:   2018-11-05T14:47:52Z

fff

f f f




---

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



[GitHub] tomcat issue #131: qqq

2018-11-05 Thread markt-asf
Github user markt-asf commented on the issue:

https://github.com/apache/tomcat/pull/131
  
Spam. Reported to GitHub's abuse team.


---

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



[GitHub] tomcat pull request #131: qqq

2018-11-05 Thread markt-asf
Github user markt-asf closed the pull request at:

https://github.com/apache/tomcat/pull/131


---

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



Re: [GitHub] tomcat issue #131: qqq

2018-11-05 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 11/5/18 09:59, markt-asf wrote:
> Github user markt-asf commented on the issue:
> 
> https://github.com/apache/tomcat/pull/131
> 
> Spam. Reported to GitHub's abuse team.

I went in to see if I could kill it myself. My GitHub id is
ChristopherSchultz. Should I (and anyone else) be added to admins of
the /apache/tomcat repo to remove junk like this?

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlvgW3AACgkQHPApP6U8
pFi/yQ//XoJfSAaXVASLBKLtBogcdXC+jbnWHYveHL/wvpYYyjyiPFSi8X2XeJS9
jEbTnqqwq7h3XM5xEXrB4zANtVEszpwcSSubYVk6gJS4B2d4IqwE9WkCTawL+s/F
ZEWV8x7E9vxd6d4bDoPDoAbbvUVXVRTPbG5uEGriZ7lB5f0pnZylq5un1bW8X77j
p1bv10dvhkck+7fJnNE0iLccfWc5dKPyUkVcMMlRhWYfuj1FivSTopAjUbcko5d+
sHdlTigcRmxDB/wrGf7RS+p9HsPg2WiBRYyLWcmL8q6CoDQ4vLhpd/aMH8x3UHVa
hoU959cQOcF6jQ/m3yszl3FtGWM6pN9TmBZ8TzshKoBd4b8pFRt4l7a4DA+0TcEA
YP/8RrRcPrMgmlmFlaUOg4GeC0UV9C5m/rMkvfAzzZrQ8qUEnKUNu7+SnxLWaNP6
6iNQuXEqaU2e3MpBkODjyIfpIAy7t/PltZyf4MarcGmpE/N4WBpV+LR1XSEyvgzx
sS0lLLbqEMGEyAXzZMdclwGmNiyWNSaMGI/qaDWRUh1B6yI6gYkIeQA7rBuMZNH7
53zdSg/HU3LdnxdPC08PPRAm5bkLROKzzxh/a5Wgk2oylNoQODX1x4bnW95RNrTs
i6lPGHFUG0h+XmWjQ2KhWy5up6bwtPVcr/qUTAHHcLJfnmZ/usw=
=BF46
-END PGP SIGNATURE-

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



svn commit: r1845813 - in /tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud: AbstractStreamProvider.java CertificateStreamProvider.java LocalStrings.properties TokenStreamProvider.java

2018-11-05 Thread remm
Author: remm
Date: Mon Nov  5 15:38:53 2018
New Revision: 1845813

URL: http://svn.apache.org/viewvc?rev=1845813&view=rev
Log:
Reduce code duplication.

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/TokenStreamProvider.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java?rev=1845813&r1=1845812&r2=1845813&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
 Mon Nov  5 15:38:53 2018
@@ -17,17 +17,23 @@
 
 package org.apache.catalina.tribes.membership.cloud;
 
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
+import java.security.KeyStore;
 import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.Map;
 
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
 import org.apache.catalina.tribes.membership.Constants;
@@ -104,4 +110,32 @@ public abstract class AbstractStreamProv
 return connection.getInputStream();
 }
 
+protected static TrustManager[] configureCaCert(String caCertFile) throws 
Exception {
+if (caCertFile != null) {
+try (InputStream pemInputStream = new BufferedInputStream(new 
FileInputStream(caCertFile))) {
+CertificateFactory certFactory = 
CertificateFactory.getInstance("X509");
+X509Certificate cert = 
(X509Certificate)certFactory.generateCertificate(pemInputStream);
+
+KeyStore trustStore = KeyStore.getInstance("JKS");
+trustStore.load(null);
+
+String alias = cert.getSubjectX500Principal().getName();
+trustStore.setCertificateEntry(alias, cert);
+
+TrustManagerFactory trustManagerFactory = 
TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+trustManagerFactory.init(trustStore);
+
+return trustManagerFactory.getTrustManagers();
+} catch (FileNotFoundException fnfe) {
+log.error(sm.getString("abstractStream.fileNotFound", 
caCertFile));
+throw fnfe;
+} catch (Exception e) {
+log.error(sm.getString("abstractStream.trustManagerError", 
caCertFile));
+throw e;
+}
+} else {
+log.warn(sm.getString("abstractStream.CACertUndefined"));
+return InsecureStreamProvider.INSECURE_TRUST_MANAGERS;
+}
+}
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java?rev=1845813&r1=1845812&r2=1845813&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java
 Mon Nov  5 15:38:53 2018
@@ -31,7 +31,6 @@ import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -76,35 +75,9 @@ public class CertificateStreamProvider e
 
 return keyManagerFactory.getKeyManagers();
 } catch (IOException e) {
-log.error(sm.getString("certificateStream.clientCertError", 
clientCertFile, clientKeyFile), e);
+log.error(sm.getString("certificateStream.clientCertError", 
clientCertFile, clientKeyFile));
 throw e;
 }
 }
 
-private static TrustManager[] configureCaCert(String caCertFile) throws 
Exception {
-if (caCertFile != null) {
-try (InputStream pemInputStream = new FileInputStream(caCertFile)) 
{
-CertificateFactory certFactory = 
C

[Tomcat Wiki] Update of "Building Tomcat on MacOS" by ChristopherSchultz

2018-11-05 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "Building Tomcat on MacOS" page has been changed by ChristopherSchultz:
https://wiki.apache.org/tomcat/Building%20Tomcat%20on%20MacOS

New page:
Building Tomcat from source on MacOS can require some additional work, 
especially if you want to build all of the optional items such as libtcnative.

== Building Tomcat==
Building Tomcat itself is fairly straightforward. Simply download the source 
distribution of Tomcat and follow the indtructions in the BUILDING.txt file 
bundled with the distribution.

Briefly, you'll need:

 1. The Tomcat source tarball (the ZIP file is fine, but we're on UNIX, so the 
tarball is more natural)
 1. A Java Development Kit, available from [[https://jdk.java.net/|Java.net]]
 1. Apache ant, available from the 
[[https://ant.apache.org/bindownload.cgi|Apache ant downloads]] page

Once you have all that,

 {{{ant deploy}}}

You may have to set your {{{JAVA_HOME}}} environment variable and/or specify 
the full path to your {{{ant}}} binary.

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



Re: [GitHub] tomcat issue #131: qqq

2018-11-05 Thread Mark Thomas
On November 5, 2018 3:02:09 PM UTC, Christopher Schultz 
 wrote:
>-BEGIN PGP SIGNED MESSAGE-
>Hash: SHA256
>
>Mark,
>
>On 11/5/18 09:59, markt-asf wrote:
>> Github user markt-asf commented on the issue:
>> 
>> https://github.com/apache/tomcat/pull/131
>> 
>> Spam. Reported to GitHub's abuse team.
>
>I went in to see if I could kill it myself. My GitHub id is
>ChristopherSchultz. Should I (and anyone else) be added to admins of
>the /apache/tomcat repo to remove junk like this?

Github privs are not, to my knowledge, sufficiently granular to do that. I can 
do it as an org admin but membership of that group is limited to the infra team.

The normal solution would be to close it with a dummy commit or to raise an 
infra ticket.

Not ideal but one of a number of areas we hope to address as github improves 
the granularity of its access controls.

Mark


>
>- -chris
>-BEGIN PGP SIGNATURE-
>Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
>iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlvgW3AACgkQHPApP6U8
>pFi/yQ//XoJfSAaXVASLBKLtBogcdXC+jbnWHYveHL/wvpYYyjyiPFSi8X2XeJS9
>jEbTnqqwq7h3XM5xEXrB4zANtVEszpwcSSubYVk6gJS4B2d4IqwE9WkCTawL+s/F
>ZEWV8x7E9vxd6d4bDoPDoAbbvUVXVRTPbG5uEGriZ7lB5f0pnZylq5un1bW8X77j
>p1bv10dvhkck+7fJnNE0iLccfWc5dKPyUkVcMMlRhWYfuj1FivSTopAjUbcko5d+
>sHdlTigcRmxDB/wrGf7RS+p9HsPg2WiBRYyLWcmL8q6CoDQ4vLhpd/aMH8x3UHVa
>hoU959cQOcF6jQ/m3yszl3FtGWM6pN9TmBZ8TzshKoBd4b8pFRt4l7a4DA+0TcEA
>YP/8RrRcPrMgmlmFlaUOg4GeC0UV9C5m/rMkvfAzzZrQ8qUEnKUNu7+SnxLWaNP6
>6iNQuXEqaU2e3MpBkODjyIfpIAy7t/PltZyf4MarcGmpE/N4WBpV+LR1XSEyvgzx
>sS0lLLbqEMGEyAXzZMdclwGmNiyWNSaMGI/qaDWRUh1B6yI6gYkIeQA7rBuMZNH7
>53zdSg/HU3LdnxdPC08PPRAm5bkLROKzzxh/a5Wgk2oylNoQODX1x4bnW95RNrTs
>i6lPGHFUG0h+XmWjQ2KhWy5up6bwtPVcr/qUTAHHcLJfnmZ/usw=
>=BF46
>-END PGP SIGNATURE-
>
>-
>To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>For additional commands, e-mail: dev-h...@tomcat.apache.org


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



[Tomcat Wiki] Update of "Building Tomcat on MacOS" by ChristopherSchultz

2018-11-05 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "Building Tomcat on MacOS" page has been changed by ChristopherSchultz:
https://wiki.apache.org/tomcat/Building%20Tomcat%20on%20MacOS?action=diff&rev1=1&rev2=2

- Building Tomcat from source on MacOS can require some additional work, 
especially if you want to build all of the optional items such as libtcnative.
+ Building Tomcat from source on MacOS can require some additional work, 
especially if you want to build all of the optional items such as 
{{{libtcnative}}}.
  
  == Building Tomcat==
+ 
  Building Tomcat itself is fairly straightforward. Simply download the source 
distribution of Tomcat and follow the indtructions in the BUILDING.txt file 
bundled with the distribution.
  
  Briefly, you'll need:
@@ -17, +18 @@

  
  You may have to set your {{{JAVA_HOME}}} environment variable and/or specify 
the full path to your {{{ant}}} binary.
  
+ == Building {{{libtcnative}}} ==
+ 
+ Building {{{libtcnative}}} it fairly straightforward as well, but you will 
need a number of prerequisites that are not terribly obvious as to how to get 
them.
+ 
+  1. Xcode command-line tools, available from 
[[https://developer.apple.com/download/more/|Apple's developer tools download 
site]]. Make sure you get the proper version for your XCode version (if you 
have XCode already installed) and your OS version (10.x)
+  1. Apache Portal Runtime (APR), available either directly from Apache 
([[https://apr.apache.org/download.cgi|APR downloads]]) or by using 
[[brew|https://brew.sh/]] ({{{brew install apr}}})
+  1. (Optional) OpenSSL 1.1.1 (latest at the time of this writing), available 
either directly from OpenSSL ([[|OpenSSL Downloads]]) or by using [[brew|]] 
({{{brew install openssl1
+ 
+ === Using OpenSSL ===
+ If using OpenSSL:
+ 
+   {{{./configure --with-ssl=[path to OpenSSL] --with-apr=[path to APR] 
--with-java-home=[your java home]}}}
+ 
+ For example:
+ 
+   {{{./configure --with-ssl=/usr/local/Cellar/openssl\@1.1/1.1.1 
--with-apr=/usr/local/Cellar/apr/1.6.5 
--with-java-home=/Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home}}}
+ 
+ === Without OpenSSL (LibreSSL) ===
+ 
+ If not using OpenSSL:
+ 
+   {{{./configure --with-ssl=yes --with-apr=[path to APR] 
--with-java-home=[your java home]}}}
+ 
+   {{{./configure --with-ssl=yes --with-apr=/usr/local/Cellar/apr/1.6.5 
--with-java-home=/Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home}}}
+ 

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



[Tomcat Wiki] Update of "Building Tomcat on MacOS" by ChristopherSchultz

2018-11-05 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "Building Tomcat on MacOS" page has been changed by ChristopherSchultz:
https://wiki.apache.org/tomcat/Building%20Tomcat%20on%20MacOS?action=diff&rev1=2&rev2=3

  
  You may have to set your {{{JAVA_HOME}}} environment variable and/or specify 
the full path to your {{{ant}}} binary.
  
- == Building {{{libtcnative}}} ==
+ == Building libtcnative ==
  
  Building {{{libtcnative}}} it fairly straightforward as well, but you will 
need a number of prerequisites that are not terribly obvious as to how to get 
them.
  
@@ -26, +26 @@

   1. Apache Portal Runtime (APR), available either directly from Apache 
([[https://apr.apache.org/download.cgi|APR downloads]]) or by using 
[[brew|https://brew.sh/]] ({{{brew install apr}}})
   1. (Optional) OpenSSL 1.1.1 (latest at the time of this writing), available 
either directly from OpenSSL ([[|OpenSSL Downloads]]) or by using [[brew|]] 
({{{brew install openssl1
  
+ Download and unpack the libtcnative sources:
+ 
+  {{{$ tar xzf tomcat-native-x.y.x.tar.gz}}}
+  {{{$ cd tomcat-native-x.y.z/native}}}
+ 
  === Using OpenSSL ===
  If using OpenSSL:
  
-   {{{./configure --with-ssl=[path to OpenSSL] --with-apr=[path to APR] 
--with-java-home=[your java home]}}}
+   {{{$ ./configure --with-ssl=[path to OpenSSL] --with-apr=[path to APR] 
--with-java-home=[your java home]}}}
  
  For example:
  
-   {{{./configure --with-ssl=/usr/local/Cellar/openssl\@1.1/1.1.1 
--with-apr=/usr/local/Cellar/apr/1.6.5 
--with-java-home=/Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home}}}
+   {{{$ ./configure --with-ssl=/usr/local/Cellar/openssl\@1.1/1.1.1 
--with-apr=/usr/local/Cellar/apr/1.6.5 
--with-java-home=/Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home}}}
  
  === Without OpenSSL (LibreSSL) ===
  
@@ -43, +48 @@

  
{{{./configure --with-ssl=yes --with-apr=/usr/local/Cellar/apr/1.6.5 
--with-java-home=/Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home}}}
  
+ 
+ In either case (OpenSSL or not), proceed with the build process:
+ 
+  {{{make}}}
+ 
+ Once this process has completed, your built libraries can be found in 
{{{.libs/}}}.
+ 
+ == Installing libtcnative ==
+ 
+ While you can set {{{ld.library.path}}} to include libraries from all over 
the place, I recommend that you copy everything into one place so you can 
easily find everything and it won't interfere with anything else on your system.
+ 
+ First, copy the {{{libtcnative}}} binaries from where they were built:
+  {{{ $ cp -aR tomcat-native-x.y.z/native/.libs/* 
apache-tomcat-x.y.z-src/output/build/bin/}}}
+ 
+ Next, copy the APR libraries:
+ 
+  {{{ $ cp -a$ $APR_HOME/libexec/lib/* 
apache-tomcat-x.y.z-src/output/build/bin/}}}
+ 
+ Finally, if you are using a custom OpenSSL build, copy those libraries as 
well:
+ 
+  {{{ $ cp -a$ $OPENSSL_HOME/lib/* apache-tomcat-x.y.z-src/output/build/bin/}}}
+ 
+ == Running Tomcat with libtcnative ==
+ 

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



[Tomcat Wiki] Update of "Building Tomcat on MacOS" by ChristopherSchultz

2018-11-05 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "Building Tomcat on MacOS" page has been changed by ChristopherSchultz:
https://wiki.apache.org/tomcat/Building%20Tomcat%20on%20MacOS?action=diff&rev1=3&rev2=4

  
  == Running Tomcat with libtcnative ==
  
+ Tomcat (really Java) needs to know where to find these native libraries. We 
do that by setting the {{{java.library.path}}} environment variable for the JVM 
during startup. The easiest way to do this is by setting {{{CATALINA_OPTS}}} on 
startup. This can be done by adding this line to {{{bin/setenv.sh}}}:
+ 
+  {{{export CATALINA_OPTS="-Djava.library.path=$CATALINA_HOME/bin"}}}
+ 
+ Then you can startup Tomcat as usual, either:
+ 
+  {{{$ bin/startup.sh }}}
+ 
+ or
+ 
+  {{{$ bin/catalina.sh start }}}
+ 

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



Re: [VOTE] Release Apache Tomcat 8.5.35

2018-11-05 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 11/3/18 13:55, Mark Thomas wrote:
> The proposed Apache Tomcat 8.5.35 release is now available for
> voting.
> 
> The major changes compared to the 8.5.34 release are:
> 
> - support for TLSv1.3 when used with a JRE or OpenSSl version that 
> supports it
> 
> - multiple improvements to the RewriteValve
> 
> - correct several regressions in the JSP compiler
> 
> 
> Along with lots of other bug fixes and improvements.
> 
> It can be obtained from: 
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.35/ The
> Maven staging repo is: 
> https://repository.apache.org/content/repositories/orgapachetomcat-119
7/
>
> 
The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_35/
> 
> The proposed 8.5.35 release is: [ ] Broken - do not release [X]
> Stable - go ahead and release as 8.5.35

Looks good. Runs without any problems on local development
applications on Debian Linux.

Several false-positive test-failures (tribes, openssl) that are known
to fail in my environment. Details below.

I also ran against OpenSSL 1.1.1 on MacOS Mojave and I got a few
failures in the TLS/cipher suite tests.

TestCipher has a problem with missing IBM cipher suites, but also some
suites seem to be unavailable when they are expected to be there.

TestOpenSSLCipherConfigurationParser fails for similar reasons.

I think there might be some confusion between the OpenSSL and LibreSSL
(installed system-wide) libraries in this case. I'll investigate this
in a separate thread.

Thanks,
- -chris

Details:

* Environment
*  Java (build): java version "1.8.0_181" Java(TM) SE Runtime
Environment (build 1.8.0_181-b13) Java HotSpot(TM) 64-Bit Server VM
(build 25.181-b13, mixed mode)
*  Java (test): java version "1.8.0_181" Java(TM) SE Runtime
Environment (build 1.8.0_181-b13) Java HotSpot(TM) 64-Bit Server VM
(build 25.181-b13, mixed mode)
*  OS:   Linux 2.6.32-312-ec2 x86_64
*  cc:   cc (Debian 4.7.2-5) 4.7.2
*  make: GNU Make 3.81
*  OpenSSL:  OpenSSL 1.0.2k 26 Jan 2017
*  APR:  1.4.6
*
* Valid SHA-256 signature for apache-tomcat-8.5.35.zip
* Valid GPG signature for apache-tomcat-8.5.35.zip
* Valid SHA-256 signature for apache-tomcat-8.5.35.tar.gz
* Valid GPG signature for apache-tomcat-8.5.35.tar.gz
* Valid SHA-256 signature for apache-tomcat-8.5.35.exe
* Valid GPG signature for apache-tomcat-8.5.35.exe
* Valid SHA512 signature for apache-tomcat-8.5.35-src.zip
* Valid GPG signature for apache-tomcat-8.5.35-src.zip
* Valid SHA512 signature for apache-tomcat-8.5.35-src.tar.gz
* Valid GPG signature for apache-tomcat-8.5.35-src.tar.gz
*
* Binary Zip and tarball: Same
* Source Zip and tarball: Same
*
* Building dependencies returned: 0
* tcnative builds cleanly
* Tomcat builds cleanly
* Junit Tests: FAILED
*
* Tests that failed:
* org.apache.catalina.session.TestStandardSessionIntegration.APR.txt
* org.apache.catalina.session.TestStandardSessionIntegration.NIO.txt
* org.apache.catalina.session.TestStandardSessionIntegration.NIO2.txt
* org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.APR.txt
* org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.NIO.txt
* org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.NIO2.tx
t
*
org.apache.catalina.tribes.group.TestGroupChannelSenderConnections.APR.t
xt
*
org.apache.catalina.tribes.group.TestGroupChannelSenderConnections.NIO.t
xt
*
org.apache.catalina.tribes.group.TestGroupChannelSenderConnections.NIO2.
txt
* org.apache.catalina.tribes.group.TestGroupChannelStartStop.APR.txt
* org.apache.catalina.tribes.group.TestGroupChannelStartStop.NIO.txt
* org.apache.catalina.tribes.group.TestGroupChannelStartStop.NIO2.txt
*
org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator
.APR.txt
*
org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator
.NIO.txt
*
org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator
.NIO2.txt
*
org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.APR.t
xt
*
org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.NIO.t
xt
*
org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.NIO2.
txt
*
org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.APR
.txt
*
org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.NIO
.txt
*
org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.NIO
2.txt
* org.apache.tomcat.util.net.openssl.ciphers.TestCipher.APR.txt
* org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO.txt
* org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO2.txt
*
org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfiguratio
nParser.APR.txt
*
org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfiguratio
nParser.NIO.txt
*
org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfiguratio
nParser.NIO2.txt
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://w

Re: [VOTE] Release Apache Tomcat 8.5.35

2018-11-05 Thread Rémy Maucherat
On Sat, Nov 3, 2018 at 6:55 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 8.5.35 release is now available for voting.
>
> The major changes compared to the 8.5.34 release are:
>
> - support for TLSv1.3 when used with a JRE or OpenSSl version that
>   supports it
>
> - multiple improvements to the RewriteValve
>
> - correct several regressions in the JSP compiler
>
>
> Along with lots of other bug fixes and improvements.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.35/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1197/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_35/
>
> The proposed 8.5.35 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.35
>
> Rémy


Re: [VOTE] Release Apache Tomcat 9.0.13

2018-11-05 Thread Rémy Maucherat
On Mon, Nov 5, 2018 at 8:43 AM Romain Manni-Bucau 
wrote:

> +1 (non-binding), tested on meecrowave and some work projects
>

Well, I guess "ads" are useful sometimes. I looked at the code of
meecrowave just right now, and it looks like my embedded improvements are
relevant and could avoid a number of hacks/problems that had to be solved
the hard way. Hopefully, they won't break any existing code either.

Rémy


libtcnative w/custom OpenSSL on MacOS

2018-11-05 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

I'm trying to run tests locally (macos mojave) with a custom openssl
version. I have OpenSSL (installed via brew) in
/usr/local/Cellar/openssl@1.1/1.1.1, and I've copied all these files
into my Tomcat's bin/ directory, so this is what I have in
$CATALINA_HOME/bin:

> drwxr-xr-x  4   128 Sep 11 08:48 engines-1.1 -rwxr-xr-x  1
> 166112 Oct  9 16:17 libapr-1.0.dylib -rw-r--r--  1288560 Oct  9
> 16:17 libapr-1.a lrwxr-xr-x  116 Oct  9 16:17
> libapr-1.dylib -> libapr-1.0.dylib -rw-r--r--  1   2432132 Sep 27
> 17:49 libcrypto.1.1.dylib -r--r--r--  1   4093208 Sep 11 08:48
> libcrypto.a lrwxr-xr-x  119 Sep 11 08:48 libcrypto.dylib ->
> libcrypto.1.1.dylib -rw-r--r--  1489672 Sep 27 17:49
> libssl.1.1.dylib -r--r--r--  1720096 Sep 11 08:48 libssl.a 
> lrwxr-xr-x  116 Sep 11 08:48 libssl.dylib ->
> libssl.1.1.dylib -rwxr-xr-x  1213716 Nov  5 10:50
> libtcnative-1.0.dylib -rw-r--r--  1   1097240 Nov  5 10:50
> libtcnative-1.a lrwxr-xr-x  121 Nov  5 10:50
> libtcnative-1.dylib -> libtcnative-1.0.dylib lrwxr-xr-x  1
> 19 Nov  5 10:50 libtcnative-1.la -> ../libtcnative-1.la -rw-r--r--
> 1  1091 Nov  5 10:50 libtcnative-1.lai

and also in engines-1.1:

- -r--r--r--  14240 Sep 27 17:49 capi.dylib
- -r--r--r--  1   13400 Sep 27 17:49 padlock.dylib

I have set in build.properties:

test.apr.loc=output/build/bin/

When running "ant test", the AprLifecycleListener is telling me:

>> OpenSSL successfully initialized [OpenSSL 1.1.1  11 Sep 2018]

... which looks like it's correct. But when e.g.
TestOpenSSLCipherConfigurationParser runs, I'm getting errors coming
from LibreSSL, which is the globally-installed crypto library
installed on macos:

> 4690560620:error:14FFF0B9:SSL routines:(UNKNOWN)SSL_internal:no
> cipher
> match:/BuildRoot/Library/Caches/com.apple.xbs/Sources/libressl/libress
l-22.200.4/libressl-2.6/ssl/ssl_lib.c:1324:

Obviously,
> 
OpenSSL is not being used for everything.

otool tells me that everything looks okay:

> $ otool -L output/build/bin/libtcnative-1.dylib 
> output/build/bin/libtcnative-1.dylib: 
> /usr/local/apr/lib/libtcnative-1.0.dylib (compatibility version
> 3.0.0, current version 3.18.0) 
> /usr/local/opt/openssl@1.1/lib/libssl.1.1.dylib (compatibility
> version 1.1.0, current version 1.1.0) 
> /usr/local/opt/openssl@1.1/lib/libcrypto.1.1.dylib (compatibility
> version 1.1.0, current version 1.1.0) 
> /usr/local/opt/apr/libexec/lib/libapr-1.0.dylib (compatibility
> version 7.0.0, current version 7.5.0) /usr/lib/libSystem.B.dylib
> (compatibility version 1.0.0, current version 1252.200.5)

What am I missing, here?

Thanks,
- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlvggYUACgkQHPApP6U8
pFh2SQ//eBdMeZ/n7BMp6OZlxEhrFr7DUwl8Q1oqJSS1g95xt7FWpBHCSa88xZGf
oKMdrG4VAJ5y64slBea2lf7Nf2QbOsVLwJBUcgJqjN+zTqVe0nVYTkwU7F7iFM4Y
pvW/cadPi1PO4WpHSynG8xKB2yUcXXzAIzCgcB6EXDZm/L9KHavCkAe+Sb6ZwQKe
ruhHYK9821OPeK9LBbOs+XG6dqGcnzycujrr+KZ88fu9/8NfA0Qxw3Y/5Zrtp39n
dxAGM2/SozLtmqhBTJI5uzd3y0HCe+m2ET1tIwbpjs/E/qwiHK+zARF7QEqsPGrw
PJsDB6BXNSTAbGeuF4QdPtAUWbemSWqHrnFlob686S8JIfGLyjuKNW9k+d2pNBjV
1l9+XK4EZ0hT1kw/FvM7DE3ICdc9LXQ0iN9urqrmOkf4W/9JiMNHEsNasQFd0GtF
yX9Q8vB93FqGK8moe6XtXnujZsv29BpO1wF40Lw4PJMQxYyY5c1GI4bv6p5aZilt
7YVy+Ox/zL0FD2GN4+vAwxsnlLAkNDNvMTzPO4BS/FuoAX5lTojVTAr/C1hWIiMR
TpE+h6P33TJ9qgLD6+dDDn08hE72+J105ZeHK725L2WXgBhnuQJprEdhYBQH5137
grp6uyV4OsXV1vNjPDw1mEiZhNsTPe9cValA1d8fkRfql3/rAY0=
=Whjs
-END PGP SIGNATURE-

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



Re: libtcnative w/custom OpenSSL on MacOS

2018-11-05 Thread Rainer Jung

Hi Chris,

Am 05.11.2018 um 18:44 schrieb Christopher Schultz:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

I'm trying to run tests locally (macos mojave) with a custom openssl
version. I have OpenSSL (installed via brew) in
/usr/local/Cellar/openssl@1.1/1.1.1, and I've copied all these files
into my Tomcat's bin/ directory, so this is what I have in
$CATALINA_HOME/bin:


drwxr-xr-x  4   128 Sep 11 08:48 engines-1.1 -rwxr-xr-x  1
166112 Oct  9 16:17 libapr-1.0.dylib -rw-r--r--  1288560 Oct  9
16:17 libapr-1.a lrwxr-xr-x  116 Oct  9 16:17
libapr-1.dylib -> libapr-1.0.dylib -rw-r--r--  1   2432132 Sep 27
17:49 libcrypto.1.1.dylib -r--r--r--  1   4093208 Sep 11 08:48
libcrypto.a lrwxr-xr-x  119 Sep 11 08:48 libcrypto.dylib ->
libcrypto.1.1.dylib -rw-r--r--  1489672 Sep 27 17:49
libssl.1.1.dylib -r--r--r--  1720096 Sep 11 08:48 libssl.a
lrwxr-xr-x  116 Sep 11 08:48 libssl.dylib ->
libssl.1.1.dylib -rwxr-xr-x  1213716 Nov  5 10:50
libtcnative-1.0.dylib -rw-r--r--  1   1097240 Nov  5 10:50
libtcnative-1.a lrwxr-xr-x  121 Nov  5 10:50
libtcnative-1.dylib -> libtcnative-1.0.dylib lrwxr-xr-x  1
19 Nov  5 10:50 libtcnative-1.la -> ../libtcnative-1.la -rw-r--r--
1  1091 Nov  5 10:50 libtcnative-1.lai


and also in engines-1.1:

- -r--r--r--  14240 Sep 27 17:49 capi.dylib
- -r--r--r--  1   13400 Sep 27 17:49 padlock.dylib

I have set in build.properties:

test.apr.loc=output/build/bin/

When running "ant test", the AprLifecycleListener is telling me:


OpenSSL successfully initialized [OpenSSL 1.1.1  11 Sep 2018]


... which looks like it's correct. But when e.g.
TestOpenSSLCipherConfigurationParser runs, I'm getting errors coming
from LibreSSL, which is the globally-installed crypto library
installed on macos:


4690560620:error:14FFF0B9:SSL routines:(UNKNOWN)SSL_internal:no
cipher
match:/BuildRoot/Library/Caches/com.apple.xbs/Sources/libressl/libress

l-22.200.4/libressl-2.6/ssl/ssl_lib.c:1324:

Obviously,



OpenSSL is not being used for everything.

otool tells me that everything looks okay:


$ otool -L output/build/bin/libtcnative-1.dylib
output/build/bin/libtcnative-1.dylib:
/usr/local/apr/lib/libtcnative-1.0.dylib (compatibility version
3.0.0, current version 3.18.0)
/usr/local/opt/openssl@1.1/lib/libssl.1.1.dylib (compatibility
version 1.1.0, current version 1.1.0)
/usr/local/opt/openssl@1.1/lib/libcrypto.1.1.dylib (compatibility
version 1.1.0, current version 1.1.0)
/usr/local/opt/apr/libexec/lib/libapr-1.0.dylib (compatibility
version 7.0.0, current version 7.5.0) /usr/lib/libSystem.B.dylib
(compatibility version 1.0.0, current version 1252.200.5)


What am I missing, here?


Try setting test.openssl.path in build.properties to the full path to 
the openssl binary (.../bin/openssl).


See r1614560 and r1614587.

Regards,

Rainer

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



Re: libtcnative w/custom OpenSSL on MacOS

2018-11-05 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256



On 11/5/18 13:05, Rainer Jung wrote:
> Hi Chris,
> 
> Am 05.11.2018 um 18:44 schrieb Christopher Schultz:
>> -BEGIN PGP SIGNED MESSAGE- Hash: SHA256
>> 
>> All,
>> 
>> I'm trying to run tests locally (macos mojave) with a custom
>> openssl version. I have OpenSSL (installed via brew) in 
>> /usr/local/Cellar/openssl@1.1/1.1.1, and I've copied all these
>> files into my Tomcat's bin/ directory, so this is what I have in 
>> $CATALINA_HOME/bin:
>> 
>>> drwxr-xr-x  4   128 Sep 11 08:48 engines-1.1 -rwxr-xr-x  1 
>>> 166112 Oct  9 16:17 libapr-1.0.dylib -rw-r--r--  1288560
>>> Oct  9 16:17 libapr-1.a lrwxr-xr-x  116 Oct  9 16:17 
>>> libapr-1.dylib -> libapr-1.0.dylib -rw-r--r--  1   2432132 Sep
>>> 27 17:49 libcrypto.1.1.dylib -r--r--r--  1   4093208 Sep 11
>>> 08:48 libcrypto.a lrwxr-xr-x  119 Sep 11 08:48
>>> libcrypto.dylib -> libcrypto.1.1.dylib -rw-r--r--  1489672
>>> Sep 27 17:49 libssl.1.1.dylib -r--r--r--  1720096 Sep 11
>>> 08:48 libssl.a lrwxr-xr-x  116 Sep 11 08:48
>>> libssl.dylib -> libssl.1.1.dylib -rwxr-xr-x  1213716 Nov  5
>>> 10:50 libtcnative-1.0.dylib -rw-r--r--  1   1097240 Nov  5
>>> 10:50 libtcnative-1.a lrwxr-xr-x  121 Nov  5 10:50 
>>> libtcnative-1.dylib -> libtcnative-1.0.dylib lrwxr-xr-x  1 19
>>> Nov  5 10:50 libtcnative-1.la -> ../libtcnative-1.la
>>> -rw-r--r-- 1  1091 Nov  5 10:50 libtcnative-1.lai
>> 
>> and also in engines-1.1:
>> 
>> - -r--r--r--  14240 Sep 27 17:49 capi.dylib - -r--r--r--  1
>> 13400 Sep 27 17:49 padlock.dylib
>> 
>> I have set in build.properties:
>> 
>> test.apr.loc=output/build/bin/
>> 
>> When running "ant test", the AprLifecycleListener is telling me:
>> 
 OpenSSL successfully initialized [OpenSSL 1.1.1  11 Sep
 2018]
>> 
>> ... which looks like it's correct. But when e.g. 
>> TestOpenSSLCipherConfigurationParser runs, I'm getting errors
>> coming from LibreSSL, which is the globally-installed crypto
>> library installed on macos:
>> 
>>> 4690560620:error:14FFF0B9:SSL
>>> routines:(UNKNOWN)SSL_internal:no cipher 
>>> match:/BuildRoot/Library/Caches/com.apple.xbs/Sources/libressl/libre
ss
>>
>>> 
l-22.200.4/libressl-2.6/ssl/ssl_lib.c:1324:
>> 
>> Obviously,
>>> 
>> OpenSSL is not being used for everything.
>> 
>> otool tells me that everything looks okay:
>> 
>>> $ otool -L output/build/bin/libtcnative-1.dylib 
>>> output/build/bin/libtcnative-1.dylib: 
>>> /usr/local/apr/lib/libtcnative-1.0.dylib (compatibility
>>> version 3.0.0, current version 3.18.0) 
>>> /usr/local/opt/openssl@1.1/lib/libssl.1.1.dylib (compatibility 
>>> version 1.1.0, current version 1.1.0) 
>>> /usr/local/opt/openssl@1.1/lib/libcrypto.1.1.dylib
>>> (compatibility version 1.1.0, current version 1.1.0) 
>>> /usr/local/opt/apr/libexec/lib/libapr-1.0.dylib (compatibility 
>>> version 7.0.0, current version 7.5.0)
>>> /usr/lib/libSystem.B.dylib (compatibility version 1.0.0,
>>> current version 1252.200.5)
>> 
>> What am I missing, here?
> 
> Try setting test.openssl.path in build.properties to the full path
> to the openssl binary (.../bin/openssl).
> 
> See r1614560 and r1614587.

Aha! That was it!

I was confused because I was thinking that the version was being
properly-detected by Tomcat. But the tests were using the "openssl
ciphers" command to pull the lists of ciphers instead of doing it
using JNI.

Would it be worth it to use JNI to pull-back the list of supported
ciphers instead of running an external command?

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlvgnnkACgkQHPApP6U8
pFhgOw/+OR102nB5cvil60WbW8k2NV3x8WlGIP6prx806XX0yFGvmeZCLHmKgvBS
aNYb1rljTjtNl71P/U3hmFoU/7wV4ocXhC/p+FmfMUh9i4dI7JXlu7fZJz4xBPUr
GkdiQP+dYpI9LRfXKUnEZu/ZoubASkmzMluQrbUwSrlvgpapplRqFCqkOk9uvshK
Yt7C+JXWtq4HAKP3jxTX4yLns9E5nQx8tbzkgeiGpedQEa7b76T7zS4mswHR6ET3
MDXsTqjy+V/8Zm9PCWUE/NLvObd5zjCYdoye5nPyew5XEwrDJhYd/c0u/jGA18kO
2u3z9sn1xAqhaX9VFsnSDgg9XGeOaogLG6lDMLZ5zEIHvdo9NDFIZ9IOSqTl4nDK
X8Z5rwnkdD4KioVPtNX4KE7n7E5xI22fwi0rFKmp5zicpRi1a6Y6Awm1uqgs4JSV
ZrtP1gopZlzM5+qoA1WMsqQ0/PwkZksAul0cOYHXA/DqURrRL2SJGuFD+5Fq/N9d
sVn2JfT3ezO5/xCdzVx/AGd8NRQbPoT1wHkKuAANhfT/gnQnZUXLqV/z+wK0aCY2
P6vmONuydMm0IrJOTzSC+5O1SYREQlFYFNI7CCBu176Tp/CritvFvNvE17e1e31P
NfpggxSO1Z7NpuezO5YKELSV41KdnOw+KTPXpkFtS2U6V3Pvfmg=
=Olxh
-END PGP SIGNATURE-

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



[GUMP@vmgump-vm3]: Project tomcat-tc8.5.x-test-nio2 (in module tomcat-8.5.x) failed

2018-11-05 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc8.5.x-test-nio2 has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.5.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.5.x/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-nio2/gump_work/build_tomcat-8.5.x_tomcat-tc8.5.x-test-nio2.html
Work Name: build_tomcat-8.5.x_tomcat-tc8.5.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 18 mins 26 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.5.x/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true 
-Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-8.5.x/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar
 -Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.1.1/dest-20181105/bin/openssl
 -Dexe
 cute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true 
-Deasymock.jar=/srv/gump/packages/easymock3/easymock-3.6.jar 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.5.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.5.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/bu
 
ild/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-util-scan.jar:/srv/gump/public/wo

Re: libtcnative w/custom OpenSSL on MacOS

2018-11-05 Thread Mark Thomas
On 05/11/2018 19:48, Christopher Schultz wrote:
> On 11/5/18 13:05, Rainer Jung wrote:
>> Am 05.11.2018 um 18:44 schrieb Christopher Schultz:



>>> What am I missing, here?
> 
>> Try setting test.openssl.path in build.properties to the full path
>> to the openssl binary (.../bin/openssl).
> 
>> See r1614560 and r1614587.
> 
> Aha! That was it!
> 
> I was confused because I was thinking that the version was being
> properly-detected by Tomcat. But the tests were using the "openssl
> ciphers" command to pull the lists of ciphers instead of doing it
> using JNI.
> 
> Would it be worth it to use JNI to pull-back the list of supported
> ciphers instead of running an external command?

The purpose of the tests is to ensure that the Tomcat code that
replicates OpenSSL's cipher selection behaves the same way as the latest
OpenSSL code. I don't see that it matters whether we determine the
OpenSSL behaviour via an external command or JNI.

The upside is more consistent tests and one less build parameter to
configure.

The downside is APR/native becomes required for those tests. Running
those tests for all three connectors is fairly pointless so only running
them with APR might be an upside.

I haven't checked to see if the API we'd need to use is accessible via
the current JNI API or whether we'd need to extend it.

Is it worth it? For me this in the the category of it looks to be a
worthwhile itch to scratch if someone wants to scratch it.

Mark

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



Re: [VOTE] Release Apache Tomcat 9.0.13

2018-11-05 Thread Felix Schumacher



Am 2. November 2018 17:11:40 MEZ schrieb Mark Thomas :
>The proposed Apache Tomcat 9.0.13 release is now available for voting.
>
>The major changes compared to the 9.0.13 release are:
>
>- support for TLSv1.3 when used with a JRE or OPenSSl version that
>  supports it
>
>- added support for encrypting cluster traffic
>
>- added automatic reloading of tomcat-users.xml after a change
>
>
>Along with lots of other bug fixes and improvements.
>
>For full details, see the changelog:
>http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml
>
>It can be obtained from:
>https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.13/
>The Maven staging repo is:
>https://repository.apache.org/content/repositories/orgapachetomcat-1196/
>The svn tag is:
>http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_13/
>
>The proposed 9.0.13 release is:
>[ ] Broken - do not release
>[x] Stable - go ahead and release as 9.0.13

Regards, 
Felix 

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

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



Re: [VOTE] Release Apache Tomcat 8.5.35

2018-11-05 Thread Felix Schumacher



Am 3. November 2018 18:55:11 MEZ schrieb Mark Thomas :
>The proposed Apache Tomcat 8.5.35 release is now available for voting.
>
>The major changes compared to the 8.5.34 release are:
>
>- support for TLSv1.3 when used with a JRE or OpenSSl version that
>  supports it
>
>- multiple improvements to the RewriteValve
>
>- correct several regressions in the JSP compiler
>
>
>Along with lots of other bug fixes and improvements.
>
>It can be obtained from:
>https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.35/
>The Maven staging repo is:
>https://repository.apache.org/content/repositories/orgapachetomcat-1197/
>The svn tag is:
>http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_35/
>
>The proposed 8.5.35 release is:
>[ ] Broken - do not release
>[x] Stable - go ahead and release as 8.5.35

Regards, 
Felix 

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

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