Re: Time for 7.0.60
2015-03-25 16:20 GMT+02:00 Christopher Schultz : > > Violetta, > > On 3/25/15 6:21 AM, Violeta Georgieva wrote: > > Hi, > > > > 2015-03-05 21:39 GMT+02:00 Violeta Georgieva : > >> > >> Hi, > >> > >> I plan to start preparing 7.0.60 for voting. > >> > >> If you want to add something to this release please reply here. > > > > Do we wait for something else here or I can start preparing 7.0.60 for > > voting? > > I think we're good. I would encourage you to bundle tcnative 1.1.33 with > it if that hasn't already been updated. It was updated by Mark. - Violeta > -chris >
svn commit: r1669284 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_60: ./ build.properties.default
Author: violetagg Date: Thu Mar 26 07:40:22 2015 New Revision: 1669284 URL: http://svn.apache.org/r1669284 Log: Tag 7.0.60 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_60/ (props changed) - copied from r1669282, tomcat/tc7.0.x/trunk/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_60/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_60/ -- bugtraq:append = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_60/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_60/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Mar 26 07:40:22 2015 @@ -0,0 +1,2 @@ +(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+) +(\d+) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_60/ -- bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_60/ -- bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_60/ -- --- svn:ignore (added) +++ svn:ignore Thu Mar 26 07:40:22 2015 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_60/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Mar 26 07:40:22 2015 @@ -0,0 +1,2 @@ +/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,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,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 +/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1
svn commit: r1669290 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
Author: violetagg Date: Thu Mar 26 08:19:27 2015 New Revision: 1669290 URL: http://svn.apache.org/r1669290 Log: Prep for next version Modified: tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1669290&r1=1669289&r2=1669290&view=diff == --- tomcat/tc7.0.x/trunk/build.properties.default (original) +++ tomcat/tc7.0.x/trunk/build.properties.default Thu Mar 26 08:19:27 2015 @@ -25,7 +25,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=60 +version.build=61 version.patch=0 version.suffix=-dev Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1669290&r1=1669289&r2=1669290&view=diff == --- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Thu Mar 26 08:19:27 2015 @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=7.0.60 +maven.asf.release.deploy.version=7.0.61 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib 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=1669290&r1=1669289&r2=1669290&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar 26 08:19:27 2015 @@ -55,6 +55,8 @@ They eventually become mixed with the numbered issues. (I.e., numbered issues do not "pop up" wrt. others). --> + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r8439 [1/2] - in /dev/tomcat/tomcat-7/v7.0.60: ./ bin/ bin/embed/ bin/extras/ src/
Author: violetagg Date: Thu Mar 26 08:24:36 2015 New Revision: 8439 Log: Stage 7.0.60RC Added: dev/tomcat/tomcat-7/v7.0.60/ dev/tomcat/tomcat-7/v7.0.60/KEYS (with props) dev/tomcat/tomcat-7/v7.0.60/README.html (with props) dev/tomcat/tomcat-7/v7.0.60/RELEASE-NOTES dev/tomcat/tomcat-7/v7.0.60/bin/ dev/tomcat/tomcat-7/v7.0.60/bin/README.html (with props) dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-deployer.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-deployer.tar.gz.asc dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-deployer.tar.gz.md5 dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-deployer.tar.gz.sha1 dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-deployer.zip (with props) dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-deployer.zip.asc dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-deployer.zip.md5 dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-deployer.zip.sha1 dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-fulldocs.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-fulldocs.tar.gz.asc dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-fulldocs.tar.gz.md5 dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-fulldocs.tar.gz.sha1 dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-windows-i64.zip (with props) dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-windows-i64.zip.asc dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-windows-i64.zip.md5 dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-windows-i64.zip.sha1 dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-windows-x64.zip (with props) dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-windows-x64.zip.asc dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-windows-x64.zip.md5 dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-windows-x64.zip.sha1 dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-windows-x86.zip (with props) dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-windows-x86.zip.asc dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-windows-x86.zip.md5 dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60-windows-x86.zip.sha1 dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60.exe (with props) dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60.exe.asc dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60.exe.md5 dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60.exe.sha1 dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60.tar.gz.asc dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60.tar.gz.md5 dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60.tar.gz.sha1 dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60.zip (with props) dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60.zip.asc dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60.zip.md5 dev/tomcat/tomcat-7/v7.0.60/bin/apache-tomcat-7.0.60.zip.sha1 dev/tomcat/tomcat-7/v7.0.60/bin/embed/ dev/tomcat/tomcat-7/v7.0.60/bin/embed/apache-tomcat-7.0.60-embed.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.60/bin/embed/apache-tomcat-7.0.60-embed.tar.gz.asc dev/tomcat/tomcat-7/v7.0.60/bin/embed/apache-tomcat-7.0.60-embed.tar.gz.md5 dev/tomcat/tomcat-7/v7.0.60/bin/embed/apache-tomcat-7.0.60-embed.tar.gz.sha1 dev/tomcat/tomcat-7/v7.0.60/bin/embed/apache-tomcat-7.0.60-embed.zip (with props) dev/tomcat/tomcat-7/v7.0.60/bin/embed/apache-tomcat-7.0.60-embed.zip.asc dev/tomcat/tomcat-7/v7.0.60/bin/embed/apache-tomcat-7.0.60-embed.zip.md5 dev/tomcat/tomcat-7/v7.0.60/bin/embed/apache-tomcat-7.0.60-embed.zip.sha1 dev/tomcat/tomcat-7/v7.0.60/bin/extras/ dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-jmx-remote.jar (with props) dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-jmx-remote.jar.asc dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-jmx-remote.jar.md5 dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-jmx-remote.jar.sha1 dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-ws.jar (with props) dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-ws.jar.asc dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-ws.jar.md5 dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-ws.jar.sha1 dev/tomcat/tomcat-7/v7.0.60/bin/extras/tomcat-juli-adapters.jar (with props) dev/tomcat/tomcat-7/v7.0.60/bin/extras/tomcat-juli-adapters.jar.asc dev/tomcat/tomcat-7/v7.0.60/bin/extras/tomcat-juli-adapters.jar.md5 dev/tomcat/tomcat-7/v7.0.60/bin/extras/tomcat-juli-adapters.jar.sha1 dev/tomcat/tomcat-7/v7.0.60/bin/extras/tomcat-juli.jar (with props) dev/tomcat/tomcat-7/v7.0.60/bin/extras/tomcat-juli.jar.asc dev/tomcat/tomcat-7/v7.0.60/bin/extras/tomcat-juli.jar.md5 dev/tomcat/tomcat-7/v7.0.60/bin/extras/tomcat-juli.jar.sha1
svn commit: r8439 [2/2] - in /dev/tomcat/tomcat-7/v7.0.60: ./ bin/ bin/embed/ bin/extras/ src/
Added: dev/tomcat/tomcat-7/v7.0.60/bin/embed/apache-tomcat-7.0.60-embed.zip.md5 == --- dev/tomcat/tomcat-7/v7.0.60/bin/embed/apache-tomcat-7.0.60-embed.zip.md5 (added) +++ dev/tomcat/tomcat-7/v7.0.60/bin/embed/apache-tomcat-7.0.60-embed.zip.md5 Thu Mar 26 08:24:36 2015 @@ -0,0 +1 @@ +a8f7d8caf9fffa9f337551491027a8d6 *apache-tomcat-7.0.60-embed.zip \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.60/bin/embed/apache-tomcat-7.0.60-embed.zip.sha1 == --- dev/tomcat/tomcat-7/v7.0.60/bin/embed/apache-tomcat-7.0.60-embed.zip.sha1 (added) +++ dev/tomcat/tomcat-7/v7.0.60/bin/embed/apache-tomcat-7.0.60-embed.zip.sha1 Thu Mar 26 08:24:36 2015 @@ -0,0 +1 @@ +389cb7cf41ea9e05a397de9ede4d8b3908b52023 *apache-tomcat-7.0.60-embed.zip \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-jmx-remote.jar == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-jmx-remote.jar -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-jmx-remote.jar.asc == --- dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-jmx-remote.jar.asc (added) +++ dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-jmx-remote.jar.asc Thu Mar 26 08:24:36 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCgAGBQJVE7qrAAoJECCLCrHWMBHH/6EP+wbu2qnKoIx2f1aAjze3CIQq +eX372SafAbg2q5iWRYkcbYMM6x+w/zoDRnqbbeI8aAjGRJzx52jyxDb8gc8fM12W +x6mc0lWWs61UVNgsm5RPT4mwZ+orUvoVOshZRpE+A2EQ3EuE7AWO1jntrXEpq7DM +JvFiGRYy+6S6RuBcj8jjH4AyTArnR9mEtA6cGzmQvYw8ePwjg4NRnj6Bs/5PzlLp +xGjRsB/nX69QHNAFFA0snNslrR9nazzeLnY0k2B37IHUlPn4XHdzblyVwkdK8zof +Az568xPDcdkt9WTZ4aPN/aLyIPtNzh+QGAJvndH2BZi1uTGJn7ZWDAvSX6rCBIR4 +WjdBitLZLYIzDfwfvyogaHs9gcCMMKKWmsVFTzDx0Cm50HYTJGMGfmKPXrn9qFyv +tHVOOfdcJTJS52Lo0SvuT5KtS21Qm3WsWFNlbXDMzrnasxLDzZe/VDwls5DIFhXM +dAFDRZuP5i6BhJiV0GQDpr27eqofo/fhpEQvJ0AhjeO2AEXPXN6zHUF/QRBOjjHG +HoZMwZoRjXQSxYmxrlyPd1wJDyXIz/Ds4qlWQ2NMru5oHNTaJrHvB1mYvR9fjsDz +Y4Ct1aNSDHJkvJdN762RMBCSMax3i4IdfpI7tSTLgLztDO3Jax6hhpWjBFYD8Mmy +QQddFedjkJ0JWfMmTS/q +=A2Lk +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-jmx-remote.jar.md5 == --- dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-jmx-remote.jar.md5 (added) +++ dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-jmx-remote.jar.md5 Thu Mar 26 08:24:36 2015 @@ -0,0 +1 @@ +508db055b10163ddc69dc3aebae150ee *catalina-jmx-remote.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-jmx-remote.jar.sha1 == --- dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-jmx-remote.jar.sha1 (added) +++ dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-jmx-remote.jar.sha1 Thu Mar 26 08:24:36 2015 @@ -0,0 +1 @@ +5cbdeab4f1309a0bb11daca0ec5650b880ed749f *catalina-jmx-remote.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-ws.jar == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-ws.jar -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-ws.jar.asc == --- dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-ws.jar.asc (added) +++ dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-ws.jar.asc Thu Mar 26 08:24:36 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCgAGBQJVE7qqAAoJECCLCrHWMBHHSeIQANfn7hy8xb6K64rqFahE5+JU +NNQ+tMTqEOCLWWKMp5arJ4MCpHYIf0Wjk5ompc/Q70+bVq0AYJtycrjOBLCCotGQ +rWWTvdfLEg3p4OPcvoYaxqcAklecdOkhm9qegiyWp5NSg7tZ78+aLtOKWPv2B/dm +C+qyJGpcUfb+S0kBbqe0Zdd8wZhPwO68EYZOLMrzzjqEHDAiP6bPnZdUYLtg/Y3y +MkdNJWbaUhLHnUb8BaalJKV3d5lJEUCXFv4httmFh6f8ufhUJTsah9adsgUeYHci +nTbWO6QXzCtMPieZc6g9vOW/QYGmcWksRZqpZmk6B1ViBxRro+0RAA5tFA5B634O +WKkJgoTb+mhni9n/myE0nnB+Gdszw/8dd/3HiSMLYnT9OnXMVd/s7eR0lIh7R4vN +xgajBeNz29YJ1uecsOw1xRa81RcoEYUJ1Bhu0DkQH2bp4ayKsP6eIlEOU4L5HFuf +3kJQABEtNWmC92xSNXngDxea1ryiYho1CLtjBXuZWbUDZ130HXo3g0qILWlLJobU +kmPPCM/w1FdhHH0ofbBPRg896JYIXRYJ7r+oPkKnj/ayCCmM5J7ECMvbaZIps2l4 +oPig6pwFZt6mj3Gc9hJ8ji+wpOAYpNH4OxAC/rv2d6pvYB/mZ59frVIuz6oPm0uR +dzNd//a+xc8vrwzXUWWK +=4i15 +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.60/bin/extras/catalina-ws.jar.md5 ===
[VOTE] Release Apache Tomcat 7.0.60
The proposed Apache Tomcat 7.0.60 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.60/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1040/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_60/ The proposed 7.0.60 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.60 Stable Regards, Violeta
[Bug 57761] WebSocket client won't connect to URLs that don't end in a slash (/)
https://bz.apache.org/bugzilla/show_bug.cgi?id=57761 Remy Maucherat changed: What|Removed |Added OS||All --- Comment #1 from Remy Maucherat --- Without the slash, it would do a redirect and that's likely the cause of the problem. The ws client is not a real HTTP client, and I guess it cannot do many things, including auth, or apparently redirects. I am not convinced using a real HTTP client is mandatory, working only with a server that will do a straight upgrade could be good enough given what the ws API looks like (a non interactive direct connection). I recommend considering the slash is mandatory. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1669302 - /tomcat/native/trunk/native/src/sslinfo.c
Author: rjung
Date: Thu Mar 26 09:14:52 2015
New Revision: 1669302
URL: http://svn.apache.org/r1669302
Log:
Replace access to OpenSSL SSL internals
by accessor function. Internals are no longer
available for OpenSSL master.
Not compiled or tested, waiting for GUMP.
Modified:
tomcat/native/trunk/native/src/sslinfo.c
Modified: tomcat/native/trunk/native/src/sslinfo.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslinfo.c?rev=1669302&r1=1669301&r2=1669302&view=diff
==
--- tomcat/native/trunk/native/src/sslinfo.c (original)
+++ tomcat/native/trunk/native/src/sslinfo.c Thu Mar 26 09:14:52 2015
@@ -177,12 +177,10 @@ static char *lookup_ssl_cert_dn(X509_NAM
for (i = 0; info_cert_dn_rec[i].fid != 0; i++) {
if (info_cert_dn_rec[i].fid == dnidx) {
-for (j = 0; j < sk_X509_NAME_ENTRY_num((STACK_OF(X509_NAME_ENTRY)
*)
- (xsname->entries)); j++) {
-xsne = sk_X509_NAME_ENTRY_value((STACK_OF(X509_NAME_ENTRY) *)
-(xsname->entries), j);
-n =OBJ_obj2nid((ASN1_OBJECT
*)X509_NAME_ENTRY_get_object(xsne));
+for (j = 0; j < X509_NAME_entry_count(xsname); j++) {
+xsne = X509_NAME_get_entry(xsname, j);
+n = OBJ_obj2nid((ASN1_OBJECT
*)X509_NAME_ENTRY_get_object(xsne));
if (n == info_cert_dn_rec[i].nid && idx-- == 0) {
result = malloc(xsne->value->length + 1);
memcpy(result, xsne->value->data,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1669303 - in /tomcat/native/branches/1.1.x: ./ native/src/sslinfo.c xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Thu Mar 26 09:17:16 2015
New Revision: 1669303
URL: http://svn.apache.org/r1669303
Log:
Replace access to OpenSSL SSL internals
by accessor function. Internals are no longer
available for OpenSSL master.
Not tested, waiting for GUMP.
Backport of 1669302 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/sslinfo.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Propchange: tomcat/native/branches/1.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 26 09:17:16 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724
+/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/src/sslinfo.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslinfo.c?rev=1669303&r1=1669302&r2=1669303&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslinfo.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslinfo.c Thu Mar 26 09:17:16 2015
@@ -177,12 +177,10 @@ static char *lookup_ssl_cert_dn(X509_NAM
for (i = 0; info_cert_dn_rec[i].fid != 0; i++) {
if (info_cert_dn_rec[i].fid == dnidx) {
-for (j = 0; j < sk_X509_NAME_ENTRY_num((STACK_OF(X509_NAME_ENTRY)
*)
- (xsname->entries)); j++) {
-xsne = sk_X509_NAME_ENTRY_value((STACK_OF(X509_NAME_ENTRY) *)
-(xsname->entries), j);
-n =OBJ_obj2nid((ASN1_OBJECT
*)X509_NAME_ENTRY_get_object(xsne));
+for (j = 0; j < X509_NAME_entry_count(xsname); j++) {
+xsne = X509_NAME_get_entry(xsname, j);
+n = OBJ_obj2nid((ASN1_OBJECT
*)X509_NAME_ENTRY_get_object(xsne));
if (n == info_cert_dn_rec[i].nid && idx-- == 0) {
result = malloc(xsne->value->length + 1);
memcpy(result, xsne->value->data,
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1669303&r1=1669302&r2=1669303&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Thu Mar 26
09:17:16 2015
@@ -36,6 +36,14 @@
new documentation project for Tomcat Native was started.
+
+
+
+ Fix compilation failures with master branch of OpenSSL. Replace access
+ to OpenSSL internals by accessor functions. (rjung)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [GUMP@vmgump]: Project tomcat-native-make (in module tomcat-native) failed
Am 26.03.2015 um 00:45 schrieb 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-native-make has an issue affecting its community integration. This issue affects 5 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-native-make : Tomcat native library using Apache Portable Runtime - tomcat-native-make-install : Tomcat native library using Apache Portable Runtime - tomcat-tc7.0.x-test-apr : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... - tomcat-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-make/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 The following work was performed: http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-make/gump_work/build_tomcat-native_tomcat-native-make.html Work Name: build_tomcat-native_tomcat-native-make (Type: Build) Work ended in a state of : Failed Elapsed: 12 secs Command Line: make [Working Directory: /srv/gump/public/workspace/tomcat-native/native] - /bin/bash /srv/gump/public/workspace/apr-1/dest-20150326/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl/dest-20150326/include -I/srv/gump/public/workspace/apr-1/dest-20150326/include/apr-1 -o src/proc.lo -c src/proc.c && touch src/proc.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20150326/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl/dest-20150326/include -I/srv/gump/public/workspace/apr-1/dest-20150326/include/apr-1 -o src/shm.lo -c src/shm.c && touch src/shm.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20150326/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl/dest-20150326/include -I/srv/gump/public/workspace/apr-1/dest-20150326/include/apr-1 -o src/ssl.lo -c src/ssl.c && touch src/ssl.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20150326/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl/dest-20150326/include -I/srv/gump/public/workspace/apr-1/dest-20150326/include/apr-1 -o src/sslcontext.lo -c src/sslcontext.c && touch src/sslcontext.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20150326/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl/dest-20150326/include -I/srv/gump/public/workspace/apr-1/dest-20150326/include/apr-1 -o src/sslinfo.lo -c src/sslinfo.c && touch src/sslinfo.lo In file included from /srv/gump/public/workspace/openssl/dest-20150326/include/openssl/crypto.h:130:0, from /srv/gump/public/workspace/openssl/dest-20150326/include/openssl/comp.h:5, from /srv/gump/public/workspace/openssl/dest-20150326/include/openssl/ssl.h:149, from /srv/gump/public/workspace/tomcat-native/native/include/ssl_private.h:44, from src/sslinfo.c:29: src/sslinfo.c: In function 'lookup_ssl_cert_dn': src/sslinfo.c:181:59: error: dereferencing pointer to incomplete type (xsname->entries));
[Bug 57762] WebSocket client doesn't detect forceful connection failures
https://bz.apache.org/bugzilla/show_bug.cgi?id=57762 --- Comment #2 from Remy Maucherat --- The NIO2 code that the client uses looks ok to me (WsFrameClient) and should work unless there's a JVM or platform issue. If the JVM doesn't report that the socket is gone using the failed of the completion handler, then nothing is going to happen and it would be the behavior you see. Although this should be tested to make sure this is indeed the explanation, it's possible there's no Tomcat bug to fix here. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57749] NullPointerException in InternalNio2OutputBuffer$2.failed(InternalNio2OutputBuffer.java:205) (8.0.21 RC)
https://bz.apache.org/bugzilla/show_bug.cgi?id=57749 --- Comment #6 from Remy Maucherat --- IMO, the logging level should be debug, there are other places where the socket is checked for null due to possible concurrent close and there's no logging at all. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57749] NullPointerException in InternalNio2OutputBuffer$2.failed(InternalNio2OutputBuffer.java:205) (8.0.21 RC)
https://bz.apache.org/bugzilla/show_bug.cgi?id=57749 --- Comment #7 from Mark Thomas --- I opted for WARN until we were more sure what the root cause was. If it is concurrent close then no objections to making it debug. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57761] WebSocket client won't connect to URLs that don't end in a slash (/)
https://bz.apache.org/bugzilla/show_bug.cgi?id=57761 --- Comment #2 from Mark Thomas --- It isn't the redirec. The Tomcat client has a bug. It requests "GET HTTP/1.1". -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57761] WebSocket client won't connect to URLs that don't end in a slash (/)
https://bz.apache.org/bugzilla/show_bug.cgi?id=57761 --- Comment #3 from Remy Maucherat --- Ah, that's another explanation and easier fix ! More generally, if it ran into a redirect (like requesting the root of a webapp maybe) or anything besides the upgrade response really, I don't think anything is supported. Did I miss something ? I don't think support is mandatory (should connect directly to a websocket URL, and it is not required to be a full client). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54534] JMX connection may load servlet with invalid ClassLoader
https://bz.apache.org/bugzilla/show_bug.cgi?id=54534 --- Comment #3 from Paweł Omelko --- It seems like this bug still occur for Tomcat 8.0.20. As you can see on stacktrace below, during application start-up (thread [myApp-startStop-1]), another thread (thread [RMI TCP Connection(14)-172.17.14.64]) starts initializing app servlet. Should I report new bug for this issue? 2015-03-26 09:27:57,353 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] Thread name: myApp-startStop-1.19 2015-03-26 09:27:57,353 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] java.lang.Thread.getStackTrace(Thread.java:1567) 2015-03-26 09:27:57,353 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] pl.my.MyContextLoaderListener.initWebApplicationContext(MyContextLoaderListener.java:30) 2015-03-26 09:27:57,353 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] org.springframework.web.context.ContextLoaderListener.contextInitialized(ContextLoaderListener.java:112) 2015-03-26 09:27:57,353 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:4728) 2015-03-26 09:27:57,353 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5162) 2015-03-26 09:27:57,353 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150) 2015-03-26 09:27:57,353 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:725) 2015-03-26 09:27:57,353 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:701) 2015-03-26 09:27:57,353 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] org.apache.catalina.core.StandardHost.addChild(StandardHost.java:717) 2015-03-26 09:27:57,353 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] org.apache.catalina.startup.HostConfig.deployWAR(HostConfig.java:917) 2015-03-26 09:27:57,353 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] org.apache.catalina.startup.HostConfig$DeployWar.run(HostConfig.java:1701) 2015-03-26 09:27:57,353 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471) 2015-03-26 09:27:57,353 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) 2015-03-26 09:27:57,353 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] java.util.concurrent.FutureTask.run(FutureTask.java:166) 2015-03-26 09:27:57,353 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110) 2015-03-26 09:27:57,354 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603) 2015-03-26 09:27:57,354 [myApp-startStop-1] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [CL] java.lang.Thread.run(Thread.java:722) 2015-03-26 09:30:23,419 [RMI TCP Connection(14)-172.17.14.64] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [DS] Thread name: RMI TCP Connection(14)-172.17.14.64.436 2015-03-26 09:30:23,419 [RMI TCP Connection(14)-172.17.14.64] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [DS] java.lang.Thread.getStackTrace(Thread.java:1567) 2015-03-26 09:30:23,419 [RMI TCP Connection(14)-172.17.14.64] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [DS] pl.my.MyDispatcherServlet.initWebApplicationContext(MyDispatcherServlet.java:28) 2015-03-26 09:30:23,419 [RMI TCP Connection(14)-172.17.14.64] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [DS] org.springframework.web.servlet.FrameworkServlet.initServletBean(FrameworkServlet.java:459) 2015-03-26 09:30:23,419 [RMI TCP Connection(14)-172.17.14.64] INFO org.apache.catalina.core.ContainerBase.[Catalina-myApp].[myApp].[/]- [DS] org.springframework.web.servlet.HttpServletBean.init(HttpServletBean.java:136) 2015-03-26 09:30:23,420 [RMI TCP Connection(14)-172.
Re: [VOTE] Release Apache Tomcat 7.0.60
On 26.3.2015 9:31, Violeta Georgieva wrote: The proposed 7.0.60 release is: [X] Broken - do not release [ ] Stable - go ahead and release as 7.0.60 Stable (non-binding vote) Tested .zip distribution on Windows 7 64-bit, Oracle JDK 1.8.0_40. Tested BIO and NIO connector option useServerCipherSuitesOrder="true": Throws exception with JDK 1.8.0_40, and that shouldn't happen: == ??? 26, 2015 1:46:56 PM org.apache.catalina.startup.VersionLoggerListener log INFO: Server version:Apache Tomcat/7.0.60 ... ??? 26, 2015 1:46:56 PM org.apache.catalina.startup.VersionLoggerListener log INFO: JVM Version: 1.8.0_40-b26 ... SEVERE: Failed to initialize end point associated with ProtocolHandler ["http-bio-443"] java.lang.UnsupportedOperationException: Java Runtime does not support "useServerCipherSuitesOrder". You must use Java 8 or later to use this feature. - I'm still investigating why this doesn't work as expected. -Ognjen - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Reg: Bug 56438
Hi Mark,
Sorry, I was on long vacation due to which I could not respond immediately
on bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=56438
*Below are my further observations on Tomcat7.0 trunk:*
1) As mentioned in bug, in Tomcat7.0 catalina.properties file first 4
default jars(except jdom.jar) are missing:
commons-discovery-*.jar,commons-el-*.jar,commons-net-*.jar
We can add them under
“tomcat.util.scan.DefaultJarScanner.jarsToSkip”
2) I observed that all the remaining jars are processed for TLDs
and Context configs.
When I add those jars under
“org.apache.catalina.startup.TldConfig.jarsToSkip” and
“org.apache.catalina.startup.ContextConfig.jarsToSkip” they are getting
skipped from processing.
3) 3) So I am planning to provide a fix as below for Tomcat 7.0
TLD scan:
*org.apache.catalina.startup.TldConfig.java à tldScanJar(JarURLConnection
jarConn) method à** introduce a Boolean variable called isTldFound as
below:* *boolean isTldFound = false;*
*Set this variable to true in below case(when tld found in jar):*
*if (entryName.startsWith("META-INF/") &&*
*entryName.endsWith(".tld")) {*
*isTldFound
= true;*
*After the while loop ends(processed all entries of jar), add
below code:*
*if(!isFound){*
* if (log.isDebugEnabled()) {*
*
log.info(sm.getString("tldConfig.noTldInJar",*
*
jarConn.getURL().toString()));*
*}*
* }*
Here tldConfig.noTldInJar = No TLD files were found in [{0}]. Consider
adding the JAR to the org.apache.catalina.startup.TldConfig.jarsToSkip
property in CATALINA_BASE/conf/catalina.properties file.
This message will be printed at FINE level. So unless user enables Debug
mode, he can not see the noTldInJar message.
This message was taken from 8.0 trunk.
*In Tomcat 8.0 trunk, we print a info Summary message to warn the user
saying “Atleast one jar was scanned …” Since in 8.0 both TLD and
ContextConfig are having two different approaches we can add that.*
But in Tomcat 7.0, StandardJarScanner.scan method only called from both
TldConfig.java and ContextConfig.java. So I am afraid I cannot add the
Summary message in Tomcat7.0. When User enables FINE level then only they
can see the noTldInJar messages
4) Tomcat7.0 ContextConfig scan is taking less time, hence I feel we can
ignore it for now.
Please let me know your opinion.
On Thu, Feb 26, 2015 at 12:59 AM, Mark Thomas wrote:
> On 25/02/2015 11:46, Pravallika Peddi wrote:
> > Hi Mark,
> >
> > More updates on bug 56438:
> >
> > I have downloaded all the jars mentioned in the issue
> > except(Protomatter.jar, openspml2-toolkit.jar, ha-jdbc.jar, db2jcc4.jar,
> > hazelcast.jar) and added import statements in my web application for
> these
> > jars.
> >
> > I have added couple of more log messages for my research purpose in trunk
> > code of 8.0.x and 7.0.x and observed that,
> >
> > With 8.0.x trunk:
> > 1) All Jars got scanned for PLUGGABILITY and TLD's.
>
> Are you sure? Check the metadata-complete setting of the app you are using.
>
> > 2) After Pluggability scan, i do not see any log message stating
> "Atleast
> > one jar was scanned having no fragments and it is unnecessary to scan
> this
> > jar". Not sure whether it is expected or not.
> >
> > 3) For TLD scan, i could see a message stating "Atleast one jar was
> > scanned without TLD's. Enable debug logging provides more details on
> which
> > jars got scanned for TLDs.". When i enable "Debug" mode, i could see
> > messages stating "No TLDS were found in file:jar path. Consider adding
> this
> > to the tomcat.util.scan.StandardJarScanFilter.jarsToSkip property in
> > CATALINA_BASE/conf/catalina.properties file".
> >
> > With 7.0.x trunk:
> > 1) All Jars got scanned for TLDs. Seems Pluggability scan was not there(I
> > did not find the code for it. Correct me if i am wrong)
>
> The code is there. Look in ContextConfig.
>
> > 2) Afetr TLD scan, I do not see any message stating "No TLDs were found
> in
> > a jar" even with debug mode enabled.
> >
> >
> > My action items based on your confirmation:
> >
> > For 8.0.x trunk:
> > 1) For Pluggability scan, add code in such a way that it prints "No
> > Fragments were found in Jar. Hence add it under some filter in
> > catalina.properties file to avoid future scanning.
> >
> > 2) For TLDs: Nothing is required.
> >
> > For 7.0.x trunk:
> > 1) For TLD scan, add proper log message as in 8.0.x trunk for TLD not
> found
> > jars.
> >
> > Please add your suggestions.
>
> That looks like a good place to start. The tricky bit will be how you
> mark a JAR as 'skippable'.
>
> Mark
>
>
> >
> > Regards,
> > Pravallika(VIN)
> >
> > On Mon, Feb 23, 2015 at 2:46 PM, Pravallika Peddi <
> reachme.va...@gmail.com>
> > wrote:
> >
>
Re: [VOTE] Release Apache Tomcat 7.0.60
On 26.3.2015 14:23, Ognjen Blagojevic wrote:
On 26.3.2015 9:31, Violeta Georgieva wrote:
The proposed 7.0.60 release is:
[X] Broken - do not release
[ ] Stable - go ahead and release as 7.0.60 Stable
...
I'm still investigating why this doesn't work as expected.
It was introduced in 1662994, in method
AbstractEndpoint.testServerCipherSuitesOrderSupport (reformatted for
clarity):
if (JreCompat.isJre8Available()) {
throw new UnsupportedOperationException(
sm.getString("endpoint.jsse.cannotHonorServerCipherOrder"));
Condition is wrong, it should throw exception only if Jre8 is NOT available:
if (!JreCompat.isJre8Available()) {
throw new UnsupportedOperationException(
sm.getString("endpoint.jsse.cannotHonorServerCipherOrder"));
-Ognjen
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.60
2015-03-26 15:40 GMT+02:00 Ognjen Blagojevic :
>
> On 26.3.2015 14:23, Ognjen Blagojevic wrote:
>>
>> On 26.3.2015 9:31, Violeta Georgieva wrote:
>>>
>>> The proposed 7.0.60 release is:
>>> [X] Broken - do not release
>>> [ ] Stable - go ahead and release as 7.0.60 Stable
>
> ...
>>
>> I'm still investigating why this doesn't work as expected.
>
>
> It was introduced in 1662994, in method
AbstractEndpoint.testServerCipherSuitesOrderSupport (reformatted for
clarity):
>
> if (JreCompat.isJre8Available()) {
> throw new UnsupportedOperationException(
> sm.getString("endpoint.jsse.cannotHonorServerCipherOrder"));
>
> Condition is wrong, it should throw exception only if Jre8 is NOT
available:
>
> if (!JreCompat.isJre8Available()) {
> throw new UnsupportedOperationException(
> sm.getString("endpoint.jsse.cannotHonorServerCipherOrder"));
>
I've just prepared a patch ;).
Index: AbstractEndpoint.java
===
--- AbstractEndpoint.java (revision 1669289)
+++ AbstractEndpoint.java (working copy)
@@ -654,7 +654,7 @@
private void testServerCipherSuitesOrderSupport() {
// Only test this feature if the user explicitly requested its use.
if(!"".equals(getUseServerCipherSuitesOrder().trim())) {
-if (JreCompat.isJre8Available()) {
+if (!JreCompat.isJre8Available()) {
throw new UnsupportedOperationException(
sm.getString("endpoint.jsse.cannotHonorServerCipherOrder"));
}
>
> -Ognjen
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
Re: [VOTE][CANCEL] Release Apache Tomcat 7.0.60
2015-03-26 10:31 GMT+02:00 Violeta Georgieva : > > The proposed Apache Tomcat 7.0.60 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.60/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1040/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_60/ > > The proposed 7.0.60 release is: > [X] Broken - do not release > [ ] Stable - go ahead and release as 7.0.60 Stable I'm canceling the vote in order to pickup the fix for ServerCipherSuitesOrder support. > Regards, > Violeta
[Tomcat Wiki] Update of "Security/Ciphers" by OgnjenBlagojevic
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "Security/Ciphers" page has been changed by OgnjenBlagojevic: https://wiki.apache.org/tomcat/Security/Ciphers?action=diff&rev1=3&rev2=4 Comment: Added link to mozilla wiki TLS. * Apache Tomcat 7.0.60-dev, r1664373. * Apache Tomcat 8.0.21-dev, r1664594. + + == APR/native == + + If APR/native connector is used (or if HTTPS connection is terminated at load balancer or reverse proxy utilizing OpenSSL library) cypher suites should be specified in OpenSSL format. Up-to-date selection of secure cipher suites is available at [[https://wiki.mozilla.org/Security/Server_Side_TLS|Mozilla wiki]]. + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r8447 - /dev/tomcat/tomcat-7/v7.0.60/
Author: violetagg Date: Thu Mar 26 14:04:45 2015 New Revision: 8447 Log: Tomcat 7.0.60 does not pass the vote Removed: dev/tomcat/tomcat-7/v7.0.60/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1669346 - in /tomcat/tc7.0.x/trunk: java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/changelog.xml
Author: violetagg Date: Thu Mar 26 14:09:05 2015 New Revision: 1669346 URL: http://svn.apache.org/r1669346 Log: Correct the check used for Java 8 JSSE server-preferred TLS cipher suite ordering. Patch provided by Ognjen Blagojevic. Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1669346&r1=1669345&r2=1669346&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Mar 26 14:09:05 2015 @@ -654,7 +654,7 @@ public abstract class AbstractEndpointhttp://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1669346&r1=1669345&r2=1669346&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar 26 14:09:05 2015 @@ -56,6 +56,14 @@ issues do not "pop up" wrt. others). --> + + + +Correct the check used for Java 8 JSSE server-preferred TLS cipher +suite ordering. Patch provided by Ognjen Blagojevic. (violetagg) + + + - 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.0.21
Am 23.03.2015 15:59, schrieb Mark Thomas: The proposed Apache Tomcat 8.0.21 release is now available for voting. The main changes since 8.0.20 are: - Enable Tomcat to detect when a WAR file has been changed while Tomcat is not running. - Add support for Java 8 JSSE server-preferred TLS cipher suite ordering. This feature requires Java 8. - Update to Tomcat Native Library version 1.1.33 to pick up the Windows binaries that are based on OpenSSL 1.0.1m and APR 1.5.1 - Implement a new feature for AJP connectors - Tomcat Authorization. If enabled Tomcat will take an authenticated user name from the AJP protocol and use the appropriate Realm for the request to authorize (i.e. add roles) to that user. There is also the usual collection of bug fixes, new features and performance improvements. For full details, see the changelog: http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.21/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1039/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_21/ The proposed 8.0.21 release is: [ ] Broken - do not release [x] Stable - go ahead and release as 8.0.21 (non binding) pgp, md5 and sha1 sums are ok. Started with OpenJDK Runtime Environment (IcedTea 2.4.8) (suse-24.17.1-x86_64) with linux 3.11. Tests were mostly ok, but failed in output/build/logs/TEST-org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.BIO.txt:Tests run: 1, Failures: 1, Errors: 0, Time elapsed: 7,939 sec output/build/logs/TEST-org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator.BIO.txt:Tests run: 2, Failures: 2, Errors: 0, Time elapsed: 9,282 se output/build/logs/TEST-org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.BIO.txt:Tests run: 2, Failures: 1, Errors: 1, Time elapsed: 7,751 sec output/build/logs/TEST-org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.BIO.txt:Tests run: 3, Failures: 3, Errors: 0, Time elapsed: 17,925 sec output/build/logs/TEST-org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.NIO.txt:Tests run: 1, Failures: 1, Errors: 0, Time elapsed: 8,152 sec output/build/logs/TEST-org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator.NIO.txt:Tests run: 2, Failures: 2, Errors: 0, Time elapsed: 8,783 sec output/build/logs/TEST-org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.NIO.txt:Tests run: 2, Failures: 1, Errors: 1, Time elapsed: 7,753 sec output/build/logs/TEST-org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.NIO.txt:Tests run: 3, Failures: 3, Errors: 0, Time elapsed: 17,842 sec output/build/logs/TEST-org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.NIO2.txt:Tests run: 1, Failures: 1, Errors: 0, Time elapsed: 8,167 sec output/build/logs/TEST-org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator.NIO2.txt:Tests run: 2, Failures: 2, Errors: 0, Time elapsed: 9,188 sec output/build/logs/TEST-org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.NIO2.txt:Tests run: 2, Failures: 1, Errors: 1, Time elapsed: 7,665 sec output/build/logs/TEST-org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector.NIO2.txt:Tests run: 3, Failures: 3, Errors: 0, Time elapsed: 17,834 sec 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
svn commit: r1669347 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: violetagg Date: Thu Mar 26 14:14:19 2015 New Revision: 1669347 URL: http://svn.apache.org/r1669347 Log: 7.0.60 marked as 'not released' 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=1669347&r1=1669346&r2=1669347&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar 26 14:14:19 2015 @@ -65,7 +65,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57762] WebSocket client doesn't detect forceful connection failures
https://bz.apache.org/bugzilla/show_bug.cgi?id=57762 palmer...@gmail.com changed: What|Removed |Added OS|Mac OS X 10.1 |Mac OS X 10.9 --- Comment #3 from palmer...@gmail.com --- For reference, I tested on Mac OS X 10.10.2 and Java 1.8.0_40. I haven't had a chance to check if there is a JVM issue. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1669349 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_61: ./ build.properties.default
Author: violetagg Date: Thu Mar 26 14:26:14 2015 New Revision: 1669349 URL: http://svn.apache.org/r1669349 Log: Tag 7.0.61 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_61/ (props changed) - copied from r1669348, tomcat/tc7.0.x/trunk/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_61/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_61/ -- bugtraq:append = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_61/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_61/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Mar 26 14:26:14 2015 @@ -0,0 +1,2 @@ +(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+) +(\d+) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_61/ -- bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_61/ -- bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_61/ -- --- svn:ignore (added) +++ svn:ignore Thu Mar 26 14:26:14 2015 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_61/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Mar 26 14:26:14 2015 @@ -0,0 +1,2 @@ +/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,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,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 +/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1
Re: [VOTE][CANCEL] Release Apache Tomcat 7.0.60
Violeta, On 26.3.2015 14:57, Violeta Georgieva wrote: I'm canceling the vote in order to pickup the fix for ServerCipherSuitesOrder support. Could you, please wait until I test if everything is Ok with 7.0.x, before you put 7.0.61 on voting? -Ognjen - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE][CANCEL] Release Apache Tomcat 7.0.60
2015-03-26 16:36 GMT+02:00 Ognjen Blagojevic : > > Violeta, > > On 26.3.2015 14:57, Violeta Georgieva wrote: >> >> I'm canceling the vote in order to pickup the fix for ServerCipherSuitesOrder >> support. > > > Could you, please wait until I test if everything is Ok with 7.0.x, before you put 7.0.61 on voting? OK > > -Ognjen > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
buildbot exception in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a build exception on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/594 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1669347 Blamelist: violetagg BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1669353 - in /tomcat/trunk: java/org/apache/tomcat/websocket/WsWebSocketContainer.java test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java test/org/apache/tomcat/websocket/Test
Author: remm
Date: Thu Mar 26 15:28:55 2015
New Revision: 1669353
URL: http://svn.apache.org/r1669353
Log:
57761: Avoid using an empty path in the HTTP request when the websocket client
connects to a server root.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
tomcat/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1669353&r1=1669352&r2=1669353&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Thu
Mar 26 15:28:55 2015
@@ -501,7 +501,10 @@ public class WsWebSocketContainer implem
// Request line
result.put("GET ".getBytes(StandardCharsets.ISO_8859_1));
-result.put(uri.getRawPath().getBytes(StandardCharsets.ISO_8859_1));
+byte[] path = (null == uri.getPath() || "".equals(uri.getPath()))
+? "/".getBytes(StandardCharsets.ISO_8859_1)
+: uri.getRawPath().getBytes(StandardCharsets.ISO_8859_1);
+result.put(path);
String query = uri.getRawQuery();
if (query != null) {
result.put((byte) '?');
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1669353&r1=1669352&r2=1669353&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
Thu Mar 26 15:28:55 2015
@@ -80,4 +80,55 @@ public class TestWebSocketFrameClient ex
}
}
+@Test
+public void testConnectToRootEndpoint() throws Exception {
+
+Tomcat tomcat = getTomcatInstance();
+// No file system docBase required
+Context ctx = tomcat.addContext("", null);
+ctx.addApplicationListener(TesterEchoServer.Config.class.getName());
+Tomcat.addServlet(ctx, "default", new DefaultServlet());
+ctx.addServletMapping("/", "default");
+Context ctx2 = tomcat.addContext("/foo", null);
+ctx2.addApplicationListener(TesterEchoServer.Config.class.getName());
+Tomcat.addServlet(ctx2, "default", new DefaultServlet());
+ctx2.addServletMapping("/", "default");
+
+tomcat.start();
+
+echoTester("");
+echoTester("/");
+// FIXME: The ws client doesn't handle any response other than the
upgrade,
+// which may or may not be allowed. In that case, the server will
return
+// a redirect to the root of the webapp to avoid possible broken
relative
+// paths.
+// echoTester("/foo");
+echoTester("/foo/");
+}
+
+public void echoTester(String path) throws Exception {
+WebSocketContainer wsContainer =
+ContainerProvider.getWebSocketContainer();
+ClientEndpointConfig clientEndpointConfig =
+ClientEndpointConfig.Builder.create().build();
+Session wsSession = wsContainer.connectToServer(
+TesterProgrammaticEndpoint.class,
+clientEndpointConfig,
+new URI("ws://localhost:" + getPort() + path));
+CountDownLatch latch =
+new CountDownLatch(1);
+BasicText handler = new BasicText(latch);
+wsSession.addMessageHandler(handler);
+wsSession.getBasicRemote().sendText("Hello");
+
+handler.getLatch().await(100, TimeUnit.MILLISECONDS);
+
+Queue messages = handler.getMessages();
+Assert.assertEquals(1, messages.size());
+for (String message : messages) {
+Assert.assertEquals("Hello", message);
+}
+wsSession.close();
+}
+
}
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java?rev=1669353&r1=1669352&r2=1669353&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java Thu Mar
26 15:28:55 2015
@@ -51,6 +51,7 @@ public class TesterEchoServer {
sc.addEndpoint(BasicLimitLow.class);
sc.addEndpoint(BasicLimitHigh.class);
sc.addEndpoint(WriterError.class);
+sc.addEndpoint(RootEcho.class)
[Bug 57761] WebSocket client won't connect to URLs that don't end in a slash (/)
https://bz.apache.org/bugzilla/show_bug.cgi?id=57761 --- Comment #4 from Remy Maucherat --- The empty path in the request line is fixed in r1669353 in trunk, but I also verified that the websocket client cannot handle anything other than an upgrade response, so the same test adapted to a webapp root will fail to process the redirect response. I don't think it is required that the websocket client is a competent HTTP client, so maybe this bz can be transformed into a more generic enhancement. I don't think the fix is very useful "standalone" without client enhancements so no plan for porting it. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1669370 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Author: markt
Date: Thu Mar 26 16:45:15 2015
New Revision: 1669370
URL: http://svn.apache.org/r1669370
Log:
Use constants for constant byte arrays.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1669370&r1=1669369&r2=1669370&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Thu
Mar 26 16:45:15 2015
@@ -70,11 +70,15 @@ import org.apache.tomcat.websocket.pojo.
public class WsWebSocketContainer implements WebSocketContainer,
BackgroundProcess {
-private static final StringManager sm =
-StringManager.getManager(WsWebSocketContainer.class);
+private static final StringManager sm =
StringManager.getManager(WsWebSocketContainer.class);
private static final Random random = new Random();
private static final byte[] crlf = new byte[] {13, 10};
+private static final byte[] GET_BYTES = "GET
".getBytes(StandardCharsets.ISO_8859_1);
+private static final byte[] ROOT_URI_BYTES =
"/".getBytes(StandardCharsets.ISO_8859_1);
+private static final byte[] HTTP_VERSION_BYTES =
+" HTTP/1.1\r\n".getBytes(StandardCharsets.ISO_8859_1);
+
private volatile AsynchronousChannelGroup asynchronousChannelGroup = null;
private final Object asynchronousChannelGroupLock = new Object();
@@ -500,17 +504,16 @@ public class WsWebSocketContainer implem
ByteBuffer result = ByteBuffer.allocate(4 * 1024);
// Request line
-result.put("GET ".getBytes(StandardCharsets.ISO_8859_1));
+result.put(GET_BYTES);
byte[] path = (null == uri.getPath() || "".equals(uri.getPath()))
-? "/".getBytes(StandardCharsets.ISO_8859_1)
-: uri.getRawPath().getBytes(StandardCharsets.ISO_8859_1);
+? ROOT_URI_BYTES :
uri.getRawPath().getBytes(StandardCharsets.ISO_8859_1);
result.put(path);
String query = uri.getRawQuery();
if (query != null) {
result.put((byte) '?');
result.put(query.getBytes(StandardCharsets.ISO_8859_1));
}
-result.put(" HTTP/1.1\r\n".getBytes(StandardCharsets.ISO_8859_1));
+result.put(HTTP_VERSION_BYTES);
// Headers
Iterator>> iter =
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1081 Buildbot URL: http://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] 1669370 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1080 Buildbot URL: http://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] 1669353 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
[Tomcat Wiki] Trivial Update of "Security/Ciphers" by ChristopherSchultz
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "Security/Ciphers" page has been changed by ChristopherSchultz: https://wiki.apache.org/tomcat/Security/Ciphers?action=diff&rev1=4&rev2=5 Comment: Added links. Fixed grammar and spelling. == APR/native == - If APR/native connector is used (or if HTTPS connection is terminated at load balancer or reverse proxy utilizing OpenSSL library) cypher suites should be specified in OpenSSL format. Up-to-date selection of secure cipher suites is available at [[https://wiki.mozilla.org/Security/Server_Side_TLS|Mozilla wiki]]. + If APR/native connector is used (or if HTTPS connection is terminated at a load balancer or reverse proxy utilizing the OpenSSL library), cipher suites should be specified in [[https://www.openssl.org/docs/apps/ciphers.html|OpenSSL format]]. Up-to-date selection of secure cipher suites is available at [[https://wiki.mozilla.org/Security/Server_Side_TLS|Mozilla wiki]]. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1669430 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Author: markt
Date: Thu Mar 26 20:38:29 2015
New Revision: 1669430
URL: http://svn.apache.org/r1669430
Log:
Cleanup/simplify
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1669430&r1=1669429&r2=1669430&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Thu
Mar 26 20:38:29 2015
@@ -499,15 +499,16 @@ public class WsWebSocketContainer implem
}
-private ByteBuffer createRequest(URI uri,
-Map> reqHeaders) {
+private ByteBuffer createRequest(URI uri, Map>
reqHeaders) {
ByteBuffer result = ByteBuffer.allocate(4 * 1024);
// Request line
result.put(GET_BYTES);
-byte[] path = (null == uri.getPath() || "".equals(uri.getPath()))
-? ROOT_URI_BYTES :
uri.getRawPath().getBytes(StandardCharsets.ISO_8859_1);
-result.put(path);
+if (null == uri.getPath() || "".equals(uri.getPath())) {
+result.put(ROOT_URI_BYTES);
+} else {
+result.put(uri.getRawPath().getBytes(StandardCharsets.ISO_8859_1));
+}
String query = uri.getRawQuery();
if (query != null) {
result.put((byte) '?');
@@ -516,8 +517,7 @@ public class WsWebSocketContainer implem
result.put(HTTP_VERSION_BYTES);
// Headers
-Iterator>> iter =
-reqHeaders.entrySet().iterator();
+Iterator>> iter =
reqHeaders.entrySet().iterator();
while (iter.hasNext()) {
Entry> entry = iter.next();
addHeader(result, entry.getKey(), entry.getValue());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1669432 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsWebSocketContainer.java test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java test/org/apache/tomcat/web
Author: markt Date: Thu Mar 26 20:53:01 2015 New Revision: 1669432 URL: http://svn.apache.org/r1669432 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57761 Avoid using an empty path in the HTTP request when the websocket client connects to a server root. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 26 20:53:01 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,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,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,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-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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
svn commit: r1669434 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Author: markt Date: Thu Mar 26 20:55:57 2015 New Revision: 1669434 URL: http://svn.apache.org/r1669434 Log: Use constants for constant byte arrays. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 26 20:55:57 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,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,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,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-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,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 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,164647
svn commit: r1669435 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsWebSocketContainer.java test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java test/org/apache/tomcat/web
Author: markt Date: Thu Mar 26 20:59:59 2015 New Revision: 1669435 URL: http://svn.apache.org/r1669435 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57761 Avoid using an empty path in the HTTP request when the websocket client connects to a server root. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 26 20:59:59 2015 @@ -1,2 +1,2 @@ -/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,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,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 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1 352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,135
[Bug 57761] WebSocket client won't connect to URLs that don't end in a slash (/)
https://bz.apache.org/bugzilla/show_bug.cgi?id=57761 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #5 from Mark Thomas --- I haven't seen any demand (yet) for handling a redirect. Lets cross that bridge if we come to it. I've backported your fix to 8.0.x (for 8.0.22 onwards) and 7.0.x (for 7.0.61 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
[VOTE][RESULT] Release Apache Tomcat 8.0.21
The following votes were case: Binding: +1: jfarcand, markt, jboynes, violetagg, remm, schultz, Non-binding: +1: Ognjen Blagojevic, mgrigorov, fschumacher The vote therefore passes. Thank you to everyone who took the time to test this RC. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r8454 - /dev/tomcat/tomcat-8/v8.0.21/ /release/tomcat/tomcat-8/v8.0.21/
Author: markt Date: Thu Mar 26 21:22:16 2015 New Revision: 8454 Log: Release 8.0.21 Added: release/tomcat/tomcat-8/v8.0.21/ - copied from r8453, dev/tomcat/tomcat-8/v8.0.21/ Removed: dev/tomcat/tomcat-8/v8.0.21/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1669445 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Mar 26 21:26:54 2015 New Revision: 1669445 URL: http://svn.apache.org/r1669445 Log: 8.0.21 vote passed. Update release date. 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=1669445&r1=1669444&r2=1669445&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Mar 26 21:26:54 2015 @@ -66,7 +66,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57736] changes from Tomcat 7 to Tomcat 8 causing problems
https://bz.apache.org/bugzilla/show_bug.cgi?id=57736 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|REOPENED|RESOLVED --- Comment #11 from Mark Thomas --- Just to be clear, the URLs for WAR resources fix will be in 8.0.22 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1669451 - /tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
Author: markt
Date: Thu Mar 26 21:48:00 2015
New Revision: 1669451
URL: http://svn.apache.org/r1669451
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57752
Exclude non-cached resources from Cache statistics.
Patch by Adam Mlodzinski
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
Modified: tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/Cache.java?rev=1669451&r1=1669450&r2=1669451&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/Cache.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/Cache.java Thu Mar 26
21:48:00 2015
@@ -59,12 +59,12 @@ public class Cache {
protected WebResource getResource(String path, boolean
useClassLoaderResources) {
-lookupCount.incrementAndGet();
-
if (noCache(path)) {
return root.getResourceInternal(path, useClassLoaderResources);
}
+lookupCount.incrementAndGet();
+
CachedResource cacheEntry = resourceCache.get(path);
if (cacheEntry != null &&
!cacheEntry.validateResource(useClassLoaderResources)) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1669453 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/webresources/Cache.java webapps/docs/changelog.xml
Author: markt Date: Thu Mar 26 21:50:28 2015 New Revision: 1669453 URL: http://svn.apache.org/r1669453 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57752 Exclude non-cached resources from the Cache statistics for resource lookups. Patch provided by Adam Mlodzinski. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/Cache.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 26 21:50:28 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,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,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,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-1666387,1666494,1666496,1666552,1666569,1666579,137,1 49,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 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1645
[Bug 57752] WebResources Cache 'lookupCount' counts non-lookups
https://bz.apache.org/bugzilla/show_bug.cgi?id=57752 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Thanks for the report, the spot-on analysis and the patch. I agree the first option is beter. Your patch has been applied to trunk and to 8.0.x for 8.0.22 onwards. Thanks again. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57753] Single sign on returns null for getRemoteUser when accessing insecure page
https://bz.apache.org/bugzilla/show_bug.cgi?id=57753 Mark Thomas changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #3 from Mark Thomas --- I agree that the current code is working as designed so there is nothing to do here. One thins you may like to look at is the use of the preemptiveAuthentication option on the Context. This will trigger authentication for non-protected resources assuming that the request includes the necessary credentials. -- 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 success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1082 Buildbot URL: http://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] 1669430 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/595 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1669435 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
[Bug 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors [PATCH]
https://bz.apache.org/bugzilla/show_bug.cgi?id=55988 Ognjen Blagojevic changed: What|Removed |Added Resolution|FIXED |--- Status|RESOLVED|REOPENED --- Comment #21 from Ognjen Blagojevic --- Refactoring in r1662994 broke the support for 7.0.x. It introduced several issues: 1. Inverted if condition in AbstractEndpoint.testServerCipherSuitesOrderSupport (fixed in r1669346). 2. Steps in AbstractEndpoint.configureUseServerCipherSuitesOrder: (a) SSLParameters sslParameters = engine.getSSLParameters(); (b) sslParameters.setUseCipherSuitesOrder(boolean) (c) engine.setSSLParamters(sllParameters) were refactored omitting step (c). 3. Steps in JSSESocketFactory.configureUseServerCipherSuitesOrder: (a) SSLParameters sslParameters = socket.getSSLParameters(); (b) sslParameters.setUseCipherSuitesOrder(boolean) (c) socket.setSSLParamters(sllParameters) were refactored omitting step (c). I'm preparing the patch for issues 2. and 3. -Ognjen -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors [PATCH]
https://bz.apache.org/bugzilla/show_bug.cgi?id=55988 --- Comment #22 from Ognjen Blagojevic --- Created attachment 32611 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32611&action=edit Patch to add setters for SSLParameters -- 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
Re: [VOTE][CANCEL] Release Apache Tomcat 7.0.60
Violetta, On 26.3.2015 15:43, Violeta Georgieva wrote: 2015-03-26 16:36 GMT+02:00 Ognjen Blagojevic : Violeta, On 26.3.2015 14:57, Violeta Georgieva wrote: I'm canceling the vote in order to pickup the fix for ServerCipherSuitesOrder support. Could you, please wait until I test if everything is Ok with 7.0.x, before you put 7.0.61 on voting? OK Thank you. I found two more bugs that broke cipher suites ordering in 7.0.x. They are described in issue 55988, and the patch 32611 that resolves them is attached to that issue. -Ognjen - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-native-make (in module tomcat-native) failed
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-native-make has an issue affecting its community integration. This issue affects 5 projects, and has been outstanding for 4 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-native-make : Tomcat native library using Apache Portable Runtime - tomcat-native-make-install : Tomcat native library using Apache Portable Runtime - tomcat-tc7.0.x-test-apr : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... - tomcat-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-make/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 The following work was performed: http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-make/gump_work/build_tomcat-native_tomcat-native-make.html Work Name: build_tomcat-native_tomcat-native-make (Type: Build) Work ended in a state of : Failed Elapsed: 10 secs Command Line: make [Working Directory: /srv/gump/public/workspace/tomcat-native/native] - make[1]: Entering directory `/srv/gump/public/workspace/tomcat-native/native' /bin/bash /srv/gump/public/workspace/apr-1/dest-20150327/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl/dest-20150327/include -I/srv/gump/public/workspace/apr-1/dest-20150327/include/apr-1 -o src/address.lo -c src/address.c && touch src/address.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20150327/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl/dest-20150327/include -I/srv/gump/public/workspace/apr-1/dest-20150327/include/apr-1 -o src/bb.lo -c src/bb.c && touch src/bb.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20150327/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl/dest-20150327/include -I/srv/gump/public/workspace/apr-1/dest-20150327/include/apr-1 -o src/dir.lo -c src/dir.c && touch src/dir.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20150327/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl/dest-20150327/include -I/srv/gump/public/workspace/apr-1/dest-20150327/include/apr-1 -o src/error.lo -c src/error.c && touch src/error.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20150327/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl/dest-20150327/include -I/srv/gump/public/workspace/apr-1/dest-20150327/include/apr-1 -o src/file.lo -c src/file.c && touch src/file.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20150327/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl/dest-20150327/include -I/srv/gump/public/workspace/apr-1/dest-20150327/include/apr-1 -o src/info.lo -c src/info.c && touch src/info.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20150327/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed
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.0.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.0.x-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 30 mins 46 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only 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 -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150327-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150327.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150327-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150327/bin /openssl -Dexecute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.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.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.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.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu ild/lib/tomcat-spdy
svn commit: r1669496 - /tomcat/native/trunk/native/src/sslinfo.c
Author: rjung
Date: Fri Mar 27 03:08:44 2015
New Revision: 1669496
URL: http://svn.apache.org/r1669496
Log:
Replace access to OpenSSL SSL internals
by accessor function. Internals are no longer
available for OpenSSL master.
Not tested, waiting for GUMP.
Modified:
tomcat/native/trunk/native/src/sslinfo.c
Modified: tomcat/native/trunk/native/src/sslinfo.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslinfo.c?rev=1669496&r1=1669495&r2=1669496&view=diff
==
--- tomcat/native/trunk/native/src/sslinfo.c (original)
+++ tomcat/native/trunk/native/src/sslinfo.c Fri Mar 27 03:08:44 2015
@@ -180,15 +180,16 @@ static char *lookup_ssl_cert_dn(X509_NAM
for (j = 0; j < X509_NAME_entry_count(xsname); j++) {
xsne = X509_NAME_get_entry(xsname, j);
-n = OBJ_obj2nid((ASN1_OBJECT
*)X509_NAME_ENTRY_get_object(xsne));
+n = OBJ_obj2nid(X509_NAME_ENTRY_get_object(xsne));
if (n == info_cert_dn_rec[i].nid && idx-- == 0) {
-result = malloc(xsne->value->length + 1);
-memcpy(result, xsne->value->data,
- xsne->value->length);
-result[xsne->value->length] = '\0';
+ASN1_STRING *adata = X509_NAME_ENTRY_get_data(xsne);
+int len = ASN1_STRING_length(adata);
+result = malloc(len + 1);
+memcpy(result, ASN1_STRING_data(adata), len);
+result[len] = '\0';
#if APR_CHARSET_EBCDIC
-ap_xlate_proto_from_ascii(result, xsne->value->length);
+ap_xlate_proto_from_ascii(result, len);
#endif /* APR_CHARSET_EBCDIC */
break;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1669497 - in /tomcat/native/branches/1.1.x: ./ native/src/sslinfo.c
Author: rjung
Date: Fri Mar 27 03:09:52 2015
New Revision: 1669497
URL: http://svn.apache.org/r1669497
Log:
Replace access to OpenSSL SSL internals
by accessor function. Internals are no longer
available for OpenSSL master.
Not tested, waiting for GUMP.
Backport of r1669496 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/sslinfo.c
Propchange: tomcat/native/branches/1.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 27 03:09:52 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302
+/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/src/sslinfo.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslinfo.c?rev=1669497&r1=1669496&r2=1669497&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslinfo.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslinfo.c Fri Mar 27 03:09:52 2015
@@ -180,15 +180,16 @@ static char *lookup_ssl_cert_dn(X509_NAM
for (j = 0; j < X509_NAME_entry_count(xsname); j++) {
xsne = X509_NAME_get_entry(xsname, j);
-n = OBJ_obj2nid((ASN1_OBJECT
*)X509_NAME_ENTRY_get_object(xsne));
+n = OBJ_obj2nid(X509_NAME_ENTRY_get_object(xsne));
if (n == info_cert_dn_rec[i].nid && idx-- == 0) {
-result = malloc(xsne->value->length + 1);
-memcpy(result, xsne->value->data,
- xsne->value->length);
-result[xsne->value->length] = '\0';
+ASN1_STRING *adata = X509_NAME_ENTRY_get_data(xsne);
+int len = ASN1_STRING_length(adata);
+result = malloc(len + 1);
+memcpy(result, ASN1_STRING_data(adata), len);
+result[len] = '\0';
#if APR_CHARSET_EBCDIC
-ap_xlate_proto_from_ascii(result, xsne->value->length);
+ap_xlate_proto_from_ascii(result, len);
#endif /* APR_CHARSET_EBCDIC */
break;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) failed
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-tc7.0.x-test-bio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 10 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-bio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 24 mins 17 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only 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 -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150327-native-src.tar.gz -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150327-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150327.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtest.excludePerformance=true -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/pub lic/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=true -Dexecute.test.nio=false -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20150327.jar -Dtest.temp=output/test-tmp-BIO -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.
[Bug 57765] New: autodeploy sometimes fails to redeploy the latest war
https://bz.apache.org/bugzilla/show_bug.cgi?id=57765 Bug ID: 57765 Summary: autodeploy sometimes fails to redeploy the latest war Product: Tomcat 7 Version: 7.0.56 Hardware: PC OS: All Status: NEW Severity: major Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: alex.henev...@cloudsoftcorp.com if a war file is updated multiple times within a 1s window the autodeployment logic may fail to deploy the latest war. this is particularly a problem if doing something like wget to install a war directly to the webapps directory. it may fail (because the zip is invalid) but then not retry when the download completes (presumably because the file timestamp is not different to the failed timestamp, even though the file *is* different.) for example, try the following script: while [ true ] ; do curl http://path/to/large/sample.war -o sample.war sleep 15 if [ ! -d sample ] ; then exit ; fi done with the sleep 15, tomcat should be guaranteed to unpack the war (running with its default 10s detect audodeployment files). however this script usually fails one in 20 times with a sufficiently large war file (where download time is >5s). in such cases the last autodeployment attempt logs an invalid zip, there is no subsequent autodeployment, and the timestamp of the completed (valid) download is identical to the log timestamp of the failed autodeployment, at least to a one-second resolution (common on filesystems). what i suspect is happening is, for example: 00:00:00.100 sample.war is partially written 00:00:00.200 autodeployment is attempted, and fails 00:00:00.300 sample.war is completely written 00:00:10.200 subsequent autodeployment cycle does not attempt re-deployment i suspect that at time 00:00:00.200, when the deployment fails, it records a "last update" timestamp. 10 seconds later it checks the timestamp of the file on disk, which will be 00:00:00 (note no milliseconds) which is not later than the "last update" timestamp and so it incorrectly skips the redeployment. this could probably also result in the following situation 00:00:00.100 sample.war v1 is written 00:00:00.200 autodeployment is done 00:00:00.300 sample.war v2 is written 00:00:10.200 subsequent autodeployment cycle does not attempt re-deployment and so v1 is deployed even though v2 was subsequently written. i suggest that autodeployment should wait for files to stabilise, i.e. skipping any file updated within the 1s window immediately prior to autodeployment (and ensuring that it is picked up on the next autodeployment cycle, unless it is still being changed). there are workarounds: * download to a tmp directory then atomically `mv` the file to the webapps directory upon completion * use the manager webapp instead of autodeployment but it would be nice to fix this so that autodeployment works as advertised (and i think the fix sketched here should be fairly straightforward). -- 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
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed
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-tc7.0.x-test-nio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 16 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-nio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 25 mins 18 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only 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 -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150327-native-src.tar.gz -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150327-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150327.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtest.excludePerformance=true -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/pub lic/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.nio=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20150327.jar -Dtest.temp=output/test-tmp-NIO -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.
