Adding tomcat to HTTP/2 implementation list

[Huxing Zhang]

Hi, 

I am planing to add tomcat to the list of known HTTP/2 implementation:
https://github.com/http2/http2-spec/wiki/Implementations

Before committing, I would like to confirm with you guys:

Name: Apache Tomcat 8.5+(http://tomcat.apache.org/)
Language:   Java
role(s): Server
negotiation(s): ALPN, Upgrade
protocol id(s): h2, h2c

The main concern is whether direct negotiation is supported or not. 
IMO the direct negotiation is not supported.

Is that information correct?

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

[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

[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-trunk-validate has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 6 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 4 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 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.8-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/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/checkstyle/target/checkstyle-5.8-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20160419.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.5-SNAPSHOT.jar
 
:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20160419.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20160419.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-19.0-SNAPSHOT.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

build-prepare:
   [delete] Deleting directory 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp

compile-prepare:

download-validate:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/checkstyle/target/checkstyle-5.8-SNAPSHOT.jar

setproxy:

downloadfile:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:554: Unable to create a 
Checker: Property 'cacheFile' in module Checker does not exist, please check 
the documentation

Total time: 4 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 2016041906, vmgump.apache.org:vmgump:2016041906
Gump E-mail Identifier (unique within run) #8.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

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

[GUMP@vmgump]: Project tomcat-native-trunk-make (in module tomcat-native-trunk) failed

[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-trunk-make has an issue affecting its community 
integration.
This issue affects 3 projects,
 and has been outstanding for 8 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-trunk-make :  Tomcat native library using Apache Portable 
Runtime
- tomcat-native-trunk-make-install :  Tomcat native library using Apache 
Portable Runtime
- 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-trunk/tomcat-native-trunk-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-trunk/tomcat-native-trunk-make/gump_work/build_tomcat-native-trunk_tomcat-native-trunk-make.html
Work Name: build_tomcat-native-trunk_tomcat-native-trunk-make (Type: Build)
Work ended in a state of : Failed
Elapsed: 18 secs
Command Line: make 
[Working Directory: /srv/gump/public/workspace/tomcat-native-trunk/native]
-
 #define AJP_TO_JSTRING(V)   (*e)->NewStringUTF((e), (V))
  ^
src/ssl.c: In function 'ssl_init_cleanup':
src/ssl.c:355:5: error: too few arguments to function 'ERR_remove_thread_state'
 ERR_remove_thread_state();
 ^
In file included from 
/srv/gump/public/workspace/tomcat-native-trunk/native/include/ssl_private.h:39:0,
 from src/ssl.c:24:
/srv/gump/public/workspace/openssl-master/dest-20160419/include/openssl/err.h:349:6:
 note: declared here
 void ERR_remove_thread_state(const CRYPTO_THREADID *tid);
  ^
src/ssl.c: In function 'SSL_BIO_close':
src/ssl.c:895:9: warning: cast to pointer from integer of different size 
[-Wint-to-pointer-cast]
 j = (BIO_JAVA *)BIO_get_data(bi);
 ^
src/ssl.c: In function 'SSL_BIO_doref':
src/ssl.c:914:9: warning: cast to pointer from integer of different size 
[-Wint-to-pointer-cast]
 j = (BIO_JAVA *)BIO_get_data(bi);
 ^
src/ssl.c: In function 'jbs_free':
src/ssl.c:948:9: warning: cast to pointer from integer of different size 
[-Wint-to-pointer-cast]
 j = (BIO_JAVA *)BIO_get_data(bi);
 ^
src/ssl.c: In function 'jbs_write':
src/ssl.c:966:23: warning: cast to pointer from integer of different size 
[-Wint-to-pointer-cast]
 BIO_JAVA *j = (BIO_JAVA *)BIO_get_data(b);
   ^
src/ssl.c: In function 'jbs_read':
src/ssl.c:992:23: warning: cast to pointer from integer of different size 
[-Wint-to-pointer-cast]
 BIO_JAVA *j = (BIO_JAVA *)BIO_get_data(b);
   ^
src/ssl.c: In function 'jbs_puts':
src/ssl.c:1019:23: warning: cast to pointer from integer of different size 
[-Wint-to-pointer-cast]
 BIO_JAVA *j = (BIO_JAVA *)BIO_get_data(b);
   ^
src/ssl.c: In function 'jbs_gets':
src/ssl.c:1033:23: warning: cast to pointer from integer of different size 
[-Wint-to-pointer-cast]
 BIO_JAVA *j = (BIO_JAVA *)BIO_get_data(b);
   ^
src/ssl.c: In function 'init_bio_methods':
src/ssl.c:1085:17: warning: assignment makes pointer from integer without a 
cast [enabled by default]
 jbs_methods = BIO_meth_new(BIO_TYPE_FILE, "Java Callback");
 ^
src/ssl.c: In function 'Java_org_apache_tomcat_jni_SSL_newBIO':
src/ssl.c:1123:9: warning: cast to pointer from integer of different size 
[-Wint-to-pointer-cast]
 j = (BIO_JAVA *)BIO_get_data(bio);
 ^
make[1]: *** [src/ssl.lo] Error 1
make[1]: Leaving directory 
`/srv/gump/public/workspace/tomcat-native-trunk/native'
make: *** [all-recursive] Error 1
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-native-trunk/tomcat-native-trunk-make/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-native-trunk/tomcat-native-trunk-make/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 2016041906, vmgump.apache.org:vmgump:2016041906
Gump E-mail Identifier (unique within run) #3.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

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

[Bug 59219] AsyncListener#onError not called on exception during async processing

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=59219

--- Comment #4 from Konstantin Kolinko  ---
(In reply to Mark Thomas from comment #3)
> - 6.0.x for 6.0.46 onwards

Scratch the above one.
Tomcat 6 was not affected by this fix.

AsyncListener is a feature of Servlet 3.0 API / Tomcat 7 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

[Bug 59219] AsyncListener#onError not called on exception during async processing

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=59219

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #3 from Mark Thomas  ---
Backports complete.
- 8.5.x for 8.5.1 onwards
- 8.0.x for 8.0.34 onwards
- 7.0.x for 7.0.70 onwards
- 6.0.x for 6.0.46 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: r1739822 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/ErrorReportValve.java java/org/apache/coyote/AsyncStateMachine.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Apr 18 21:07:13 2016
New Revision: 1739822

URL: http://svn.apache.org/viewvc?rev=1739822=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59219
Ensure AsyncListener.onError() is called if an Exception is thrown during async 
processing.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 21:07:13 2016
@@ -1,3 +1,3 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1
 
726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777

svn commit: r1739821 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/valves/ErrorReportValve.java java/org/apache/coyote/AsyncStateMachine.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Apr 18 20:54:46 2016
New Revision: 1739821

URL: http://svn.apache.org/viewvc?rev=1739821=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59219
Ensure AsyncListener.onError() is called if an Exception is thrown during async 
processing.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 20:54:46 2016
@@ -1,2 +1,2 @@
 /tomcat/tc8.5.x/trunk:1735042,1737966
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 

svn commit: r1739819 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/valves/ErrorReportValve.java java/org/apache/coyote/AsyncStateMachine.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Apr 18 20:43:03 2016
New Revision: 1739819

URL: http://svn.apache.org/viewvc?rev=1739819=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59219
Ensure AsyncListener.onError() is called if an Exception is thrown during async 
processing.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 20:43:03 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1739819=1739818=1739819=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java 
Mon Apr 18 20:43:03 2016
@@ -98,9 +98,15 @@ public class ErrorReportValve extends Va
 Throwable throwable = (Throwable) 
request.getAttribute(RequestDispatcher.ERROR_EXCEPTION);
 
 // If an async request is in progress and is not going to end once this
-// container thread finishes, do not trigger error page handling - it
-// will be triggered later if required.
+// container thread finishes, do not process any error page here.
 if (request.isAsync() && !request.isAsyncCompleting()) {
+// If an async dispatch is in progress the error handling in the
+// CoyoteAdapter will trigger the necessary processing. It is only
+// necessary to trigger it here if async is starting (i.e. this is
+// the post-processing of the service() method)
+if (throwable != null && request.isAsyncDispatching()) {
+request.getAsyncContextInternal().setErrorState(throwable, 
true);
+}
 return;
 }
 

Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1739819=1739818=1739819=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8] 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8] 
Mon Apr 18 20:43:03 2016
@@ -52,24 +52,27 @@ import org.apache.tomcat.util.security.P
  * DISPATCHING   - The dispatch is being processed.
  * ERROR - Something went wrong.
  *
- * |-»--|
- * |   \|/
- * |   
|--«---ERROR---«---|
- * |   |  complete()   \   
   |
- * |   |\---|  
   |
- * |   ||dispatch()
   |
- * |   |   \|/ 
   |
- * |   ||  
   |
- * |   |

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

[markt]

Author: markt
Date: Mon Apr 18 20:38:49 2016
New Revision: 1739818

URL: http://svn.apache.org/viewvc?rev=1739818=rev
Log:
Update changelog

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

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1739818=1739817=1739818=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Apr 18 20:38:49 2016
@@ -80,6 +80,10 @@
 (violetagg)
   
   
+59219: Ensure AsyncListener.onError() is called
+if an Exception is thrown during async processing. (markt)
+  
+  
 59255: Fix possible NPE in mapper. (kkolinko/remm)
   
   



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

[Bug 59219] AsyncListener#onError not called on exception during async processing

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=59219

--- Comment #2 from Mark Thomas  ---
Point 3 is fixed as well in 9.0.x for 9.0.0.M5 onwards.

I'll look at back-porting this next.

-- 
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: r1739817 - in /tomcat/trunk/java/org/apache: catalina/valves/ErrorReportValve.java coyote/AsyncStateMachine.java

[markt]

Author: markt
Date: Mon Apr 18 20:35:27 2016
New Revision: 1739817

URL: http://svn.apache.org/viewvc?rev=1739817=rev
Log:
Remainder of fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=59219
If an exception is throw during a dispatch(), trigger the Async error handling 
process

Modified:
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java

Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1739817=1739816=1739817=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Mon Apr 
18 20:35:27 2016
@@ -98,11 +98,13 @@ public class ErrorReportValve extends Va
 Throwable throwable = (Throwable) 
request.getAttribute(RequestDispatcher.ERROR_EXCEPTION);
 
 // If an async request is in progress and is not going to end once this
-// container thread finishes, do not process the error page here but
-// trigger an error dispatch so the additional async processing such as
-// firing onError() occurs.
+// container thread finishes, do not process any error page here.
 if (request.isAsync() && !request.isAsyncCompleting()) {
-if (throwable != null) {
+// If an async dispatch is in progress the error handling in the
+// CoyoteAdapter will trigger the necessary processing. It is only
+// necessary to trigger it here if async is starting (i.e. this is
+// the post-processing of the service() method)
+if (throwable != null && request.isAsyncDispatching()) {
 request.getAsyncContextInternal().setErrorState(throwable, 
true);
 }
 return;

Modified: tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1739817=1739816=1739817=diff
==
--- tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8] 
(original)
+++ tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8] Mon Apr 
18 20:35:27 2016
@@ -52,25 +52,25 @@ import org.apache.tomcat.util.security.P
  * DISPATCHING   - The dispatch is being processed.
  * ERROR - Something went wrong.
  *
- * |-»|
- * | \|/
- * |   
|--«-ERROR-«---|
- * |   |  complete()/|\  \ 
   |
- * |   | |\-|  
   |
- * |   | |  |dispatch()
   |
- * |   | | \|/ 
   |
- * |   | |  |  
   |
- * |   | |  |--|timeout()   |  
   |
- * |   |  post() |  | \|/   | post()   
   |
- * |   | |-- | --»DISPATCHED«-- | 
--COMPLETING«-| |
- * |   | |   |   /|\  | | | 
/|\ | |
- * |   | ||---»- | ---|   | | |--| 
 | |
- * |   | ^|  ||startAsync() |   
timeout()   | |
- * |   | ||   \   | |  
 | |
- * |   | ||\  | |  
 | |
- * |   | || \ | |  
 | |
- * |   | ||  \| |  
 | |
- * |  \|/||   \  \|/ post() |  
 | |
+ * |-»--|
+ * |   \|/
+ * |   
|--«---ERROR---«---|
+ * |   |  complete() /|\/|\\   
   |
+ * |   |  |  |  \  
   |
+ * |   ||-»---|  |   \---»--|  
   |
+ * |   |||  |dispatch()
   

[Bug 59219] AsyncListener#onError not called on exception during async processing

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=59219

Mark Thomas  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Mark Thomas  ---
I've made some changes in 9.0.x to address point 2. The provided test case
(thanks for that it makes life a lot easier) now passes. I want to look at
point 3 before thinking about back-porting.

-- 
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: r1739814 - in /tomcat/trunk/java/org/apache: catalina/valves/ErrorReportValve.java coyote/AsyncStateMachine.java

[markt]

Author: markt
Date: Mon Apr 18 19:58:18 2016
New Revision: 1739814

URL: http://svn.apache.org/viewvc?rev=1739814=rev
Log:
Partial fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=59219
If an exception is throw in the service() method after startAsync() is called, 
trigger the Async error handling process

Modified:
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java

Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1739814=1739813=1739814=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Mon Apr 
18 19:58:18 2016
@@ -98,9 +98,13 @@ public class ErrorReportValve extends Va
 Throwable throwable = (Throwable) 
request.getAttribute(RequestDispatcher.ERROR_EXCEPTION);
 
 // If an async request is in progress and is not going to end once this
-// container thread finishes, do not trigger error page handling - it
-// will be triggered later if required.
+// container thread finishes, do not process the error page here but
+// trigger an error dispatch so the additional async processing such as
+// firing onError() occurs.
 if (request.isAsync() && !request.isAsyncCompleting()) {
+if (throwable != null) {
+request.getAsyncContextInternal().setErrorState(throwable, 
true);
+}
 return;
 }
 

Modified: tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1739814=1739813=1739814=diff
==
--- tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8] 
(original)
+++ tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8] Mon Apr 
18 19:58:18 2016
@@ -52,24 +52,27 @@ import org.apache.tomcat.util.security.P
  * DISPATCHING   - The dispatch is being processed.
  * ERROR - Something went wrong.
  *
- * |-»--|
- * |   \|/
- * |   
|--«---ERROR---«---|
- * |   |  complete()   \   
   |
- * |   |\---|  
   |
- * |   ||dispatch()
   |
- * |   |   \|/ 
   |
- * |   ||  
   |
- * |   ||--|timeout()   |  
   |
- * |   |  post()| \|/   | post()   
   |
- * |   | |---»DISPATCHED«-- | 
--COMPLETING«-| |
- * |   | |   /|\  | | | 
/|\ | |
- * |   | ||---»---|   | | |--| 
 | |
- * |   | ^|   |startAsync() |   
timeout()   | |
- * |   | ||   | |  
 | |
- * |  \|/||  complete()  \|/ post() |  
 | |
+ * |-»|
+ * | \|/
+ * |   
|--«-ERROR-«---|
+ * |   |  complete()/|\  \ 
   |
+ * |   | |\-|  
   |
+ * |   | |  |dispatch()
   |
+ * |   | | \|/ 
   |
+ * |   | |  |  
   |
+ * |   | |  |--|timeout()   |  
   |
+ * |   |  post() |  | \|/   | post()   
   |
+ * |   | |-- | --»DISPATCHED«-- | 
--COMPLETING«-| |
+ * |   | |   |   /|\  | | | 
/|\ | |
+ * |   | ||---»- | ---|   |  

Re: svn commit: r1739786 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/Globals.java java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml

[Christopher Schultz]

Mark,

On 4/18/16 2:38 PM, Mark Thomas wrote:
> On 18/04/2016 18:15, Christopher Schultz wrote:
>> All,
>>
>> On 4/18/16 12:36 PM, schu...@apache.org wrote:
>>> Author: schultz
>>> Date: Mon Apr 18 16:36:35 2016
>>> New Revision: 1739786
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1739786=rev
>>> Log:
>>> Back-port r1715434 to make a web application's CredentialHandler available 
>>> through a context attribute.
>>
>> I'm having trouble merging this with the 8.5.0 branch. Is that because
>> r1715434 pre-dates the branch? If so, what's the accepted practice for
>> "back-porting" this from current-trunk to current-branch? Just
>> manually-edit the svn:merge-info and manually-patch the branch?
> 
> Isn't the code is already there in 8.5.x ?

*facepalm*

I forgot that 8.5.x isn't a branch from 8.0.0 plus Tomcat 9.x stuff
added... it's Tomcat 9 minus some of the extra stuff.

Thanks for the hint ;)

-chris

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

buildbot success in on tomcat-7-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/406

Buildbot URL: https://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] 1739808
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

[Bug 59164] If tomcat server can not be resolved, crash occurred.

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=59164

Robert Bost  changed:

   What|Removed |Added

 CC||rb...@redhat.com

-- 
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: r1739808 - /tomcat/tc7.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java

[markt]

Author: markt
Date: Mon Apr 18 18:40:14 2016
New Revision: 1739808

URL: http://svn.apache.org/viewvc?rev=1739808=rev
Log:
Fix back-port

Modified:

tomcat/tc7.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java?rev=1739808=1739807=1739808=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
 Mon Apr 18 18:40:14 2016
@@ -915,7 +915,7 @@ public class TestAbstractHttp11Processor
 tomcat.start();
 
 ByteChunk responseBody = new ByteChunk();
-Map responseHeaders = new HashMap<>();
+Map responseHeaders = new 
HashMap();
 
 int rc = headUrl("http://localhost:; + getPort() + "/test", 
responseBody,
 responseHeaders);



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

Re: svn commit: r1739786 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/Globals.java java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml

[Mark Thomas]

On 18/04/2016 18:15, Christopher Schultz wrote:
> All,
> 
> On 4/18/16 12:36 PM, schu...@apache.org wrote:
>> Author: schultz
>> Date: Mon Apr 18 16:36:35 2016
>> New Revision: 1739786
>>
>> URL: http://svn.apache.org/viewvc?rev=1739786=rev
>> Log:
>> Back-port r1715434 to make a web application's CredentialHandler available 
>> through a context attribute.
> 
> I'm having trouble merging this with the 8.5.0 branch. Is that because
> r1715434 pre-dates the branch? If so, what's the accepted practice for
> "back-porting" this from current-trunk to current-branch? Just
> manually-edit the svn:merge-info and manually-patch the branch?

Isn't the code is already there in 8.5.x ?

Mark


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

Re: svn commit: r1739786 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/Globals.java java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml

[Christopher Schultz]

All,

On 4/18/16 12:36 PM, schu...@apache.org wrote:
> Author: schultz
> Date: Mon Apr 18 16:36:35 2016
> New Revision: 1739786
> 
> URL: http://svn.apache.org/viewvc?rev=1739786=rev
> Log:
> Back-port r1715434 to make a web application's CredentialHandler available 
> through a context attribute.

I'm having trouble merging this with the 8.5.0 branch. Is that because
r1715434 pre-dates the branch? If so, what's the accepted practice for
"back-porting" this from current-trunk to current-branch? Just
manually-edit the svn:merge-info and manually-patch the branch?

Shall I also back-port to Tomcat 7? I like this feature very much, and
CredentialHandlers are available back to 7.0.x, so I don't see a reason
not to back-port.

Thanks,
-chris

> Modified:
> tomcat/tc8.0.x/trunk/   (props changed)
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
> tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
> 
> Propchange: tomcat/tc8.0.x/trunk/
> --
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Mon Apr 18 16:36:35 2016
> @@ -1,2 +1,2 @@
>  /tomcat/tc8.5.x/trunk:1735042,1737966
> -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,
164488
6
>  
> ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,
165
7
>  
> 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,
1666386-
1
>  
> 

buildbot success in on tomcat-8-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-8-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-8-trunk/builds/567

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1739786
Blamelist: schultz

Build succeeded!

Sincerely,
 -The Buildbot




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

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

[schultz]

Author: schultz
Date: Mon Apr 18 16:36:35 2016
New Revision: 1739786

URL: http://svn.apache.org/viewvc?rev=1739786=rev
Log:
Back-port r1715434 to make a web application's CredentialHandler available 
through a context attribute.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 16:36:35 2016
@@ -1,2 +1,2 @@
 /tomcat/tc8.5.x/trunk:1735042,1737966
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 

Re: Time for tc-native 1.2.6

[Rainer Jung]

Am 18.04.2016 um 18:13 schrieb Rainer Jung:

Am 18.04.2016 um 17:28 schrieb jean-frederic clere:

On 04/18/2016 05:03 PM, Rainer Jung wrote:

Hi Mark,

Am 18.04.2016 um 16:37 schrieb Mark Thomas:

I'd like to get the next tc-native release out before the end of the
month so the next round of Tomcat releases can pick it up -
particularly
the cert chain from Java keystore fix.

I'm intending to tag in ~24 hours. Please reply if you need me to
delay.


Current code status:

a) I tried to keep compatibility with OpenSSL 1.0.2 all the time. Any
breaks would be unintended. At least things compiled here. More eyes and
tests for the changes applied since 1.2.5 are very welcome.

b) it will not compile with against latest OpenSSL 1.1.0 beta, because
to stay compatible with 1.1.0 head we had to use more recent OpenSSL
functions introduced after the last beta

c) it will not compile with the latest OpenSSL 1.1.0 snapshot either,
because I haven't yet found a solution to an API change only introduced
last week

I'll see whether I find a fix for c) so that the release would at least
work with a current OpenSSL 1.1.0 snapshot. Even if not, I think you can
release, because OpenSSL 1.1.0 head still doesn't seem to be API stable,
so we are not at the end of changes anyhows.

Background infoRecently there was another opaqueness change in OpenSSL
1.1.0 head. There's one incompatibility remaining between tcnative head
and OpenSSL 1.1.0 head for which I didn't find an immediate replacement.
So compiling against latest 1.1.0 snapshots will result in a compilation
error in ssl_verify_CRL().

The CRL handling code is very different from what we can find in OpenSSL
example/apps code and it could well be, that we should replace a bigger
part of that code with some pre-cooked cert validation function (call)
in OpenSSL.


Is mod_ssl also affected by those API changes?


Not 2.4, but our code seems to go back to 2.2. The code has
significantly changed for 2.4 in r1165056 which is likely the change we
will adopt as well.


The reason for that change was sent by Kaspar Brand on 2011-07-31:

===

I'm considering cleaning up some of the cert revocation checking code in
mod_ssl, in particular ssl_callback_SSLVerify_CRL(), which currently has
the following comment:

 * OpenSSL provides the general mechanism to deal with CRLs but does not
 * use them automatically when verifying certificates, so we do it
 * explicitly here. We will check the CRL for the currently checked
 * certificate, if there is such a CRL in the store.

This was true in 1999 when CRL support was originally added to mod_ssl
by rse, but times have changed - CRL checking support was introduced
with OpenSSL 0.9.7, released in December 2002
(http://cvs.openssl.org/chngview?cn=4670).

===

So we've got quite some unfortunate code drift between where our code 
originally came from and what's there today.


Regards,

Rainer


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

buildbot failure in on tomcat-7-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/405

Buildbot URL: https://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] 1739778
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

buildbot failure in on tomcat-8-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-8-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-8-trunk/builds/566

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1739777
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

Re: Time for tc-native 1.2.6

[Rainer Jung]

Am 18.04.2016 um 17:28 schrieb jean-frederic clere:

On 04/18/2016 05:03 PM, Rainer Jung wrote:

Hi Mark,

Am 18.04.2016 um 16:37 schrieb Mark Thomas:

I'd like to get the next tc-native release out before the end of the
month so the next round of Tomcat releases can pick it up - particularly
the cert chain from Java keystore fix.

I'm intending to tag in ~24 hours. Please reply if you need me to delay.


Current code status:

a) I tried to keep compatibility with OpenSSL 1.0.2 all the time. Any
breaks would be unintended. At least things compiled here. More eyes and
tests for the changes applied since 1.2.5 are very welcome.

b) it will not compile with against latest OpenSSL 1.1.0 beta, because
to stay compatible with 1.1.0 head we had to use more recent OpenSSL
functions introduced after the last beta

c) it will not compile with the latest OpenSSL 1.1.0 snapshot either,
because I haven't yet found a solution to an API change only introduced
last week

I'll see whether I find a fix for c) so that the release would at least
work with a current OpenSSL 1.1.0 snapshot. Even if not, I think you can
release, because OpenSSL 1.1.0 head still doesn't seem to be API stable,
so we are not at the end of changes anyhows.

Background infoRecently there was another opaqueness change in OpenSSL
1.1.0 head. There's one incompatibility remaining between tcnative head
and OpenSSL 1.1.0 head for which I didn't find an immediate replacement.
So compiling against latest 1.1.0 snapshots will result in a compilation
error in ssl_verify_CRL().

The CRL handling code is very different from what we can find in OpenSSL
example/apps code and it could well be, that we should replace a bigger
part of that code with some pre-cooked cert validation function (call)
in OpenSSL.


Is mod_ssl also affected by those API changes?


Not 2.4, but our code seems to go back to 2.2. The code has 
significantly changed for 2.4 in r1165056 which is likely the change we 
will adopt as well.


Regards,

Rainer


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

svn commit: r1739780 - in /tomcat/trunk: java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/config/listeners.xml

[markt]

Author: markt
Date: Mon Apr 18 16:06:43 2016
New Revision: 1739780

URL: http://svn.apache.org/viewvc?rev=1739780=rev
Log:
Remove work-around for leak that is fixed in all Java 8 versions.

Modified:

tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/trunk/webapps/docs/config/listeners.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1739780=1739779=1739780=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java 
Mon Apr 18 16:06:43 2016
@@ -26,7 +26,6 @@ import java.net.URLConnection;
 import java.sql.DriverManager;
 import java.util.StringTokenizer;
 
-import javax.imageio.ImageIO;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -65,20 +64,6 @@ public class JreMemoryLeakPreventionList
 
 /**
  * Protect against the memory leak caused when the first call to
- * sun.awt.AppContext.getAppContext() is triggered by a web
- * application. Defaults to false since
- * {@link java.beans.Introspector#flushCaches()} no longer uses AppContext
- * from 1.7.0_02 onwards. Also, from 1.7.0_25 onwards, calling this method
- * requires a graphical environment and starts an AWT thread.
- */
-private boolean appContextProtection = false;
-public boolean isAppContextProtection() { return appContextProtection; }
-public void setAppContextProtection(boolean appContextProtection) {
-this.appContextProtection = appContextProtection;
-}
-
-/**
- * Protect against the memory leak caused when the first call to
  * java.awt.Toolkit.getDefaultToolkit() is triggered
  * by a web application. Defaults to false because a new
  * Thread is launched.
@@ -249,32 +234,6 @@ public class JreMemoryLeakPreventionList
 DriverManager.getDrivers();
 }
 
-/*
- * Several components end up calling:
- * sun.awt.AppContext.getAppContext()
- *
- * Those libraries / components known to trigger memory leaks
- * due to eventual calls to getAppContext() are:
- * - Google Web Toolkit via its use of javax.imageio
- * - Tomcat via its use of 
java.beans.Introspector.flushCaches()
- *   in 1.7.0 to 1.7.0_01. From 1.7.0_02 onwards use of
- *   AppContext by Introspector.flushCaches() was replaced with
- *   ThreadGroupContext
- * - others TBD
- *
- * From 1.7.0_25 onwards, a call to
- * sun.awt.AppContext.getAppContext() results in a thread being
- * started named AWT-AppKit that requires a graphic environment
- * to be available.
- */
-
-// Trigger a call to sun.awt.AppContext.getAppContext(). This
-// will pin the system class loader in memory but that 
shouldn't
-// be an issue.
-if (appContextProtection) {
-ImageIO.getCacheDirectory();
-}
-
 // Trigger the creation of the AWT (AWT-Windows, AWT-XAWT,
 // etc.) thread
 if (awtThreadProtection) {

Modified: tomcat/trunk/webapps/docs/config/listeners.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=1739780=1739779=1739780=diff
==
--- tomcat/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/trunk/webapps/docs/config/listeners.xml Mon Apr 18 16:06:43 2016
@@ -178,15 +178,6 @@
 
 
 
-  
-Enables protection so that calls to
-sun.awt.AppContext.getAppContext() triggered by a web
-application do not result in a memory leak. Note that enabling this
-protection will trigger a requirement for a graphical environment 
unless
-Java is started in head-less mode. The default is false.
-
-  
-
   
 Enables protection so that calls to
 java.awt.Toolkit.getDefaultToolkit() triggered by a web



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

[Bug 59310] Content-Length of HEAD requests incorrectly computed as

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=59310

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #8 from Mark Thomas  ---
This has been fixed so Tomcat will not send a Content-Length header for a HEAD
request unless the application explicitly specifies one.

The fix has been made in:
- 9.0.x for 9.0.0.M5
- 8.5.x for 8.5.1
- 8.0.x for 8.0.34
- 7.0.x for 7.0.70
- 6.0.x for 6.0.46

-- 
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: r1739779 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/connector/OutputBuffer.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Apr 18 15:52:02 2016
New Revision: 1739779

URL: http://svn.apache.org/viewvc?rev=1739779=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59310
Do not add a "Content-Length: 0" header for custom responses to HEAD requests 
that do not set a Content-Length value.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 15:52:02 2016
@@ -1,4 +1,4 @@
-/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989
 
,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1715866,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803,1725929,1725963-1725965,1725970,1725974,1726172,1726175,1726179-1726182,1726195-1726198,1726200,1726203,1726226,1726576,1726630,1727029,1727037,1727671,1727900,1728449,1729362,1731009,1731955,1731977,1732360,1732672,1733941,1734115,1734133,1734531,1737967,1738173
+/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989
 
,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778

svn commit: r1739778 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/OutputBuffer.java test/org/apache/coyote/http11/TestAbstractHttp11Processor.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Apr 18 15:48:59 2016
New Revision: 1739778

URL: http://svn.apache.org/viewvc?rev=1739778=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59310
Do not add a "Content-Length: 0" header for custom responses to HEAD requests 
that do not set a Content-Length value.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java

tomcat/tc7.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 15:48:59 2016
@@ -1,3 +1,3 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1
 
726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294

svn commit: r1739777 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/connector/OutputBuffer.java test/org/apache/coyote/http11/TestAbstractHttp11Processor.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Apr 18 15:45:53 2016
New Revision: 1739777

URL: http://svn.apache.org/viewvc?rev=1739777=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59310
Do not add a "Content-Length: 0" header for custom responses to HEAD requests 
that do not set a Content-Length value.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java

tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 15:45:53 2016
@@ -1,2 +1,2 @@
 /tomcat/tc8.5.x/trunk:1735042,1737966
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 

svn commit: r1739776 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/OutputBuffer.java test/org/apache/coyote/http11/TestHttp11Processor.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Apr 18 15:44:18 2016
New Revision: 1739776

URL: http://svn.apache.org/viewvc?rev=1739776=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59310
Do not add a "Content-Length: 0" header for custom responses to HEAD requests 
that do not set a Content-Length value.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 15:44:18 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1739776=1739775=1739776=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java 
Mon Apr 18 15:44:18 2016
@@ -262,10 +262,13 @@ public class OutputBuffer extends Writer
 cb.flushBuffer();
 }
 
-if ((!coyoteResponse.isCommitted())
-&& (coyoteResponse.getContentLengthLong() == -1)) {
+if ((!coyoteResponse.isCommitted()) && 
(coyoteResponse.getContentLengthLong() == -1) &&
+!coyoteResponse.getRequest().method().equals("HEAD")) {
 // If this didn't cause a commit of the response, the final content
-// length can be calculated
+// length can be calculated. Only do this if this is not a HEAD
+// request since in that case no body should have been written and
+// setting a value of zero here will result in an explicit content
+// length of zero being set on the response.
 if (!coyoteResponse.isCommitted()) {
 coyoteResponse.setContentLength(bb.getLength());
 }

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java?rev=1739776=1739775=1739776=diff
==
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java 
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java 
Mon Apr 18 15:44:18 2016
@@ -801,4 +801,48 @@ public class TestHttp11Processor extends
 return true;
 }
 }
+
+
+@Test
+public void testBug59310() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+Context ctx = tomcat.addContext("", null);
+
+Tomcat.addServlet(ctx, "Bug59310", new Bug59310Servlet());
+ctx.addServletMapping("/test", "Bug59310");
+
+tomcat.start();
+
+ByteChunk responseBody = new ByteChunk();
+Map responseHeaders = new HashMap<>();
+
+int rc = headUrl("http://localhost:; + getPort() + "/test", 
responseBody,
+responseHeaders);
+
+assertEquals(HttpServletResponse.SC_OK, rc);
+assertEquals(0, responseBody.getLength());
+assertFalse(responseHeaders.containsKey("Content-Length"));
+}
+
+
+private class Bug59310Servlet extends HttpServlet {
+
+

svn commit: r1739775 - in /tomcat/trunk: java/org/apache/catalina/connector/OutputBuffer.java test/org/apache/coyote/http11/TestHttp11Processor.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Apr 18 15:43:19 2016
New Revision: 1739775

URL: http://svn.apache.org/viewvc?rev=1739775=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59310
Do not add a "Content-Length: 0" header for custom responses to HEAD requests 
that do not set a Content-Length value.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1739775=1739774=1739775=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Mon Apr 
18 15:43:19 2016
@@ -262,10 +262,13 @@ public class OutputBuffer extends Writer
 cb.flushBuffer();
 }
 
-if ((!coyoteResponse.isCommitted())
-&& (coyoteResponse.getContentLengthLong() == -1)) {
+if ((!coyoteResponse.isCommitted()) && 
(coyoteResponse.getContentLengthLong() == -1) &&
+!coyoteResponse.getRequest().method().equals("HEAD")) {
 // If this didn't cause a commit of the response, the final content
-// length can be calculated
+// length can be calculated. Only do this if this is not a HEAD
+// request since in that case no body should have been written and
+// setting a value of zero here will result in an explicit content
+// length of zero being set on the response.
 if (!coyoteResponse.isCommitted()) {
 coyoteResponse.setContentLength(bb.getLength());
 }

Modified: tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java?rev=1739775=1739774=1739775=diff
==
--- tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java 
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java Mon Apr 
18 15:43:19 2016
@@ -801,4 +801,48 @@ public class TestHttp11Processor extends
 return true;
 }
 }
+
+
+@Test
+public void testBug59310() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+Context ctx = tomcat.addContext("", null);
+
+Tomcat.addServlet(ctx, "Bug59310", new Bug59310Servlet());
+ctx.addServletMapping("/test", "Bug59310");
+
+tomcat.start();
+
+ByteChunk responseBody = new ByteChunk();
+Map responseHeaders = new HashMap<>();
+
+int rc = headUrl("http://localhost:; + getPort() + "/test", 
responseBody,
+responseHeaders);
+
+assertEquals(HttpServletResponse.SC_OK, rc);
+assertEquals(0, responseBody.getLength());
+assertFalse(responseHeaders.containsKey("Content-Length"));
+}
+
+
+private class Bug59310Servlet extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+// TODO Auto-generated method stub
+super.doGet(req, resp);
+}
+
+@Override
+protected void doHead(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+//resp.setContentLengthLong(-1);
+//resp.flushBuffer();
+}
+}
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1739775=1739774=1739775=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Apr 18 15:43:19 2016
@@ -140,6 +140,11 @@
 from the properties passed in the call to getAuthContext.
 Based on a patch by Thomas Maslen. (markt)
   
+  
+59310: Do not add a Content-Length: 0 header 
for
+custom responses to HEAD requests that do not set a
+Content-Length value. (markt)
+  
 
   
   



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

Re: Time for tc-native 1.2.6

[jean-frederic clere]

On 04/18/2016 05:03 PM, Rainer Jung wrote:
> Hi Mark,
> 
> Am 18.04.2016 um 16:37 schrieb Mark Thomas:
>> I'd like to get the next tc-native release out before the end of the
>> month so the next round of Tomcat releases can pick it up - particularly
>> the cert chain from Java keystore fix.
>>
>> I'm intending to tag in ~24 hours. Please reply if you need me to delay.
> 
> Current code status:
> 
> a) I tried to keep compatibility with OpenSSL 1.0.2 all the time. Any
> breaks would be unintended. At least things compiled here. More eyes and
> tests for the changes applied since 1.2.5 are very welcome.
> 
> b) it will not compile with against latest OpenSSL 1.1.0 beta, because
> to stay compatible with 1.1.0 head we had to use more recent OpenSSL
> functions introduced after the last beta
> 
> c) it will not compile with the latest OpenSSL 1.1.0 snapshot either,
> because I haven't yet found a solution to an API change only introduced
> last week
> 
> I'll see whether I find a fix for c) so that the release would at least
> work with a current OpenSSL 1.1.0 snapshot. Even if not, I think you can
> release, because OpenSSL 1.1.0 head still doesn't seem to be API stable,
> so we are not at the end of changes anyhows.
> 
> Background infoRecently there was another opaqueness change in OpenSSL
> 1.1.0 head. There's one incompatibility remaining between tcnative head
> and OpenSSL 1.1.0 head for which I didn't find an immediate replacement.
> So compiling against latest 1.1.0 snapshots will result in a compilation
> error in ssl_verify_CRL().
> 
> The CRL handling code is very different from what we can find in OpenSSL
> example/apps code and it could well be, that we should replace a bigger
> part of that code with some pre-cooked cert validation function (call)
> in OpenSSL.

Is mod_ssl also affected by those API changes?

Cheers

Jean-Frederic

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

Re: Time for tc-native 1.2.6

[Rainer Jung]

Hi Mark,

Am 18.04.2016 um 16:37 schrieb Mark Thomas:

I'd like to get the next tc-native release out before the end of the
month so the next round of Tomcat releases can pick it up - particularly
the cert chain from Java keystore fix.

I'm intending to tag in ~24 hours. Please reply if you need me to delay.


Current code status:

a) I tried to keep compatibility with OpenSSL 1.0.2 all the time. Any 
breaks would be unintended. At least things compiled here. More eyes and 
tests for the changes applied since 1.2.5 are very welcome.


b) it will not compile with against latest OpenSSL 1.1.0 beta, because 
to stay compatible with 1.1.0 head we had to use more recent OpenSSL 
functions introduced after the last beta


c) it will not compile with the latest OpenSSL 1.1.0 snapshot either, 
because I haven't yet found a solution to an API change only introduced 
last week


I'll see whether I find a fix for c) so that the release would at least 
work with a current OpenSSL 1.1.0 snapshot. Even if not, I think you can 
release, because OpenSSL 1.1.0 head still doesn't seem to be API stable, 
so we are not at the end of changes anyhows.


Background infoRecently there was another opaqueness change in OpenSSL 
1.1.0 head. There's one incompatibility remaining between tcnative head 
and OpenSSL 1.1.0 head for which I didn't find an immediate replacement. 
So compiling against latest 1.1.0 snapshots will result in a compilation 
error in ssl_verify_CRL().


The CRL handling code is very different from what we can find in OpenSSL 
example/apps code and it could well be, that we should replace a bigger 
part of that code with some pre-cooked cert validation function (call) 
in OpenSSL.


Regards,

Rainer



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

Re: Time for tc-native 1.2.6

[Rémy Maucherat]

2016-04-18 16:37 GMT+02:00 Mark Thomas :

> I'd like to get the next tc-native release out before the end of the
> month so the next round of Tomcat releases can pick it up - particularly
> the cert chain from Java keystore fix.
>
> I'm intending to tag in ~24 hours. Please reply if you need me to delay.
>
> +1 !

Rémy

Time for tc-native 1.2.6

[Mark Thomas]

I'd like to get the next tc-native release out before the end of the
month so the next round of Tomcat releases can pick it up - particularly
the cert chain from Java keystore fix.

I'm intending to tag in ~24 hours. Please reply if you need me to delay.

Mark

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

svn commit: r1739764 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/webresources/

[markt]

Author: markt
Date: Mon Apr 18 14:15:13 2016
New Revision: 1739764

URL: http://svn.apache.org/viewvc?rev=1739764=rev
Log:
Fix likely cause of occasional unit test failures.
Defensive copy was being taken of wrong location.

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

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 14:15:13 2016
@@ -1,2 +1,2 @@
 /tomcat/tc8.5.x/trunk:1735042,1737966
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 

svn commit: r1739763 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/catalina/webresources/

[markt]

Author: markt
Date: Mon Apr 18 14:14:52 2016
New Revision: 1739763

URL: http://svn.apache.org/viewvc?rev=1739763=rev
Log:
Fix likely cause of occasional unit test failures.
Defensive copy was being taken of wrong location.

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

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 14:14:52 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java?rev=1739763=1739762=1739763=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java
 Mon Apr 18 14:14:52 2016
@@ -31,7 +31,7 @@ public abstract class AbstractTestFileRe
 this.readOnly = readOnly;
 }
 
-protected abstract String getDir1();
+protected abstract File getDir2();
 
 @Override
 public WebResourceRoot getWebResourceRoot() {
@@ -41,22 +41,22 @@ public abstract class AbstractTestFileRe
 root.setMainResources(webResourceSet);
 
 WebResourceSet f1 = new FileResourceSet(root, "/f1.txt",
-getDir1() + "/f1.txt", "/");
+"test/webresources/dir1/f1.txt", "/");
 f1.setReadOnly(readOnly);
 root.addPreResources(f1);
 
 WebResourceSet f2 = new FileResourceSet(root, "/f2.txt",
-getDir1() + "/f2.txt", "/");
+"test/webresources/dir1/f2.txt", "/");
 f2.setReadOnly(readOnly);
 root.addPreResources(f2);
 
 WebResourceSet d1f1 = new FileResourceSet(root, "/d1/d1-f1.txt",
-getDir1() + "/d1/d1-f1.txt", "/");
+"test/webresources/dir1/d1/d1-f1.txt", "/");
 d1f1.setReadOnly(readOnly);
 root.addPreResources(d1f1);
 
 WebResourceSet d2f1 = new FileResourceSet(root, "/d2/d2-f1.txt",
-getDir1() + "/d2/d2-f1.txt", "/");
+"test/webresources/dir1/d2/d2-f1.txt", "/");
 d2f1.setReadOnly(readOnly);
 root.addPreResources(d2f1);
 
@@ -70,7 +70,7 @@ public abstract class AbstractTestFileRe
 
 @Override
 public File getBaseDir() {
-return new File("test/webresources/dir2");
+return getDir2();
 }
 
 @Override

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java?rev=1739763=1739762=1739763=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java
 Mon Apr 18 14:14:52 2016
@@ -31,13 +31,13 @@ import org.apache.catalina.startup.Tomca
 public class TestFileResourceSet extends 

svn commit: r1739762 - in /tomcat/trunk/test/org/apache/catalina/webresources: AbstractTestFileResourceSet.java TestFileResourceSet.java TestFileResourceSetReadOnly.java TestFileResourceSetVirtual.jav

[markt]

Author: markt
Date: Mon Apr 18 14:14:06 2016
New Revision: 1739762

URL: http://svn.apache.org/viewvc?rev=1739762=rev
Log:
Fix likely cause of occasional unit test failures.
Defensive copy was being taken of wrong location.

Modified:

tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java

tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java

tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java

Modified: 
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java?rev=1739762=1739761=1739762=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java
 Mon Apr 18 14:14:06 2016
@@ -31,7 +31,7 @@ public abstract class AbstractTestFileRe
 this.readOnly = readOnly;
 }
 
-protected abstract String getDir1();
+protected abstract File getDir2();
 
 @Override
 public WebResourceRoot getWebResourceRoot() {
@@ -41,22 +41,22 @@ public abstract class AbstractTestFileRe
 root.setMainResources(webResourceSet);
 
 WebResourceSet f1 = new FileResourceSet(root, "/f1.txt",
-getDir1() + "/f1.txt", "/");
+"test/webresources/dir1/f1.txt", "/");
 f1.setReadOnly(readOnly);
 root.addPreResources(f1);
 
 WebResourceSet f2 = new FileResourceSet(root, "/f2.txt",
-getDir1() + "/f2.txt", "/");
+"test/webresources/dir1/f2.txt", "/");
 f2.setReadOnly(readOnly);
 root.addPreResources(f2);
 
 WebResourceSet d1f1 = new FileResourceSet(root, "/d1/d1-f1.txt",
-getDir1() + "/d1/d1-f1.txt", "/");
+"test/webresources/dir1/d1/d1-f1.txt", "/");
 d1f1.setReadOnly(readOnly);
 root.addPreResources(d1f1);
 
 WebResourceSet d2f1 = new FileResourceSet(root, "/d2/d2-f1.txt",
-getDir1() + "/d2/d2-f1.txt", "/");
+"test/webresources/dir1/d2/d2-f1.txt", "/");
 d2f1.setReadOnly(readOnly);
 root.addPreResources(d2f1);
 
@@ -70,7 +70,7 @@ public abstract class AbstractTestFileRe
 
 @Override
 public File getBaseDir() {
-return new File("test/webresources/dir2");
+return getDir2();
 }
 
 @Override

Modified: 
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java?rev=1739762=1739761=1739762=diff
==
--- tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java 
Mon Apr 18 14:14:06 2016
@@ -31,13 +31,13 @@ import org.apache.catalina.startup.Tomca
 public class TestFileResourceSet extends AbstractTestFileResourceSet {
 
 private static Path tempDir;
-private static File dir1;
+private static File dir2;
 
 @BeforeClass
 public static void before() throws IOException {
 tempDir = Files.createTempDirectory("test", new FileAttribute[0]);
-dir1 = new File(tempDir.toFile(), "dir1");
-TomcatBaseTest.recursiveCopy(new 
File("test/webresources/dir1").toPath(), dir1.toPath());
+dir2 = new File(tempDir.toFile(), "dir2");
+TomcatBaseTest.recursiveCopy(new 
File("test/webresources/dir2").toPath(), dir2.toPath());
 }
 
 @AfterClass
@@ -51,8 +51,8 @@ public class TestFileResourceSet extends
 }
 
 @Override
-protected String getDir1() {
-return dir1.getAbsolutePath();
+protected File getDir2() {
+return dir2;
 }
 
 @Override

Modified: 
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java?rev=1739762=1739761=1739762=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java
 Mon Apr 18 14:14:06 2016
@@ -31,13 +31,13 @@ import org.apache.catalina.startup.Tomca
 public class TestFileResourceSetReadOnly extends AbstractTestFileResourceSet {
 
 private static Path tempDir;
-private static File dir1;
+private static File dir2;
 
 @BeforeClass
 public static void before() 

Re: IRS Security Settings

[Christopher Schultz]

Kenneth,

This post belongs on the user's mailing list. Cross-posting this reply
to move it over there.

-chris

On 4/13/16 11:49 AM, King Kenneth wrote:
> We recently install Business Objects Business Intelligence 4.1 SP7 and
> Tomcat 7 is the default web application server which is bundled within
> the Business Objects BI 4.1 installation package.  I currently work as a
> contractor for the IRS and all servers that have Tomcat install need to
> compliance with the attached list of security settings. I was am to
> confirm a few of the security setting but I have some questions which
> are listed in the attached spreadsheet (column J Highlighted in Yellow).
> 
>  
> 
> Thanks,
> 
>  
> 
> Kenneth King Jr.
> 
> Booz l Allen l Hamilton
> 
> Office (202) 317-5593
> 
> Cell (203) 450-7941
> 
>  
> 
>  
> 
> 
> 
> 
> -
> 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: r13288 - /release/tomcat/tomcat-7/v7.0.68/

[violetagg]

Author: violetagg
Date: Mon Apr 18 12:47:04 2016
New Revision: 13288

Log:
Remove 7.0.68

Removed:
release/tomcat/tomcat-7/v7.0.68/


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

[Bug 59310] Content-Length of HEAD requests incorrectly computed as

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=59310

--- Comment #7 from Mark Thomas  ---
That won't work. The OutputBuffer will still set the content length to zero.

resp.flushBuffer();

sort of works but adds the Transfer-Encoding header. I'm currently
experimenting with a unit test to see if I can find a better solution although
using flushBuffer() is likely to be the best cross-container solution.

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

[ANN] Apache Tomcat 7.0.69 released

[Violeta Georgieva]

The Apache Tomcat team announces the immediate availability of Apache
Tomcat 7.0.69.

Apache Tomcat is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Expression Language and Java
WebSocket technologies.

This release contains a number of bug fixes and improvements compared to
version 7.0.68. The notable changes since 7.0.68 include:


- Correct a false positive warning for ThreadLocal related memory leaks
  when the key class but not the value class has been loaded by the web
  application class loader.


Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-7.0-doc/changelog.html

Note: This version has 4 zip binaries: a generic one and
  three bundled with Tomcat native binaries for Windows operating
  systems running on different CPU architectures.

Note: Use of the Java WebSocket 1.1 implementation requires Java 7.

Note: If you use the APR/native AJP or HTTP connector you *must* upgrade
  to version 1.1.33 or later of the APR/native library.

Downloads:
http://tomcat.apache.org/download-70.cgi

Migration guides from Apache Tomcat 5.5.x and 6.0.x:
http://tomcat.apache.org/migration.html

Enjoy

The Apache Tomcat team

[Bug 59310] Content-Length of HEAD requests incorrectly computed as

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=59310

--- Comment #6 from Konstantin Kolinko  ---
You should be able to do the following in your servlet:

protected void doHead(HttpServletRequest request, HttpServletResponse
response) throws ServletException, IOException {
response.setContentLength(-1);
}


(BTW, skipping a setContentLength() call in javax.servlet.http.HttpServlet will
have the same effect. The contentLength is a numeric field that always has some
value, with -1 being the default. The actual header is generated in
o.a.coyote.http11.Http11Processor.prepareResponse()).

-- 
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: r1739746 - in /tomcat/site/trunk/docs/tomcat-7.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/

[violetagg]

Author: violetagg
Date: Mon Apr 18 11:36:29 2016
New Revision: 1739746

URL: http://svn.apache.org/viewvc?rev=1739746=rev
Log:
Update docs for Apache Tomcat 7.0.69 release.


[This commit notification would consist of 329 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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

Re: [GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

[Konstantin Kolinko]

2016-04-18 4:40 GMT+03:00 Bill Barker <billbar...@apache.org>:
> 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-trunk-validate has an issue affecting its community 
> integration.
> This issue affects 1 projects,
>  and has been outstanding for 2 runs.
> The current state of this project is 'Failed', with reason 'Build Failed'.
> For reference only, the following projects are affected by this:
> - tomcat-trunk-validate :  Tomcat 9.x, a web server implementing the Java 
> Servlet 4.0,
> ...
>
>
> Full details are available at:
> 
> http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html
>
> That said, some information snippets are provided here.
>
> The following annotations (debug/informational/warning/error messages) were 
> provided:
>  -DEBUG- Dependency on checkstyle exists, no need to add for property 
> checkstyle.jar.
>  -INFO- Failed with reason build failed
>
>
>
> The following work was performed:
> http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
> Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
> Work ended in a state of : Failed
> Elapsed: 2 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 
> -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
> -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.8-SNAPSHOT.jar
>  -Dexecute.validate=true validate
> [Working Directory: /srv/gump/public/workspace/tomcat-trunk]
> CLASSPATH: 
> /usr/lib/jvm/java-8-oracle/lib/tools.jar:/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/checkstyle/target/checkstyle-5.8-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20160418.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.5-SNAPSHOT.jar
>  
> :/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20160418.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20160418.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-19.0-SNAPSHOT.jar
> -
> Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml
>
> build-prepare:
>[delete] Deleting directory 
> /srv/gump/public/workspace/tomcat-trunk/output/build/temp
> [mkdir] Created dir: 
> /srv/gump/public/workspace/tomcat-trunk/output/build/temp
>
> compile-prepare:
>
> download-validate:
>
> testexist:
>  [echo] Testing  for 
> /srv/gump/public/workspace/checkstyle/target/checkstyle-5.8-SNAPSHOT.jar


Checkstyle built by Gump is stale.  The configuration used by
Tomcat-trunk is for Checkstyle 6.16+.

I am raising this with general@gump.
http://marc.info/?l=gump=146097811704321=2


Best regards,
Konstantin Kolinko

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

Re: Project Jigsaw, Apache Tomcat and RMI related memory leaks

[Mark Thomas]

On 18/04/2016 12:14, Alan Bateman wrote:
> On 18/04/2016 10:18, Mark Thomas wrote:
>> Hi,
>>
>> The Apache Tomcat community was asked by Rory O'Donnell for feedback on
>> JDK 9 + Project Jigsaw. Having provided that feedback we were directed
>> here so I have reproduced that feedback below.
>>
>>
>> I've started testing Tomcat trunk with JDK 9 + Project Jigsaw and it
>> looks like we are going to hit a bunch of problems related to Tomcat's
>> memory leak protection.
>>
>> The short version is there are lots of JDK calls that can result in a
>> reference being retained to the current class loader. If that class
>> loader is the web application class loader it often ends up being pinned
>> in memory. This triggers a memory leak when the web application is
>> reloaded since the web application class loader is not eligible for GC.
>>
>> Tomcat generally uses reflection to find these problems. It then does
>> one of two things:
>> - If the JRE provides an API the application developer should have used
>> to clean up the reference, Tomcat does this for them and then logs a
>> very loud error message telling the developer they need to fix their app.
>> - If there is nothing the developer could have done to avoid the
>> problem, Tomcat cleans it up. Usually this is via reflection again.
>>
>> Reporting this second class of issues as JRE bugs has been on my TODO
>> list for a long time. It looks like Java 9 is going to bump this to the
>> top of the list.
> I remember you brought this up on core-libs-dev [1] and the suggestion
> at the time was to create bugs for any of the issues that are still
> relevant. So yes, bumping the priority on that would be good.
> 
> On the RMI issue then it would be good to start a thread specifically on
> this topic on core-libs-dev.

OK. I'll restart this thread there. I'm also reviewing the various other
leaks and I'll start new threads as each one is confirmed.

Mark

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

[Bug 59310] Content-Length of HEAD requests incorrectly computed as

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=59310

Tobias Oberlies  changed:

   What|Removed |Added

 Status|NEEDINFO|NEW

--- Comment #5 from Tobias Oberlies  ---
(In reply to Violeta Georgieva from comment #4)
> If I have a servlet like this:

My servlet has a different doGet method: Mine returns a response with unknown
length. doHead is basically the same - but that results in an incorrect
response: the response to the HEAD request includes a generated
"Content-Length: 0". AFAIK, there is no reasonable way to make Tomcat not
generate this header.


(In reply to Christopher Schultz from comment #3)
> Would you mind testing quickly with 8.0.33?

I've tried with 8.0.33, and the result is the same:

> HEAD /test-backend/raw/foo HTTP/1.1
> User-Agent: curl/7.29.0
> Host: localhost:8080
> Accept: */*
>
< HTTP/1.1 200 OK
< Server: Apache-Coyote/1.1
< Content-Length: 0
< Date: Mon, 18 Apr 2016 10:59:20 GMT

-- 
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: r1739743 - in /tomcat/site/trunk: ./ docs/ xdocs/

[violetagg]

Author: violetagg
Date: Mon Apr 18 11:10:43 2016
New Revision: 1739743

URL: http://svn.apache.org/viewvc?rev=1739743=rev
Log:
Updates (excluding docs) for 7.0.69 release

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-70.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-7.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-70.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-7.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1739743=1739742=1739743=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Mon Apr 18 11:10:43 2016
@@ -37,7 +37,7 @@ tomcat.loc=http://www.apache.org/dist/to
 
 # - Tomcat versions -
 tomcat60=6.0.45
-tomcat70=7.0.68
+tomcat70=7.0.69
 tomcat80=8.0.33
 tomcat85=8.5.0
 tomcat90=9.0.0.M4

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1739743=1739742=1739743=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Mon Apr 18 11:10:43 2016
@@ -67,8 +67,8 @@
 
   
 Latest Stable 7.0.x Release
-2016-02-16
-7.0.68
+2016-04-15
+7.0.69
   
 
 

Modified: tomcat/site/trunk/docs/download-70.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1739743=1739742=1739743=diff
==
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Mon Apr 18 11:10:43 2016
@@ -222,7 +222,7 @@
 Quick Navigation
 
 
-[define v]7.0.68[end]
+[define v]7.0.69[end]
 https://www.apache.org/dist/tomcat/tomcat-7/KEYS;>KEYS |
 [v] |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1739743=1739742=1739743=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Mon Apr 18 11:10:43 2016
@@ -245,6 +245,39 @@ project logo are trademarks of the Apach
 
 
 
+
+2016-04-15 Tomcat 7.0.69 Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 7.0.69 of
+Apache Tomcat. This release contains a number of bug fixes and improvements
+compared to version 7.0.68. The notable changes since 7.0.68 include:
+
+
+
+
+Correct a false positive warning for ThreadLocal related memory leaks when
+the key class but not the value class has been loaded by the web
+application class loader.
+
+
+
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 7 changelog.
+
+
+
+
+
+Download |
+ChangeLog for 7.0.69
+
+
+
+
 
 2016-03-24 Tomcat 8.5.0 beta Released
 
@@ -387,42 +420,6 @@ using 1.2.x in preference to 1.1.x.
 
 
 
-
-
-2016-02-16 Tomcat 7.0.68 Released
-
-
-
-The Apache Tomcat Project is proud to announce the release of version 7.0.68 of
-Apache Tomcat. This release contains a number of security and bug fixes
-and improvements compared to version 7.0.67. The notable changes since 7.0.67
-include:
-
-
-
-
-Restore the default for mapperContextRootRedirectEnabled to
-true
-
-
-Expand session attribute filtering on load/unload to all managers
-
-
-
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 7 changelog.
-
-
-
-
-
-Download |
-ChangeLog for 7.0.68
-
-
-
 
 
 2016-02-11 Tomcat 6.0.45 Released

Modified: tomcat/site/trunk/docs/migration-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1739743=1739742=1739743=diff
==
--- tomcat/site/trunk/docs/migration-7.html (original)
+++ tomcat/site/trunk/docs/migration-7.html Mon Apr 18 11:10:43 2016
@@ -1092,7 +1092,8 @@ of Apache Tomcat.
   "7.0.64":"1696589",
   "7.0.65":"1707663",
   "7.0.67":"1718339",
-  "7.0.68":"1729238"
+  "7.0.68":"1729238",
+  "7.0.69":"1738539"
 };
 
 formSubmit.action = 
"http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/; +
@@ -1168,8 +1169,9 @@ of Apache Tomcat.
 7.0.63
 7.0.64
 7.0.65
-7.0.67
-7.0.68
+7.0.67
+7.0.68
+7.0.69
 , new version:
 
 

buildbot success in on tomcat-8-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-8-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-8-trunk/builds/564

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1739728
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

svn commit: r1739727 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/catalina/webresources/

[markt]

Author: markt
Date: Mon Apr 18 10:07:44 2016
New Revision: 1739727

URL: http://svn.apache.org/viewvc?rev=1739727=rev
Log:
Use unique file names for each test in an effort to identify where the conflict 
is that triggers occasional CI failures.

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

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 10:07:44 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java?rev=1739727=1739726=1739727=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
 Mon Apr 18 10:07:44 2016
@@ -382,17 +382,20 @@ public abstract class AbstractTestResour
 
 @Test
 public final void testMkdirNew() {
+String newDirName = getNewDirName();
 if (isWriteable()) {
-Assert.assertTrue(resourceRoot.mkdir(getMount() + "/new-test"));
+Assert.assertTrue(resourceRoot.mkdir(getMount() + "/" + 
newDirName));
 
-File file = new File(getBaseDir(), "new-test");
+File file = new File(getBaseDir(), newDirName);
 Assert.assertTrue(file.isDirectory());
 Assert.assertTrue(file.delete());
 } else {
-Assert.assertFalse(resourceRoot.mkdir(getMount() + "/new-test"));
+Assert.assertFalse(resourceRoot.mkdir(getMount() + "/" + 
newDirName));
 }
 }
 
+protected abstract String getNewDirName();
+
 //-- 
write()
 
 @Test(expected = IllegalArgumentException.class)
@@ -449,25 +452,30 @@ public abstract class AbstractTestResour
 }
 
 @Test(expected = NullPointerException.class)
-public final void testWriteNew() {
-resourceRoot.write(getMount() + "/new-test", null, false);
+public final void testWriteNull() {
+resourceRoot.write(getMount() + "/" + getNewFileNameNull(), null, 
false);
 }
 
+protected abstract String getNewFileNameNull();
+
 @Test
 public final void testWrite() {
+String newFileName = getNewFileName();
 InputStream is = new 

svn commit: r1739728 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/webresources/

[markt]

Author: markt
Date: Mon Apr 18 10:08:14 2016
New Revision: 1739728

URL: http://svn.apache.org/viewvc?rev=1739728=rev
Log:
Use unique file names for each test in an effort to identify where the conflict 
is that triggers occasional CI failures.

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

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 10:08:14 2016
@@ -1,2 +1,2 @@
 /tomcat/tc8.5.x/trunk:1735042,1737966
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 

svn commit: r1739726 - /tomcat/trunk/test/org/apache/catalina/webresources/

[markt]

Author: markt
Date: Mon Apr 18 10:07:02 2016
New Revision: 1739726

URL: http://svn.apache.org/viewvc?rev=1739726=rev
Log:
Use unique file names for each test in an effort to identify where the conflict 
is that triggers occasional CI failures.

Modified:

tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java

tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetInternal.java

tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetMount.java

tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java

tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSetVirtual.java
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSet.java

tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java

tomcat/trunk/test/org/apache/catalina/webresources/TestFileResourceSetVirtual.java
tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSet.java

tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetInternal.java

tomcat/trunk/test/org/apache/catalina/webresources/TestJarResourceSetMount.java

Modified: 
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java?rev=1739726=1739725=1739726=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java 
(original)
+++ 
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java 
Mon Apr 18 10:07:02 2016
@@ -382,17 +382,20 @@ public abstract class AbstractTestResour
 
 @Test
 public final void testMkdirNew() {
+String newDirName = getNewDirName();
 if (isWriteable()) {
-Assert.assertTrue(resourceRoot.mkdir(getMount() + "/new-test"));
+Assert.assertTrue(resourceRoot.mkdir(getMount() + "/" + 
newDirName));
 
-File file = new File(getBaseDir(), "new-test");
+File file = new File(getBaseDir(), newDirName);
 Assert.assertTrue(file.isDirectory());
 Assert.assertTrue(file.delete());
 } else {
-Assert.assertFalse(resourceRoot.mkdir(getMount() + "/new-test"));
+Assert.assertFalse(resourceRoot.mkdir(getMount() + "/" + 
newDirName));
 }
 }
 
+protected abstract String getNewDirName();
+
 //-- 
write()
 
 @Test(expected = IllegalArgumentException.class)
@@ -449,25 +452,30 @@ public abstract class AbstractTestResour
 }
 
 @Test(expected = NullPointerException.class)
-public final void testWriteNew() {
-resourceRoot.write(getMount() + "/new-test", null, false);
+public final void testWriteNull() {
+resourceRoot.write(getMount() + "/" + getNewFileNameNull(), null, 
false);
 }
 
+protected abstract String getNewFileNameNull();
+
 @Test
 public final void testWrite() {
+String newFileName = getNewFileName();
 InputStream is = new ByteArrayInputStream("test".getBytes());
 if (isWriteable()) {
 Assert.assertTrue(resourceRoot.write(
-getMount() + "/new-test", is, false));
-File file = new File(getBaseDir(), "new-test");
+getMount() + "/" + newFileName, is, false));
+File file = new File(getBaseDir(), newFileName);
 Assert.assertTrue(file.exists());
 Assert.assertTrue(file.delete());
 } else {
 Assert.assertFalse(resourceRoot.write(
-getMount() + "/new-test", is, false));
+getMount() + "/" + newFileName, is, false));
 }
 }
 
+protected abstract String getNewFileName();
+
 // -- 
getCanonicalPath()
 
 @Test

Modified: 
tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java?rev=1739726=1739725=1739726=diff
==
--- tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestDirResourceSet.java 
Mon Apr 18 10:07:02 2016
@@ -75,4 +75,19 @@ public class TestDirResourceSet extends
 @SuppressWarnings("unused")
 Object obj = new DirResourceSet();
 }
+
+@Override
+protected String getNewDirName() {
+return "test-dir-01";
+}
+
+@Override
+protected String getNewFileNameNull() {
+return "test-null-01";
+}
+
+   

svn commit: r1739723 - in /tomcat/native/trunk/native: include/ssl_private.h src/sslcontext.c src/sslutils.c

[rjung]

Author: rjung
Date: Mon Apr 18 09:49:28 2016
New Revision: 1739723

URL: http://svn.apache.org/viewvc?rev=1739723=rev
Log:
Support for OpenSSL 1.1.0
- X509_STORE_CTX and X509_OBJECT are now opaque
This change is not yet complete. Currently I see
no API to access the CRLs in an X509_OBJECT.
I'll check the OpenSSL apps code for checking
a cert against CRLs to see, how they do it.
Probably we need to apply bigger changes to
ssl_verify_CRL().

Modified:
tomcat/native/trunk/native/include/ssl_private.h
tomcat/native/trunk/native/src/sslcontext.c
tomcat/native/trunk/native/src/sslutils.c

Modified: tomcat/native/trunk/native/include/ssl_private.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/ssl_private.h?rev=1739723=1739722=1739723=diff
==
--- tomcat/native/trunk/native/include/ssl_private.h (original)
+++ tomcat/native/trunk/native/include/ssl_private.h Mon Apr 18 09:49:28 2016
@@ -205,19 +205,22 @@
 
 /* OpenSSL 1.0.2 compatibility */
 #if OPENSSL_VERSION_NUMBER < 0x1010L
-#define TLS_method SSLv23_method
-#define TLS_client_method SSLv23_client_method
-#define TLS_server_method SSLv23_server_method
-#define OPENSSL_VERSION SSLEAY_VERSION
-#define OpenSSL_version SSLeay_version
-#define OPENSSL_malloc_init CRYPTO_malloc_init
+#define OpenSSL_version  SSLeay_version
+#define OpenSSL_version_num  SSLeay
+#define OPENSSL_VERSION  SSLEAY_VERSION
+#define OPENSSL_malloc_init  CRYPTO_malloc_init
+#define BIO_get_init(x)  (x->init)
+#define BIO_set_init(x,v)(x->init=v)
+#define BIO_get_data(x)  (x->ptr)
+#define BIO_set_data(x,v)(x->ptr=v)
+#define BIO_set_shutdown(x,v)(x->shutdown=v)
 #define X509_REVOKED_get0_serialNumber(x) x->serialNumber
-#define OpenSSL_version_num SSLeay
-#define BIO_get_init(x)   (x->init)
-#define BIO_set_init(x,v) (x->init=v)
-#define BIO_get_data(x)   (x->ptr)
-#define BIO_set_data(x,v) (x->ptr=v)
-#define BIO_set_shutdown(x,v) (x->shutdown=v)
+#define X509_STORE_CTX_get0_untrusted(x) (x->untrusted)
+#define X509_OBJECT_free(x)  {X509_OBJECT_free_contents(obj);\
+  OPENSSL_free(obj);}
+#define TLS_method   SSLv23_method
+#define TLS_client_methodSSLv23_client_method
+#define TLS_server_methodSSLv23_server_method
 #endif /* OPENSSL_VERSION_NUMBER < 0x1010L */
 
 #define MAX_ALPN_NPN_PROTO_SIZE 65535

Modified: tomcat/native/trunk/native/src/sslcontext.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1739723=1739722=1739723=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Mon Apr 18 09:49:28 2016
@@ -1755,7 +1755,7 @@ static int SSL_cert_verify(X509_STORE_CT
 
 
 // Get a stack of all certs in the chain
-STACK_OF(X509) *sk = ctx->untrusted;
+STACK_OF(X509) *sk = X509_STORE_CTX_get0_untrusted(ctx);
 
 int len = sk_X509_num(sk);
 unsigned i;

Modified: tomcat/native/trunk/native/src/sslutils.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslutils.c?rev=1739723=1739722=1739723=diff
==
--- tomcat/native/trunk/native/src/sslutils.c (original)
+++ tomcat/native/trunk/native/src/sslutils.c Mon Apr 18 09:49:28 2016
@@ -288,20 +288,29 @@ int SSL_CTX_use_certificate_chain(SSL_CT
 }
 
 static int ssl_X509_STORE_lookup(X509_STORE *store, int yype,
- X509_NAME *name, X509_OBJECT *obj)
+ X509_NAME *name, X509_OBJECT **obj)
 {
-X509_STORE_CTX ctx;
+X509_STORE_CTX *ctx;
 int rc;
 
-X509_STORE_CTX_init(, store, NULL, NULL);
-rc = X509_STORE_get_by_subject(, yype, name, obj);
-X509_STORE_CTX_cleanup();
+ctx = X509_STORE_CTX_new();
+X509_STORE_CTX_init(ctx, store, NULL, NULL);
+#if OPENSSL_VERSION_NUMBER < 0x1010L
+rc = X509_STORE_get_by_subject(ctx, yype, name, *obj);
+#else
+*obj = X509_STORE_get_X509_by_subject(ctx, yype, name);
+if (*obj == NULL) {
+rc = -1;
+}
+#endif
+X509_STORE_CTX_cleanup(ctx);
+X509_STORE_CTX_free(ctx);
 return rc;
 }
 
 static int ssl_verify_CRL(int ok, X509_STORE_CTX *ctx, tcn_ssl_conn_t *con)
 {
-X509_OBJECT obj;
+X509_OBJECT *obj;
 X509_NAME *subject, *issuer;
 X509 *cert;
 X509_CRL *crl;
@@ -350,10 +359,14 @@ static int ssl_verify_CRL(int ok, X509_S
  * Try to retrieve a CRL corresponding to the _subject_ of
  * the current certificate in order to verify it's integrity.
  */
-memset((char *), 0, sizeof(obj));
+#if OPENSSL_VERSION_NUMBER < 0x1010L
+

buildbot failure in on tomcat-8-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-8-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-8-trunk/builds/563

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1739715
Blamelist: kfujino

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 59343] the program is can't execute

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=59343

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

-- 
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: r1739716 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java

[kfujino]

Author: kfujino
Date: Mon Apr 18 09:23:13 2016
New Revision: 1739716

URL: http://svn.apache.org/viewvc?rev=1739716=rev
Log:
Set the channel instance before starting channel services.

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1739716=1739715=1739716=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
 Mon Apr 18 09:23:13 2016
@@ -143,6 +143,9 @@ public class ChannelCoordinator extends
 //listens to with the local membership settings
 if ( Channel.SND_RX_SEQ==(svc & Channel.SND_RX_SEQ) ) {
 clusterReceiver.setMessageListener(this);
+if (clusterReceiver instanceof ReceiverBase) {
+((ReceiverBase)clusterReceiver).setChannel(getChannel());
+}
 clusterReceiver.start();
 //synchronize, big time FIXME
 Member localMember = getChannel().getLocalMember(false);
@@ -160,35 +163,30 @@ public class ChannelCoordinator extends
 getClusterReceiver().getUdpPort());

 }
-if (clusterReceiver instanceof ReceiverBase) {
-((ReceiverBase)clusterReceiver).setChannel(getChannel());
-}
 valid = true;
 }
 if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
-clusterSender.start();
 if (clusterSender instanceof ReplicationTransmitter) {
 
((ReplicationTransmitter)clusterSender).setChannel(getChannel());
 }
 valid = true;
+clusterSender.start();
 }
 
 if ( Channel.MBR_RX_SEQ==(svc & Channel.MBR_RX_SEQ) ) {
 membershipService.setMembershipListener(this);
 if (membershipService instanceof McastService) {
 ((McastService)membershipService).setMessageListener(this);
-}
-membershipService.start(MembershipService.MBR_RX);
-if (membershipService instanceof McastService) {
 ((McastService)membershipService).setChannel(getChannel());
 }
+membershipService.start(MembershipService.MBR_RX);
 valid = true;
 }
 if ( Channel.MBR_TX_SEQ==(svc & Channel.MBR_TX_SEQ) ) {
-membershipService.start(MembershipService.MBR_TX);
 if (membershipService instanceof McastService) {
 ((McastService)membershipService).setChannel(getChannel());
 }
+membershipService.start(MembershipService.MBR_TX);
 valid = true;
 }
 



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

svn commit: r1739715 - /tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java

[kfujino]

Author: kfujino
Date: Mon Apr 18 09:22:31 2016
New Revision: 1739715

URL: http://svn.apache.org/viewvc?rev=1739715=rev
Log:
Set the channel instance before starting channel services.

Modified:

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1739715=1739714=1739715=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
 Mon Apr 18 09:22:31 2016
@@ -153,6 +153,9 @@ public class ChannelCoordinator extends
 //listens to with the local membership settings
 if ( Channel.SND_RX_SEQ==(svc & Channel.SND_RX_SEQ) ) {
 clusterReceiver.setMessageListener(this);
+if (clusterReceiver instanceof ReceiverBase) {
+((ReceiverBase)clusterReceiver).setChannel(getChannel());
+}
 clusterReceiver.start();
 //synchronize, big time FIXME
 Member localMember = getChannel().getLocalMember(false);
@@ -169,16 +172,13 @@ public class ChannelCoordinator extends
 getClusterReceiver().getSecurePort(),
 getClusterReceiver().getUdpPort());
 }
-if (clusterReceiver instanceof ReceiverBase) {
-((ReceiverBase)clusterReceiver).setChannel(getChannel());
-}
 valid = true;
 }
 if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
-clusterSender.start();
 if (clusterSender instanceof ReplicationTransmitter) {
 
((ReplicationTransmitter)clusterSender).setChannel(getChannel());
 }
+clusterSender.start();
 valid = true;
 }
 
@@ -186,18 +186,16 @@ public class ChannelCoordinator extends
 membershipService.setMembershipListener(this);
 if (membershipService instanceof McastService) {
 ((McastService)membershipService).setMessageListener(this);
-}
-membershipService.start(MembershipService.MBR_RX);
-if (membershipService instanceof McastService) {
 ((McastService)membershipService).setChannel(getChannel());
 }
+membershipService.start(MembershipService.MBR_RX);
 valid = true;
 }
 if ( Channel.MBR_TX_SEQ==(svc & Channel.MBR_TX_SEQ) ) {
-membershipService.start(MembershipService.MBR_TX);
 if (membershipService instanceof McastService) {
 ((McastService)membershipService).setChannel(getChannel());
 }
+membershipService.start(MembershipService.MBR_TX);
 valid = true;
 }
 



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

svn commit: r1739714 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java

[kfujino]

Author: kfujino
Date: Mon Apr 18 09:21:54 2016
New Revision: 1739714

URL: http://svn.apache.org/viewvc?rev=1739714=rev
Log:
Set the channel instance before starting channel services.

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1739714=1739713=1739714=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
 Mon Apr 18 09:21:54 2016
@@ -151,6 +151,7 @@ public class ChannelCoordinator extends
 //listens to with the local membership settings
 if ( Channel.SND_RX_SEQ==(svc & Channel.SND_RX_SEQ) ) {
 clusterReceiver.setMessageListener(this);
+clusterReceiver.setChannel(getChannel());
 clusterReceiver.start();
 //synchronize, big time FIXME
 Member localMember = getChannel().getLocalMember(false);
@@ -167,27 +168,26 @@ public class ChannelCoordinator extends
 getClusterReceiver().getSecurePort(),
 getClusterReceiver().getUdpPort());
 }
-clusterReceiver.setChannel(getChannel());
 valid = true;
 }
 if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
-clusterSender.start();
 clusterSender.setChannel(getChannel());
+clusterSender.start();
 valid = true;
 }
 
 if ( Channel.MBR_RX_SEQ==(svc & Channel.MBR_RX_SEQ) ) {
 membershipService.setMembershipListener(this);
+membershipService.setChannel(getChannel());
 if (membershipService instanceof McastService) {
 ((McastService)membershipService).setMessageListener(this);
 }
 membershipService.start(MembershipService.MBR_RX);
-membershipService.setChannel(getChannel());
 valid = true;
 }
 if ( Channel.MBR_TX_SEQ==(svc & Channel.MBR_TX_SEQ) ) {
-membershipService.start(MembershipService.MBR_TX);
 membershipService.setChannel(getChannel());
+membershipService.start(MembershipService.MBR_TX);
 valid = true;
 }
 



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

svn commit: r1739713 - /tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java

[kfujino]

Author: kfujino
Date: Mon Apr 18 09:21:16 2016
New Revision: 1739713

URL: http://svn.apache.org/viewvc?rev=1739713=rev
Log:
Set the channel instance before starting channel services.

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1739713=1739712=1739713=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java 
Mon Apr 18 09:21:16 2016
@@ -151,6 +151,7 @@ public class ChannelCoordinator extends
 //listens to with the local membership settings
 if ( Channel.SND_RX_SEQ==(svc & Channel.SND_RX_SEQ) ) {
 clusterReceiver.setMessageListener(this);
+clusterReceiver.setChannel(getChannel());
 clusterReceiver.start();
 //synchronize, big time FIXME
 Member localMember = getChannel().getLocalMember(false);
@@ -167,27 +168,26 @@ public class ChannelCoordinator extends
 getClusterReceiver().getSecurePort(),
 getClusterReceiver().getUdpPort());
 }
-clusterReceiver.setChannel(getChannel());
 valid = true;
 }
 if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
-clusterSender.start();
 clusterSender.setChannel(getChannel());
+clusterSender.start();
 valid = true;
 }
 
 if ( Channel.MBR_RX_SEQ==(svc & Channel.MBR_RX_SEQ) ) {
 membershipService.setMembershipListener(this);
+membershipService.setChannel(getChannel());
 if (membershipService instanceof McastService) {
 ((McastService)membershipService).setMessageListener(this);
 }
 membershipService.start(MembershipService.MBR_RX);
-membershipService.setChannel(getChannel());
 valid = true;
 }
 if ( Channel.MBR_TX_SEQ==(svc & Channel.MBR_TX_SEQ) ) {
-membershipService.start(MembershipService.MBR_TX);
 membershipService.setChannel(getChannel());
+membershipService.start(MembershipService.MBR_TX);
 valid = true;
 }
 



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

Project Jigsaw, Apache Tomcat and RMI related memory leaks

[Mark Thomas]

Hi,

The Apache Tomcat community was asked by Rory O'Donnell for feedback on
JDK 9 + Project Jigsaw. Having provided that feedback we were directed
here so I have reproduced that feedback below.


I've started testing Tomcat trunk with JDK 9 + Project Jigsaw and it
looks like we are going to hit a bunch of problems related to Tomcat's
memory leak protection.

The short version is there are lots of JDK calls that can result in a
reference being retained to the current class loader. If that class
loader is the web application class loader it often ends up being pinned
in memory. This triggers a memory leak when the web application is
reloaded since the web application class loader is not eligible for GC.

Tomcat generally uses reflection to find these problems. It then does
one of two things:
- If the JRE provides an API the application developer should have used
to clean up the reference, Tomcat does this for them and then logs a
very loud error message telling the developer they need to fix their app.
- If there is nothing the developer could have done to avoid the
problem, Tomcat cleans it up. Usually this is via reflection again.

Reporting this second class of issues as JRE bugs has been on my TODO
list for a long time. It looks like Java 9 is going to bump this to the
top of the list.

The first problem we have hit is related to RMI. The memory leak is
triggered by a call to:
java.rmi.registry.Registry.bind() or
java.rmi.registry.Registry.rebind()

The problem occurs when an object of a class loaded by the web
application class loader is bound to the RMI registry.

There is no standard API (that I have found) that completely removes all
references. In particular
java.rmi.registry.Registry.unbind()
doesn't help.

The code Tomcat uses to clean this up is at [1]. Essentially, we need to
remove any reference to the web application's class loader from the RMI
caches.

With JDK 9 this fails with:
java.lang.reflect.InaccessibleObjectException: Unable to make member of
class sun.rmi.transport.Target accessible:  module java.rmi does not
export sun.rmi.transport to unnamed module ...

I took a look at the JDK 9 API but I could not find a way to bypass
this.

Possible solutions include:
1. Some way that allows us to continue to use reflection as per the
current code.

2. A new method somewhere in the RMI API that clears all references
associated with a given class loader from the cache.

3. Modify Registry.unbind() so it removes all references.

4. Something else...

I do have a concern with 3 on its own that, while that would allow
applications to clear their own references, it would mean Tomcat would
have no way to check for the problem.

Ideally, I'd like to see the API extended so a) applications are able to
clean up after themselves and b) Tomcat can check for leaked references
and generate error messages for the ones found.

Any and all suggestions gratefully received.

Thanks,

Mark

[1]
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?view=annotate#l2214


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

Re: Early Access builds of JDK 9 b113 & JDK 9 with Project Jigsaw b113 (#4848) are available on java.net

[Rory O'Donnell]

Hi Mark,

Thanks for the feedback, I think the best place to get help with this is 
on the jigsaw mailing list [1]


Rgds,Rory

[1] http://mail.openjdk.java.net/pipermail/jigsaw-dev/

On 17/04/2016 21:30, Mark Thomas wrote:

On 15/04/2016 09:26, Rory O'Donnell wrote:

Hi Mark/Mladen,

Early Access b113  for JDK 9 is
available on java.net, summary of  changes are listed here
.

Early Access b113  (#4664) for JDK 9 with
Project Jigsaw is available on java.net.

  * The important change in this build is that root modules when
compiling code in the unnamed module, or when running and the main
class is loaded from the class path, do not include the EE modules.
More on this in JEP 261.
  * The other change in this build is that the -Xpatch option is now
aligned with what we have documented in JEP 261, support for the old
form has been removed.

We are very interested in hearing your experiences in testing any Early
Access builds. Have you have begun testing against
JDK 9 and or JDK 9 with Project Jigsaw EA builds, have you uncovered
showstopper issues that you would like to discuss?
We would really like to hear your findings so far, either reply to me or
via the mailing lists [1], [2].

Rory,

I've started testing Tomcat trunk with JDK 9 + Project Jigsaw and it
looks like we are going to hit a bunch of problems related to Tomcat's
memory leak protection.

The short version is there are lots of JDK calls that can result in a
reference being retained to the current class loader. If that class
loader is the web application class loader it often ends up being pinned
in memory. This triggers a memory leak when the web application is
reloaded since the web application class loader is not eligible for GC.

Tomcat generally uses reflection to find these problems. It then does
one of two things:
- If the JRE provides an API the application developer should have used
to clean up the reference, Tomcat does this for them and then logs a
very loud error message telling the developer they need to fix their app.
- If there is nothing the developer could have done to avoid the
problem, Tomcat cleans it up. Usually this is via reflection again.

Reporting this second class of issues as JRE bugs has been on my TODO
list for a long time. It looks like Java 9 is going to bump this to the
top of the list.

The first problem we have hit is related to RMI. The memory leak is
triggered by a call to:
java.rmi.registry.Registry.bind() or
java.rmi.registry.Registry.rebind()

The problem occurs when an object of a class loaded by the web
application class loader is bound to the RMI registry.

There is no standard API (that I have found) that completely removes all
references. In particular
java.rmi.registry.Registry.unbind()
doesn't help.

The code Tomcat uses to clean this up is at [1]. Essentially, we need to
remove any reference to the web application's class loader from the RMI
caches.

With JDK 9 this fails with:
java.lang.reflect.InaccessibleObjectException: Unable to make member of
class sun.rmi.transport.Target accessible:  module java.rmi does not
export sun.rmi.transport to unnamed module ...

I took a look at the JDK 9 API but I could not find a way to bypass
this.

Possible solutions include:
1. Some way that allows us to continue to use reflection as per the
current code.

2. A new method somewhere in the RMI API that clears all references
associated with a given class loader from the cache.

3. Modify Registry.unbind() so it removes all references.

4. Something else...

I do have a concern with 3 on its own that, while that would allow
applications to clear their own references, it would mean Tomcat would
have no way to check for the problem.

Ideally, I'd like to see the API extended so a) applications are able to
clean up after themselves and b) Tomcat can check for leaked references
and generate error messages for the ones they found.

Any and all suggestions gratefully received. I'm happy to take this to a
specific JRE list if you point me in the right direction.

Thanks,

Mark


[1]
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?view=annotate#l2214



--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland


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

svn commit: r1739702 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/tribes/group/ java/org/apache/catalina/tribes/membership/ java/org/apache/catalina/tribes/transport/ webapps/docs/

[kfujino]

Author: kfujino
Date: Mon Apr 18 07:57:45 2016
New Revision: 1739702

URL: http://svn.apache.org/viewvc?rev=1739702=rev
Log:
Add get/set method for the channel that is related to each Channel services.

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java

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

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

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1739702=1739701=1739702=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
 Mon Apr 18 07:57:45 2016
@@ -27,6 +27,7 @@ import org.apache.catalina.tribes.Messag
 import org.apache.catalina.tribes.UniqueId;
 import org.apache.catalina.tribes.membership.McastService;
 import org.apache.catalina.tribes.membership.StaticMember;
+import org.apache.catalina.tribes.transport.ReceiverBase;
 import org.apache.catalina.tribes.transport.ReplicationTransmitter;
 import org.apache.catalina.tribes.transport.SenderState;
 import org.apache.catalina.tribes.transport.nio.NioReceiver;
@@ -159,10 +160,16 @@ public class ChannelCoordinator extends
 getClusterReceiver().getUdpPort());

 }
+if (clusterReceiver instanceof ReceiverBase) {
+((ReceiverBase)clusterReceiver).setChannel(getChannel());
+}
 valid = true;
 }
 if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
 clusterSender.start();
+if (clusterSender instanceof ReplicationTransmitter) {
+
((ReplicationTransmitter)clusterSender).setChannel(getChannel());
+}
 valid = true;
 }
 
@@ -172,10 +179,16 @@ public class ChannelCoordinator extends
 ((McastService)membershipService).setMessageListener(this);
 }
 membershipService.start(MembershipService.MBR_RX);
+if (membershipService instanceof McastService) {
+((McastService)membershipService).setChannel(getChannel());
+}
 valid = true;
 }
 if ( Channel.MBR_TX_SEQ==(svc & Channel.MBR_TX_SEQ) ) {
 membershipService.start(MembershipService.MBR_TX);
+if (membershipService instanceof McastService) {
+((McastService)membershipService).setChannel(getChannel());
+}
 valid = true;
 }
 

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1739702=1739701=1739702=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
 Mon Apr 18 07:57:45 2016
@@ -84,6 +84,8 @@ public class McastService implements Mem
 
 protected byte[] domain;
 
+private Channel channel;
+
 /**
  * Create a membership service.
  */
@@ -441,7 +443,7 @@ public class McastService implements Mem
 impl.setRecoveryCounter(recCnt);
 long recSlpTime = 
Long.parseLong(properties.getProperty("recoverySleepTime","5000"));
 impl.setRecoverySleepTime(recSlpTime);
-
+impl.setChannel(channel);
 
 impl.start(level);
 
@@ -678,6 +680,14 @@ public class McastService implements Mem
 else setDomain(Arrays.convert(domain));
 }
 
+public Channel getChannel() {
+return channel;
+}
+
+public void setChannel(Channel channel) {
+this.channel = channel;
+}
+
 /**
  * Simple test program
  * @param args Command-line arguments

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1739702=1739701=1739702=diff
==
--- 

svn commit: r1739701 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/tribes/group/ java/org/apache/catalina/tribes/membership/ java/org/apache/catalina/tribes/transport/ webapps/docs/

[kfujino]

Author: kfujino
Date: Mon Apr 18 07:54:32 2016
New Revision: 1739701

URL: http://svn.apache.org/viewvc?rev=1739701=rev
Log:
Add get/set method for the channel that is related to each Channel services.

Modified:

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1739701=1739700=1739701=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
 Mon Apr 18 07:54:32 2016
@@ -27,6 +27,7 @@ import org.apache.catalina.tribes.Messag
 import org.apache.catalina.tribes.UniqueId;
 import org.apache.catalina.tribes.membership.McastService;
 import org.apache.catalina.tribes.membership.StaticMember;
+import org.apache.catalina.tribes.transport.ReceiverBase;
 import org.apache.catalina.tribes.transport.ReplicationTransmitter;
 import org.apache.catalina.tribes.transport.SenderState;
 import org.apache.catalina.tribes.transport.nio.NioReceiver;
@@ -168,10 +169,16 @@ public class ChannelCoordinator extends
 getClusterReceiver().getSecurePort(),
 getClusterReceiver().getUdpPort());
 }
+if (clusterReceiver instanceof ReceiverBase) {
+((ReceiverBase)clusterReceiver).setChannel(getChannel());
+}
 valid = true;
 }
 if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
 clusterSender.start();
+if (clusterSender instanceof ReplicationTransmitter) {
+
((ReplicationTransmitter)clusterSender).setChannel(getChannel());
+}
 valid = true;
 }
 
@@ -181,10 +188,16 @@ public class ChannelCoordinator extends
 ((McastService)membershipService).setMessageListener(this);
 }
 membershipService.start(MembershipService.MBR_RX);
+if (membershipService instanceof McastService) {
+((McastService)membershipService).setChannel(getChannel());
+}
 valid = true;
 }
 if ( Channel.MBR_TX_SEQ==(svc & Channel.MBR_TX_SEQ) ) {
 membershipService.start(MembershipService.MBR_TX);
+if (membershipService instanceof McastService) {
+((McastService)membershipService).setChannel(getChannel());
+}
 valid = true;
 }
 

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1739701=1739700=1739701=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
 Mon Apr 18 07:54:32 2016
@@ -77,6 +77,8 @@ public class McastService implements Mem
 
 protected byte[] domain;
 
+private Channel channel;
+
 /**
  * Create a membership service.
  */
@@ -357,7 +359,7 @@ public class McastService implements Mem
 impl.setRecoveryCounter(recCnt);
 long recSlpTime = 
Long.parseLong(properties.getProperty("recoverySleepTime","5000"));
 impl.setRecoverySleepTime(recSlpTime);
-
+impl.setChannel(channel);
 
 impl.start(level);
 
@@ -564,6 +566,14 @@ public class McastService implements Mem
 else setDomain(Arrays.convert(domain));
 }
 
+public Channel getChannel() {
+return channel;
+}
+
+public void setChannel(Channel channel) {
+this.channel = channel;
+}
+
 /**
  * Simple test program
  * @param args Command-line arguments

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1739701=1739700=1739701=diff
==
--- 

svn commit: r1739700 - in /tomcat/tc8.5.x/trunk: java/org/apache/catalina/tribes/ java/org/apache/catalina/tribes/group/ java/org/apache/catalina/tribes/membership/ java/org/apache/catalina/tribes/tra

[kfujino]

Author: kfujino
Date: Mon Apr 18 07:51:23 2016
New Revision: 1739700

URL: http://svn.apache.org/viewvc?rev=1739700=rev
Log:
Add get/set method for the channel that is related to each Channel services.

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelReceiver.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelSender.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/MembershipService.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelReceiver.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelReceiver.java?rev=1739700=1739699=1739700=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelReceiver.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelReceiver.java 
Mon Apr 18 07:51:23 2016
@@ -78,4 +78,16 @@ public interface ChannelReceiver extends
  */
 public MessageListener getMessageListener();
 
+/**
+ * Return the channel that is related to this ChannelReceiver
+ * @return Channel
+ */
+public Channel getChannel();
+
+/**
+ * Set the channel that is related to this ChannelReceiver
+ * @param channel The channel
+ */
+public void setChannel(Channel channel);
+
 }

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelSender.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelSender.java?rev=1739700=1739699=1739700=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelSender.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelSender.java Mon 
Apr 18 07:51:23 2016
@@ -68,4 +68,17 @@ public interface ChannelSender extends H
  * @see ChannelException#addFaultyMember(Member,java.lang.Exception)
  */
 public void sendMessage(ChannelMessage message, Member[] destination) 
throws ChannelException;
+
+/**
+ * Return the channel that is related to this ChannelSender
+ * @return Channel
+ */
+public Channel getChannel();
+
+/**
+ * Set the channel that is related to this ChannelSender
+ * @param channel The channel
+ */
+public void setChannel(Channel channel);
+
 }

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/MembershipService.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/MembershipService.java?rev=1739700=1739699=1739700=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/MembershipService.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/MembershipService.java 
Mon Apr 18 07:51:23 2016
@@ -144,4 +144,16 @@ public interface MembershipService {
  */
 public void broadcast(ChannelMessage message) throws ChannelException;
 
+/**
+ * Return the channel that is related to this MembershipService
+ * @return Channel
+ */
+public Channel getChannel();
+
+/**
+ * Set the channel that is related to this MembershipService
+ * @param channel The channel
+ */
+public void setChannel(Channel channel);
+
 }

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1739700=1739699=1739700=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
 Mon Apr 18 07:51:23 2016
@@ -167,10 +167,12 @@ public class ChannelCoordinator extends
 getClusterReceiver().getSecurePort(),
 getClusterReceiver().getUdpPort());
 }
+clusterReceiver.setChannel(getChannel());
 valid = true;
 }
 if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
 clusterSender.start();
+clusterSender.setChannel(getChannel());
 valid = true;
 }
 
@@ -180,10 +182,12 @@ 

svn commit: r1739699 - in /tomcat/trunk: java/org/apache/catalina/tribes/ java/org/apache/catalina/tribes/group/ java/org/apache/catalina/tribes/membership/ java/org/apache/catalina/tribes/transport/

[kfujino]

Author: kfujino
Date: Mon Apr 18 07:47:52 2016
New Revision: 1739699

URL: http://svn.apache.org/viewvc?rev=1739699=rev
Log:
Add get/set method for the channel that is related to each Channel services.

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/ChannelReceiver.java
tomcat/trunk/java/org/apache/catalina/tribes/ChannelSender.java
tomcat/trunk/java/org/apache/catalina/tribes/MembershipService.java
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java

tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java

tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/tribes/ChannelReceiver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ChannelReceiver.java?rev=1739699=1739698=1739699=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/ChannelReceiver.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ChannelReceiver.java Mon Apr 
18 07:47:52 2016
@@ -78,4 +78,16 @@ public interface ChannelReceiver extends
  */
 public MessageListener getMessageListener();
 
+/**
+ * Return the channel that is related to this ChannelReceiver
+ * @return Channel
+ */
+public Channel getChannel();
+
+/**
+ * Set the channel that is related to this ChannelReceiver
+ * @param channel The channel
+ */
+public void setChannel(Channel channel);
+
 }

Modified: tomcat/trunk/java/org/apache/catalina/tribes/ChannelSender.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ChannelSender.java?rev=1739699=1739698=1739699=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/ChannelSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ChannelSender.java Mon Apr 18 
07:47:52 2016
@@ -68,4 +68,17 @@ public interface ChannelSender extends H
  * @see ChannelException#addFaultyMember(Member,java.lang.Exception)
  */
 public void sendMessage(ChannelMessage message, Member[] destination) 
throws ChannelException;
+
+/**
+ * Return the channel that is related to this ChannelSender
+ * @return Channel
+ */
+public Channel getChannel();
+
+/**
+ * Set the channel that is related to this ChannelSender
+ * @param channel The channel
+ */
+public void setChannel(Channel channel);
+
 }

Modified: tomcat/trunk/java/org/apache/catalina/tribes/MembershipService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/MembershipService.java?rev=1739699=1739698=1739699=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/MembershipService.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/MembershipService.java Mon Apr 
18 07:47:52 2016
@@ -144,4 +144,16 @@ public interface MembershipService {
  */
 public void broadcast(ChannelMessage message) throws ChannelException;
 
+/**
+ * Return the channel that is related to this MembershipService
+ * @return Channel
+ */
+public Channel getChannel();
+
+/**
+ * Set the channel that is related to this MembershipService
+ * @param channel The channel
+ */
+public void setChannel(Channel channel);
+
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1739699=1739698=1739699=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java 
Mon Apr 18 07:47:52 2016
@@ -167,10 +167,12 @@ public class ChannelCoordinator extends
 getClusterReceiver().getSecurePort(),
 getClusterReceiver().getUdpPort());
 }
+clusterReceiver.setChannel(getChannel());
 valid = true;
 }
 if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
 clusterSender.start();
+clusterSender.setChannel(getChannel());
 valid = true;
 }
 
@@ -180,10 +182,12 @@ public class ChannelCoordinator extends
 ((McastService)membershipService).setMessageListener(this);
 }
 membershipService.start(MembershipService.MBR_RX);
+  

[Bug 59344] New: PEM file support for JSSE

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=59344

Bug ID: 59344
   Summary: PEM file support for JSSE
   Product: Tomcat 9
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: ebo...@apache.org

Hi,

Currently Tomcat accepts PEM encoded certificates when using the APR connector
with OpenSSL only. I'd like to suggest extending the PEM files support to the
JSSE connector too. That would make it easier to switch between configurations
with the same certificate format, or reusing the certificates generated by
letsencrypt as is without importing them into a PKCS12/JKS keystore.

I got a quick look at the code and I think this could be implemented by
creating an in-memory KeyStore in JSSEUtil.getKeyManagers() and initializing it
with the certificate chain and the private key loaded from the PEM files.

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