svn commit: r1681280 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: rjung
Date: Sat May 23 07:30:53 2015
New Revision: 1681280
URL: http://svn.apache.org/r1681280
Log:
OpenSSL removed (broken) support for
EXP-DH-RSA-DES-CBC-SHA and EXP-DH-DSS-DES-CBC-SHA
on 2015-05-23.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1681280&r1=1681279&r2=1681280&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Sat May 23 07:30:53 2015
@@ -101,6 +101,11 @@ public class TestCipher {
if (openSSLAlias.contains("DHE-DSS-RC4-SHA")) {
continue;
}
+// OpenSSL removed (broken) support for EXP-DH-RSA-DES-CBC-SHA
+// and EXP-DH-DSS-DES-CBC-SHA on 2015-05-23.
+if (openSSLAlias.contains("EXP-DH-")) {
+continue;
+}
// RC2-MD5 is not referenced in the OpenSSL source so exclude it
// from the expected list
if (openSSLAlias.contains("RC2-MD5")) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681281 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: rjung Date: Sat May 23 07:32:41 2015 New Revision: 1681281 URL: http://svn.apache.org/r1681281 Log: OpenSSL removed (broken) support for EXP-DH-RSA-DES-CBC-SHA and EXP-DH-DSS-DES-CBC-SHA on 2015-05-23. Backport of r1681280 from trunk. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat May 23 07:32:41 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,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,1681123,1681138 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634
svn commit: r1681283 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Author: rjung
Date: Sat May 23 07:42:07 2015
New Revision: 1681283
URL: http://svn.apache.org/r1681283
Log:
OpenSSL removed (broken) support for
EXP-DH-RSA-DES-CBC-SHA and EXP-DH-DSS-DES-CBC-SHA
on 2015-05-23.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1681283&r1=1681282&r2=1681283&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Sat May 23 07:42:07 2015
@@ -55,7 +55,12 @@ public class TesterOpenSSL {
Cipher.SSL2_DES_192_EDE3_CBC_WITH_MD5,
Cipher.SSL2_IDEA_128_CBC_WITH_MD5,
Cipher.SSL2_RC2_CBC_128_CBC_WITH_MD5,
-Cipher.SSL2_RC4_128_EXPORT40_WITH_MD5)));
+Cipher.SSL2_RC4_128_EXPORT40_WITH_MD5,
+// The following have been removed from OpenSSL on
2015-05-23
+Cipher.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA,
+Cipher.SSL_DH_RSA_EXPORT_WITH_DES40_CBC_SHA,
+Cipher.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA,
+Cipher.SSL_DH_DSS_EXPORT_WITH_DES40_CBC_SHA)));
static {
// Note: The tests are configured for the OpenSSL 1.1.0 development
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681284 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Author: rjung Date: Sat May 23 07:44:57 2015 New Revision: 1681284 URL: http://svn.apache.org/r1681284 Log: OpenSSL removed (broken) support for EXP-DH-RSA-DES-CBC-SHA and EXP-DH-DSS-DES-CBC-SHA on 2015-05-23. Backport of r1681283 from trunk. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat May 23 07:44:57 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,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,1681123,1681138,1681280 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643
svn commit: r1681285 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/tribes/group/interceptors/ java/org/apache/catalina/tribes/io/ java/org/apache/catalina/tribes/transport/nio/
Author: rjung Date: Sat May 23 07:53:44 2015 New Revision: 1681285 URL: http://svn.apache.org/r1681285 Log: Checkstyle fix. Backport of r1681056 from trunk. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat May 23 07:53:44 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,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,1681123,1681138,1681280,1681283 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-16417
svn commit: r1681286 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Author: rjung
Date: Sat May 23 08:05:48 2015
New Revision: 1681286
URL: http://svn.apache.org/r1681286
Log:
Followup to r1681283: those two do not exist.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1681286&r1=1681285&r2=1681286&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Sat May 23 08:05:48 2015
@@ -58,9 +58,7 @@ public class TesterOpenSSL {
Cipher.SSL2_RC4_128_EXPORT40_WITH_MD5,
// The following have been removed from OpenSSL on
2015-05-23
Cipher.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA,
-Cipher.SSL_DH_RSA_EXPORT_WITH_DES40_CBC_SHA,
-Cipher.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA,
-Cipher.SSL_DH_DSS_EXPORT_WITH_DES40_CBC_SHA)));
+Cipher.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA)));
static {
// Note: The tests are configured for the OpenSSL 1.1.0 development
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681287 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Author: rjung Date: Sat May 23 08:06:56 2015 New Revision: 1681287 URL: http://svn.apache.org/r1681287 Log: Followup to r1681284: those two do not exist. Backport of r1681286 from trunk. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat May 23 08:06:56 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,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 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643
Re: svn commit: r1681138 - in /tomcat/trunk/java/org/apache/catalina/util: LifecycleBase.java LocalStrings.properties
Am 22.05.2015 um 16:55 schrieb ma...@apache.org:
Author: markt
Date: Fri May 22 14:55:06 2015
New Revision: 1681138
URL: http://svn.apache.org/r1681138
Log:
Log errors processing LifecycleListener events and continue rather than
allowing uncaught exception to propagate
Modified:
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java?rev=1681138&r1=1681137&r2=1681138&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Fri May 22
14:55:06 2015
@@ -117,7 +117,13 @@ public abstract class LifecycleBase impl
LifecycleEvent event = new LifecycleEvent(this, type, data);
LifecycleListener interested[] = listeners;
for (int i = 0; i < interested.length; i++) {
-interested[i].lifecycleEvent(event);
+try {
+interested[i].lifecycleEvent(event);
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+log.error(sm.getString("lifecycleBase.listenerFail",
+type, interested[i].getClass().getName()), t);
+}
}
}
Currently the unit test testWebappListenerConfigureFail() in
TestStandardContext fails due to the context startup with a
FailingLifecycleListener no longer throwing an exception.
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681290 - /tomcat/native/trunk/native/src/address.c
Author: rjung
Date: Sat May 23 08:37:51 2015
New Revision: 1681290
URL: http://svn.apache.org/r1681290
Log:
Sync trunk with 1.1 branch: Forward port
r1291760 | mturk | 2012-02-21 14:15:42 +0100 (Tue, 21 Feb 2012) | 1 line
Fix BZ52717 by allowing to have %scope_id as address suffix for local-link IPv6
addresses
Modified:
tomcat/native/trunk/native/src/address.c
Modified: tomcat/native/trunk/native/src/address.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/address.c?rev=1681290&r1=1681289&r2=1681290&view=diff
==
--- tomcat/native/trunk/native/src/address.c (original)
+++ tomcat/native/trunk/native/src/address.c Sat May 23 08:37:51 2015
@@ -29,6 +29,8 @@ TCN_IMPLEMENT_CALL(jlong, Address, info)
{
apr_pool_t *p = J2P(pool, apr_pool_t *);
TCN_ALLOC_CSTRING(hostname);
+char *sp = NULL;
+int scope_id = 0;
apr_sockaddr_t *sa = NULL;
apr_sockaddr_t *sl = NULL;
apr_int32_t f;
@@ -36,6 +38,16 @@ TCN_IMPLEMENT_CALL(jlong, Address, info)
UNREFERENCED(o);
GET_S_FAMILY(f, family);
+#if APR_HAVE_IPV6
+if (hostname) {
+/* XXX: This only works for real scope_id's
+ */
+if ((sp = strchr(J2S(hostname), '%'))) {
+*sp++ = '\0';
+scope_id = atoi(sp);
+}
+}
+#endif
TCN_THROW_IF_ERR(apr_sockaddr_info_get(&sa,
J2S(hostname), f, (apr_port_t)port,
(apr_int32_t)flags, p), sa);
@@ -58,6 +70,13 @@ TCN_IMPLEMENT_CALL(jlong, Address, info)
sl = sa;
}
}
+if (sp) {
+/* Set the provided scope id
+ * APR lack the api for setting this directly so lets presume
+ * the sin6_scope_id is present everywhere
+ */
+sl->sa.sin6.sin6_scope_id = scope_id;
+}
#endif
cleanup:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681291 - in /tomcat/native/trunk/native/src: file.c network.c
Author: rjung
Date: Sat May 23 08:42:58 2015
New Revision: 1681291
URL: http://svn.apache.org/r1681291
Log:
Sync trunk with 1.1 branch: Forward ports
r1350280 | rjung | 2012-06-14 16:54:48 +0200 (Thu, 14 Jun 2012) | 3 lines
Cast pointers to fix compiler warnings about
pointer signedness differences on Solaris.
r1403635 | mturk | 2012-10-30 08:27:04 +0100 (Tue, 30 Oct 2012) | 1 line
Try to fix BZ54064. In case nothing was written, don't loop endlesly
Modified:
tomcat/native/trunk/native/src/file.c
tomcat/native/trunk/native/src/network.c
Modified: tomcat/native/trunk/native/src/file.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/file.c?rev=1681291&r1=1681290&r2=1681291&view=diff
==
--- tomcat/native/trunk/native/src/file.c (original)
+++ tomcat/native/trunk/native/src/file.c Sat May 23 08:42:58 2015
@@ -381,13 +381,13 @@ TCN_IMPLEMENT_CALL(jint, File, writev)(T
for (i = 0; i < nvec; i++) {
ba[i] = (*e)->GetObjectArrayElement(e, bufs, i);
vec[i].iov_len = (*e)->GetArrayLength(e, ba[i]);
-vec[i].iov_base = (*e)->GetByteArrayElements(e, ba[i], NULL);
+vec[i].iov_base = (void *)((*e)->GetByteArrayElements(e, ba[i], NULL));
}
ss = apr_file_writev(f, vec, nvec, &written);
for (i = 0; i < nvec; i++) {
-(*e)->ReleaseByteArrayElements(e, ba[i], vec[i].iov_base, JNI_ABORT);
+(*e)->ReleaseByteArrayElements(e, ba[i], (jbyte *)vec[i].iov_base,
JNI_ABORT);
}
if (ss == APR_SUCCESS)
return (jint)written;
@@ -415,7 +415,7 @@ TCN_IMPLEMENT_CALL(jint, File, writevFul
for (i = 0; i < nvec; i++) {
ba[i] = (*e)->GetObjectArrayElement(e, bufs, i);
vec[i].iov_len = (*e)->GetArrayLength(e, ba[i]);
-vec[i].iov_base = (*e)->GetByteArrayElements(e, ba[i], NULL);
+vec[i].iov_base = (void *)((*e)->GetByteArrayElements(e, ba[i], NULL));
}
#if (APR_VERSION_MAJOR >= 1) && (APR_VERSION_MINOR >= 1)
ss = apr_file_writev_full(f, vec, nvec, &written);
@@ -424,7 +424,7 @@ TCN_IMPLEMENT_CALL(jint, File, writevFul
#endif
for (i = 0; i < nvec; i++) {
-(*e)->ReleaseByteArrayElements(e, ba[i], vec[i].iov_base,
+(*e)->ReleaseByteArrayElements(e, ba[i], (jbyte *)vec[i].iov_base,
JNI_ABORT);
}
if (ss == APR_SUCCESS)
Modified: tomcat/native/trunk/native/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/network.c?rev=1681291&r1=1681290&r2=1681291&view=diff
==
--- tomcat/native/trunk/native/src/network.c (original)
+++ tomcat/native/trunk/native/src/network.c Sat May 23 08:42:58 2015
@@ -601,7 +601,7 @@ TCN_IMPLEMENT_CALL(jint, Socket, sendbb)
while (sent < nbytes) {
apr_size_t wr = nbytes - sent;
ss = (*s->net->send)(s->opaque, s->jsbbuff + offset + sent, &wr);
-if (ss != APR_SUCCESS)
+if (ss != APR_SUCCESS || wr == 0)
break;
sent += wr;
}
@@ -666,13 +666,13 @@ TCN_IMPLEMENT_CALL(jint, Socket, sendv)(
for (i = 0; i < nvec; i++) {
ba[i] = (*e)->GetObjectArrayElement(e, bufs, i);
vec[i].iov_len = (*e)->GetArrayLength(e, ba[i]);
-vec[i].iov_base = (*e)->GetByteArrayElements(e, ba[i], NULL);
+vec[i].iov_base = (void *)((*e)->GetByteArrayElements(e, ba[i], NULL));
}
ss = (*s->net->sendv)(s->opaque, vec, nvec, &written);
for (i = 0; i < nvec; i++) {
-(*e)->ReleaseByteArrayElements(e, ba[i], vec[i].iov_base, JNI_ABORT);
+(*e)->ReleaseByteArrayElements(e, ba[i], (jbyte*)vec[i].iov_base,
JNI_ABORT);
}
if (ss == APR_SUCCESS || ((APR_STATUS_IS_EAGAIN(ss) || ss == TCN_EAGAIN)
&& written > 0))
return (jint)written;
@@ -1219,12 +1219,12 @@ TCN_IMPLEMENT_CALL(jlong, Socket, sendfi
for (i = 0; i < nh; i++) {
hba[i] = (*e)->GetObjectArrayElement(e, headers, i);
hvec[i].iov_len = (*e)->GetArrayLength(e, hba[i]);
-hvec[i].iov_base = (*e)->GetByteArrayElements(e, hba[i], NULL);
+hvec[i].iov_base = (void *)((*e)->GetByteArrayElements(e, hba[i],
NULL));
}
for (i = 0; i < nt; i++) {
tba[i] = (*e)->GetObjectArrayElement(e, trailers, i);
tvec[i].iov_len = (*e)->GetArrayLength(e, tba[i]);
-tvec[i].iov_base = (*e)->GetByteArrayElements(e, tba[i], NULL);
+tvec[i].iov_base = (void *)((*e)->GetByteArrayElements(e, tba[i],
NULL));
}
hdrs.headers = &hvec[0];
hdrs.numheaders = nh;
@@ -1242,11 +1242,11 @@ TCN_IMPLEMENT_CALL(jlong, Socket, sendfi
#endif
for (i = 0; i < nh; i++) {
-(*e)->ReleaseByteArrayElements(e, hba[i], hvec[i].iov_base, JNI_ABORT);
+(*e)->ReleaseByteArrayElements(e, hba[i], (jbyte*)hvec[i].iov_base,
JNI_ABORT);
}
for (i = 0; i < nt; i++) {
-
svn commit: r1681292 - in /tomcat/native/trunk/native: include/tcn_api.h src/jnilib.c
Author: rjung
Date: Sat May 23 08:47:26 2015
New Revision: 1681292
URL: http://svn.apache.org/r1681292
Log:
Sync trunk with 1.1 branch: Forward port
r1292841 | mturk | 2012-02-23 17:21:11 +0100 (Thu, 23 Feb 2012) | 1 line
Axe so called public API which was never used. We are always loaded from JVM so
no need for useless exports
Modified:
tomcat/native/trunk/native/include/tcn_api.h
tomcat/native/trunk/native/src/jnilib.c
Modified: tomcat/native/trunk/native/include/tcn_api.h
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/tcn_api.h?rev=1681292&r1=1681291&r2=1681292&view=diff
==
--- tomcat/native/trunk/native/include/tcn_api.h (original)
+++ tomcat/native/trunk/native/include/tcn_api.h Sat May 23 08:47:26 2015
@@ -36,108 +36,6 @@
#include
/**
- * TCN_DECLARE_EXPORT is defined when building the TCN dynamic library,
- * so that all public symbols are exported.
- *
- * TCN_DECLARE_STATIC is defined when including the TCN public headers,
- * to provide static linkage when the dynamic library may be unavailable.
- *
- * TCN_DECLARE_STATIC and TCN_DECLARE_EXPORT are left undefined when
- * including the TCN public headers, to import and link the symbols from
- * the dynamic TCN library and assure appropriate indirection and calling
- * conventions at compile time.
- */
-
-#if !defined(WIN32)
-/**
- * The public TCN functions are declared with TCN_DECLARE(), so they may
- * use the most appropriate calling convention. Public APR functions with
- * variable arguments must use TCN_DECLARE_NONSTD().
- *
- * @deffunc TCN_DECLARE(rettype) apr_func(args);
- */
-#define TCN_DECLARE(type)type
-/**
- * The public TCN functions using variable arguments are declared with
- * TCN_DECLARE_NONSTD(), as they must use the C language calling convention.
- *
- * @deffunc TCN_DECLARE_NONSTD(rettype) apr_func(args, ...);
- */
-#define TCN_DECLARE_NONSTD(type) type
-/**
- * The public TCN variables are declared with TCN_DECLARE_DATA.
- * This assures the appropriate indirection is invoked at compile time.
- *
- * @deffunc TCN_DECLARE_DATA type apr_variable;
- * @tip extern TCN_DECLARE_DATA type apr_variable; syntax is required for
- * declarations within headers to properly import the variable.
- */
-#define TCN_DECLARE_DATA
-#elif defined(TCN_DECLARE_STATIC)
-#define TCN_DECLARE(type)type __stdcall
-#define TCN_DECLARE_NONSTD(type) type
-#define TCN_DECLARE_DATA
-#elif defined(TCN_DECLARE_EXPORT)
-#define TCN_DECLARE(type)__declspec(dllexport) type __stdcall
-#define TCN_DECLARE_NONSTD(type) __declspec(dllexport) type
-#define TCN_DECLARE_DATA __declspec(dllexport)
-#else
-/**
- * The public TCN functions are declared with TCN_DECLARE(), so they may
- * use the most appropriate calling convention. Public APR functions with
- * variable arguments must use TCN_DECLARE_NONSTD().
- *
- */
-#define TCN_DECLARE(type)__declspec(dllimport) type __stdcall
-/**
- * The public TCN functions using variable arguments are declared with
- * TCN_DECLARE_NONSTD(), as they must use the C language calling convention.
- *
- */
-#define TCN_DECLARE_NONSTD(type) __declspec(dllimport) type
-/**
- * The public TCN variables are declared with TCN_DECLARE_DATA.
- * This assures the appropriate indirection is invoked at compile time.
- *
- * @remark extern TCN_DECLARE_DATA type apr_variable; syntax is required for
- * declarations within headers to properly import the variable.
- */
-#define TCN_DECLARE_DATA __declspec(dllimport)
-#endif
-
-#if !defined(WIN32) || defined(TCN_MODULE_DECLARE_STATIC)
-/**
- * Declare a dso module's exported module structure as TCN_MODULE_DECLARE_DATA.
- *
- * Unless TCN_MODULE_DECLARE_STATIC is defined at compile time, symbols
- * declared with TCN_MODULE_DECLARE_DATA are always exported.
- * @code
- * module TCN_MODULE_DECLARE_DATA mod_tag
- * @endcode
- */
-#if defined(WIN32)
-#define TCN_MODULE_DECLARE(type)type __stdcall
-#else
-#define TCN_MODULE_DECLARE(type)type
-#endif
-#define TCN_MODULE_DECLARE_NONSTD(type) type
-#define TCN_MODULE_DECLARE_DATA
-#else
-/**
- * TCN_MODULE_DECLARE_EXPORT is a no-op. Unless contradicted by the
- * TCN_MODULE_DECLARE_STATIC compile-time symbol, it is assumed and defined.
- */
-#define TCN_MODULE_DECLARE_EXPORT
-#define TCN_MODULE_DECLARE(type) __declspec(dllexport) type __stdcall
-#define TCN_MODULE_DECLARE_NONSTD(type) __declspec(dllexport) type
-#define TCN_MODULE_DECLARE_DATA __declspec(dllexport)
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
* @file tcn_api.h
* @brief
*
@@ -146,19 +44,19 @@ extern "C" {
/* Return global apr pool
*/
-TCN_DECLARE(apr_pool_t *) tcn_get_global_pool(void);
+apr_pool_t *tcn_get_global_pool(void);
/* Return global String class
*/
-TCN_DECLARE(jclass) tcn_get_string_class(void);
+j
svn commit: r1681293 - in /tomcat/native/trunk/native/os/win32: ntpipe.c registry.c system.c
Author: rjung
Date: Sat May 23 08:49:51 2015
New Revision: 1681293
URL: http://svn.apache.org/r1681293
Log:
Sync trunk with 1.1 branch: Forward port
r1293184 | mturk | 2012-02-24 12:26:45 +0100 (Fri, 24 Feb 2012) | 1 line
Fix compile warnings on win64
Modified:
tomcat/native/trunk/native/os/win32/ntpipe.c
tomcat/native/trunk/native/os/win32/registry.c
tomcat/native/trunk/native/os/win32/system.c
Modified: tomcat/native/trunk/native/os/win32/ntpipe.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/ntpipe.c?rev=1681293&r1=1681292&r2=1681293&view=diff
==
--- tomcat/native/trunk/native/os/win32/ntpipe.c (original)
+++ tomcat/native/trunk/native/os/win32/ntpipe.c Sat May 23 08:49:51 2015
@@ -197,7 +197,7 @@ ntp_socket_recv(apr_socket_t *sock, char
tcn_ntp_conn_t *con = (tcn_ntp_conn_t *)sock;
DWORD readed;
-if (!ReadFile(con->h_pipe, buf, *len, &readed, &con->rd_o)) {
+if (!ReadFile(con->h_pipe, buf, (DWORD)*len, &readed, &con->rd_o)) {
DWORD err = GetLastError();
if (err == ERROR_IO_PENDING) {
DWORD r = WaitForSingleObject(con->rd_event, con->timeout);
@@ -223,7 +223,7 @@ ntp_socket_send(apr_socket_t *sock, cons
tcn_ntp_conn_t *con = (tcn_ntp_conn_t *)sock;
DWORD written;
-if (!WriteFile(con->h_pipe, buf, *len, &written, &con->wr_o)) {
+if (!WriteFile(con->h_pipe, buf, (DWORD)*len, &written, &con->wr_o)) {
DWORD err = GetLastError();
if (err == ERROR_IO_PENDING) {
DWORD r = WaitForSingleObject(con->wr_event, con->timeout);
Modified: tomcat/native/trunk/native/os/win32/registry.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/registry.c?rev=1681293&r1=1681292&r2=1681293&view=diff
==
--- tomcat/native/trunk/native/os/win32/registry.c (original)
+++ tomcat/native/trunk/native/os/win32/registry.c Sat May 23 08:49:51 2015
@@ -400,7 +400,7 @@ TCN_IMPLEMENT_CALL(jstring, Registry, ge
free(vw);
goto cleanup;
}
-v = (*e)->NewString((e), vw, wcslen(vw));
+v = (*e)->NewString((e), vw, lstrlenW(vw));
free(vw);
}
cleanup:
@@ -545,7 +545,7 @@ TCN_IMPLEMENT_CALL(jint, Registry, setVa
TCN_ASSERT(key != 0);
TCN_INIT_WSTRING(name);
TCN_INIT_WSTRING(val);
-len = wcslen(J2W(val));
+len = lstrlenW(J2W(val));
rc = RegSetValueExW(k->key, J2W(name), 0, REG_SZ,
(CONST BYTE *)J2W(val), (len + 1) * 2);
TCN_FREE_WSTRING(name);
@@ -566,7 +566,7 @@ TCN_IMPLEMENT_CALL(jint, Registry, setVa
TCN_ASSERT(key != 0);
TCN_INIT_WSTRING(name);
TCN_INIT_WSTRING(val);
-len = wcslen(J2W(val));
+len = lstrlenW(J2W(val));
rc = RegSetValueExW(k->key, J2W(name), 0, REG_EXPAND_SZ,
(CONST BYTE *)J2W(val), (len + 1) * 2);
TCN_FREE_WSTRING(name);
@@ -682,7 +682,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, Registr
NULL,
&ftLastWriteTime);
if (rc == (DWORD)ERROR_SUCCESS) {
-s = (*e)->NewString((e), achKey, wcslen(achKey));
+s = (*e)->NewString((e), achKey, lstrlenW(achKey));
(*e)->SetObjectArrayElement((e), v, idx, s);
}
}
@@ -747,7 +747,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, Registr
NULL,// &bData,
NULL); // &bcData
if (rc == (DWORD)ERROR_SUCCESS) {
-s = (*e)->NewString((e), achValue, wcslen(achValue));
+s = (*e)->NewString((e), achValue, lstrlenW(achValue));
(*e)->SetObjectArrayElement((e), v, idx, s);
}
}
Modified: tomcat/native/trunk/native/os/win32/system.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/system.c?rev=1681293&r1=1681292&r2=1681293&view=diff
==
--- tomcat/native/trunk/native/os/win32/system.c (original)
+++ tomcat/native/trunk/native/os/win32/system.c Sat May 23 08:49:51 2015
@@ -167,11 +167,11 @@ TCN_IMPLEMENT_CALL(jstring, OS, expand)(
if (len > (TCN_BUFFER_SZ - 1)) {
jchar *dbuf = malloc((len + 1) * 2);
ExpandEnvironmentStringsW(J2W(val), dbuf, len);
-str = (*e)->NewString(e, dbuf, wcslen(dbuf));
+str = (*e)->NewString(e, dbuf, lstrlenW(dbuf));
free(dbuf);
}
else
-str = (*e)->NewString(e, buf, wcslen(buf));
+str = (*e)->NewString(e, buf, lstrlenW(buf));
TCN_FREE_WSTRING(val);
return str;
@@ -197,7 +197,7 @@ static void init_log_source(const char *
strcat(event_key, domain);
if (!RegCreateKey(HKEY_LOCAL_MACHINE, event_key, &key)) {
RegSetValueEx(key, "EventMess
svn commit: r1681295 - /tomcat/native/trunk/native/include/ssl_private.h
Author: rjung Date: Sat May 23 09:09:59 2015 New Revision: 1681295 URL: http://svn.apache.org/r1681295 Log: Remove unused leftovers from old DH temp key solution. Modified: tomcat/native/trunk/native/include/ssl_private.h Modified: tomcat/native/trunk/native/include/ssl_private.h URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/ssl_private.h?rev=1681295&r1=1681294&r2=1681295&view=diff == --- tomcat/native/trunk/native/include/ssl_private.h (original) +++ tomcat/native/trunk/native/include/ssl_private.h Sat May 23 09:09:59 2015 @@ -71,15 +71,6 @@ #define SSL_AIDX_DSA (1) #define SSL_AIDX_MAX (2) -/* - * Define IDs for the temporary RSA keys and DH params - */ - -#define SSL_TMP_KEY_DH_512 (1) -#define SSL_TMP_KEY_DH_1024 (2) -#define SSL_TMP_KEY_DH_2048 (3) -#define SSL_TMP_KEY_DH_4096 (4) - #define SSL_CRT_FORMAT_UNDEF(0) #define SSL_CRT_FORMAT_ASN1 (1) #define SSL_CRT_FORMAT_TEXT (2) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681298 - in /tomcat/native/trunk: examples/org/apache/tomcat/jni/ native/include/ native/os/netware/ native/os/unix/ native/os/win32/ native/src/ test/org/apache/tomcat/jni/ xdocs/
Author: rjung
Date: Sat May 23 09:28:12 2015
New Revision: 1681298
URL: http://svn.apache.org/r1681298
Log:
Remove $id and author tags.
author tags were only from Mladen and Jean-Frederic,
who both agreed on removal on TC trunk in 2014.
So I guess removal here is also OK, especially since
no other authors were noted on the author tags.
Modified:
tomcat/native/trunk/examples/org/apache/tomcat/jni/Echo.java
tomcat/native/trunk/examples/org/apache/tomcat/jni/LocalServer.java
tomcat/native/trunk/examples/org/apache/tomcat/jni/SSLServer.java
tomcat/native/trunk/native/include/ssl_private.h
tomcat/native/trunk/native/include/tcn.h
tomcat/native/trunk/native/include/tcn_api.h
tomcat/native/trunk/native/include/tcn_version.h
tomcat/native/trunk/native/os/netware/system.c
tomcat/native/trunk/native/os/unix/system.c
tomcat/native/trunk/native/os/unix/uxpipe.c
tomcat/native/trunk/native/os/win32/ntpipe.c
tomcat/native/trunk/native/os/win32/registry.c
tomcat/native/trunk/native/os/win32/system.c
tomcat/native/trunk/native/src/address.c
tomcat/native/trunk/native/src/bb.c
tomcat/native/trunk/native/src/dir.c
tomcat/native/trunk/native/src/error.c
tomcat/native/trunk/native/src/file.c
tomcat/native/trunk/native/src/info.c
tomcat/native/trunk/native/src/jnilib.c
tomcat/native/trunk/native/src/lock.c
tomcat/native/trunk/native/src/misc.c
tomcat/native/trunk/native/src/mmap.c
tomcat/native/trunk/native/src/multicast.c
tomcat/native/trunk/native/src/network.c
tomcat/native/trunk/native/src/os.c
tomcat/native/trunk/native/src/poll.c
tomcat/native/trunk/native/src/pool.c
tomcat/native/trunk/native/src/proc.c
tomcat/native/trunk/native/src/shm.c
tomcat/native/trunk/native/src/ssl.c
tomcat/native/trunk/native/src/sslcontext.c
tomcat/native/trunk/native/src/sslinfo.c
tomcat/native/trunk/native/src/sslnetwork.c
tomcat/native/trunk/native/src/sslutils.c
tomcat/native/trunk/native/src/stdlib.c
tomcat/native/trunk/native/src/thread.c
tomcat/native/trunk/native/src/user.c
tomcat/native/trunk/test/org/apache/tomcat/jni/FileTestSuite.java
tomcat/native/trunk/test/org/apache/tomcat/jni/SocketServerTestBind.java
tomcat/native/trunk/test/org/apache/tomcat/jni/SocketServerTestSuite.java
tomcat/native/trunk/xdocs/style.xsl
Modified: tomcat/native/trunk/examples/org/apache/tomcat/jni/Echo.java
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/examples/org/apache/tomcat/jni/Echo.java?rev=1681298&r1=1681297&r2=1681298&view=diff
==
--- tomcat/native/trunk/examples/org/apache/tomcat/jni/Echo.java (original)
+++ tomcat/native/trunk/examples/org/apache/tomcat/jni/Echo.java Sat May 23
09:28:12 2015
@@ -21,9 +21,6 @@ import java.io.InputStream;
import java.util.Properties;
/** Echo server example
- *
- * @author Mladen Turk
- * @version $Id$
*/
public class Echo {
Modified: tomcat/native/trunk/examples/org/apache/tomcat/jni/LocalServer.java
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/examples/org/apache/tomcat/jni/LocalServer.java?rev=1681298&r1=1681297&r2=1681298&view=diff
==
--- tomcat/native/trunk/examples/org/apache/tomcat/jni/LocalServer.java
(original)
+++ tomcat/native/trunk/examples/org/apache/tomcat/jni/LocalServer.java Sat May
23 09:28:12 2015
@@ -20,9 +20,6 @@ import java.io.InputStream;
import java.util.Properties;
/** Local Socket server example
- *
- * @author Mladen Turk
- * @version $Id$
*/
public class LocalServer {
Modified: tomcat/native/trunk/examples/org/apache/tomcat/jni/SSLServer.java
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/examples/org/apache/tomcat/jni/SSLServer.java?rev=1681298&r1=1681297&r2=1681298&view=diff
==
--- tomcat/native/trunk/examples/org/apache/tomcat/jni/SSLServer.java (original)
+++ tomcat/native/trunk/examples/org/apache/tomcat/jni/SSLServer.java Sat May
23 09:28:12 2015
@@ -20,9 +20,6 @@ import java.io.InputStream;
import java.util.Properties;
/** SSL Server server example
- *
- * @author Mladen Turk
- * @version $Id$
*/
public class SSLServer {
Modified: tomcat/native/trunk/native/include/ssl_private.h
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/ssl_private.h?rev=1681298&r1=1681297&r2=1681298&view=diff
==
--- tomcat/native/trunk/native/include/ssl_private.h (original)
+++ tomcat/native/trunk/native/include/ssl_private.h Sat May 23 09:28:12 2015
@@ -14,12 +14,6 @@
* limitations under the License.
*/
-/*
- *
- * @author Mladen Turk
- * @version $Id$
- */
-
#ifndef SSL_PRIVATE_H
#define SSL_PRIVATE_H
Modified: tomcat/native/trunk/native/include
svn commit: r1681300 - in /tomcat/native/trunk: build.properties.default build.xml java/ java/org/ java/org/apache/ java/org/apache/tomcat/ java/org/apache/tomcat/Apr.java java/org/apache/tomcat/apr.p
Author: rjung
Date: Sat May 23 09:44:41 2015
New Revision: 1681300
URL: http://svn.apache.org/r1681300
Log:
Make tcnative trunk more consistent with 1.1 branch:
- use externals for jni Java classes, but here
pointing to TC trunk
- remove download and copy targets for jni
Java classes in build script
- add Apr.java and apr.properties from 1.1a
In addition:
- use Java 8 in trunk
- expect next version to be 1.2 instead of 2.0
Added:
tomcat/native/trunk/java/
tomcat/native/trunk/java/org/
tomcat/native/trunk/java/org/apache/
tomcat/native/trunk/java/org/apache/tomcat/ (with props)
tomcat/native/trunk/java/org/apache/tomcat/Apr.java (with props)
tomcat/native/trunk/java/org/apache/tomcat/apr.properties (with props)
Modified:
tomcat/native/trunk/build.properties.default
tomcat/native/trunk/build.xml
Modified: tomcat/native/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/build.properties.default?rev=1681300&r1=1681299&r2=1681300&view=diff
==
--- tomcat/native/trunk/build.properties.default (original)
+++ tomcat/native/trunk/build.properties.default Sat May 23 09:44:41 2015
@@ -16,8 +16,8 @@
#
# - Version Control Flags -
-version.major=2
-version.minor=0
+version.major=1
+version.minor=2
version.build=0
version.patch=0
version.suffix=-dev
@@ -30,8 +30,8 @@ base.path=/usr/share/java
#base.path=C:/path/to/the/repository
#base.path=/usr/local
-compile.source=1.4
-compile.target=1.4
+compile.source=1.8
+compile.target=1.8
compile.debug=off
compile.deprecation=on
compile.optimize=on
@@ -39,16 +39,6 @@ compile.optimize=on
base-tomcat.loc=http://archive.apache.org/dist/tomcat
base-sf.loc=http://downloads.sourceforge.net
-# - Tomcat native Java sources -
-# The Tomcat 6 version we use for getting the Java sources
-tomcat.version=6.0.20
-# The directory containing your source distribution of Tomcat
-# It will be automatically downloaded if it doesn't exist
-tomcat.src=${base.path}/apache-tomcat-${tomcat.version}-src
-#tomcat.src=/usr/local/apache-tomcat-${tomcat.version}-src
-# The URL used to download Tomcat if needed
-tomcat.loc=${base-tomcat.loc}/tomcat-6/v${tomcat.version}/src/apache-tomcat-${tomcat.version}-src.tar.gz
-
# - JUnit Unit Test Suite, version 3.8 or later -
# The JUnit version we will use
junit.version=3.8.2
Modified: tomcat/native/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/build.xml?rev=1681300&r1=1681299&r2=1681300&view=diff
==
--- tomcat/native/trunk/build.xml (original)
+++ tomcat/native/trunk/build.xml Sat May 23 09:44:41 2015
@@ -31,8 +31,8 @@
-
-
+
+
@@ -54,8 +54,8 @@
-
-
+
+
@@ -153,10 +153,6 @@
-
-
-
-
@@ -215,12 +211,6 @@ limitations under the License.-->">
-
-
-
-
-
-
Propchange: tomcat/native/trunk/java/org/apache/tomcat/
--
--- svn:externals (added)
+++ svn:externals Sat May 23 09:44:41 2015
@@ -0,0 +1 @@
+^/tomcat/trunk/java/org/apache/tomcat/jni@1678592 jni
Added: tomcat/native/trunk/java/org/apache/tomcat/Apr.java
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/java/org/apache/tomcat/Apr.java?rev=1681300&view=auto
==
--- tomcat/native/trunk/java/org/apache/tomcat/Apr.java (added)
+++ tomcat/native/trunk/java/org/apache/tomcat/Apr.java Sat May 23 09:44:41 2015
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.tomcat;
+
+import java.io.InputStream;
+import java.util.Properties;
+
+public class Apr {
+private static String aprInfo = null;
+
+static {
+
+try {
+InputStream is = Apr.class.getResourceAsStream
+
svn commit: r1681301 - /tomcat/native/trunk/java/overview.html
Author: rjung Date: Sat May 23 09:45:39 2015 New Revision: 1681301 URL: http://svn.apache.org/r1681301 Log: Added from 1.1 branch. Added: tomcat/native/trunk/java/overview.html (with props) Added: tomcat/native/trunk/java/overview.html URL: http://svn.apache.org/viewvc/tomcat/native/trunk/java/overview.html?rev=1681301&view=auto == --- tomcat/native/trunk/java/overview.html (added) +++ tomcat/native/trunk/java/overview.html Sat May 23 09:45:39 2015 @@ -0,0 +1,30 @@ + + + + +Overview Documentation for Tomcat Native + + +The Tomcat Native Library component of the Apache Tomcat +Connectors project offers JNI wrappers around APR and various other +system libraries. + + + Propchange: tomcat/native/trunk/java/overview.html -- svn:eol-style = native Propchange: tomcat/native/trunk/java/overview.html -- svn:keywords = Author Date Id Revision - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681302 - /tomcat/native/trunk/native/buildconf
Author: rjung Date: Sat May 23 09:50:34 2015 New Revision: 1681302 URL: http://svn.apache.org/r1681302 Log: Update default apr search path. Modified: tomcat/native/trunk/native/buildconf Modified: tomcat/native/trunk/native/buildconf URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/buildconf?rev=1681302&r1=1681301&r2=1681302&view=diff == --- tomcat/native/trunk/native/buildconf (original) +++ tomcat/native/trunk/native/buildconf Sat May 23 09:50:34 2015 @@ -19,7 +19,7 @@ # Default place to look for apr source. Can be overridden with # --with-apr=[directory] -apr_src_dir=`pwd`/srclib/apr-1.4.3 +apr_src_dir=`pwd`/srclib/apr-1.5.2 while test $# -gt 0 do - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1681138 - in /tomcat/trunk/java/org/apache/catalina/util: LifecycleBase.java LocalStrings.properties
On 23 May 2015 09:19:15 BST, Rainer Jung wrote:
>Am 22.05.2015 um 16:55 schrieb ma...@apache.org:
>> Author: markt
>> Date: Fri May 22 14:55:06 2015
>> New Revision: 1681138
>>
>> URL: http://svn.apache.org/r1681138
>> Log:
>> Log errors processing LifecycleListener events and continue rather
>than allowing uncaught exception to propagate
>>
>> Modified:
>> tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
>>
>tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties
>>
>> Modified:
>tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
>> URL:
>http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java?rev=1681138&r1=1681137&r2=1681138&view=diff
>>
>==
>> --- tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
>(original)
>> +++ tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Fri
>May 22 14:55:06 2015
>> @@ -117,7 +117,13 @@ public abstract class LifecycleBase impl
>> LifecycleEvent event = new LifecycleEvent(this, type,
>data);
>> LifecycleListener interested[] = listeners;
>> for (int i = 0; i < interested.length; i++) {
>> -interested[i].lifecycleEvent(event);
>> +try {
>> +interested[i].lifecycleEvent(event);
>> +} catch (Throwable t) {
>> +ExceptionUtils.handleThrowable(t);
>> +log.error(sm.getString("lifecycleBase.listenerFail",
>> +type, interested[i].getClass().getName()),
>t);
>> +}
>> }
>> }
>
>Currently the unit test testWebappListenerConfigureFail() in
>TestStandardContext fails due to the context startup with a
>FailingLifecycleListener no longer throwing an exception.
>
>Regards,
>
>Rainer
>
>
>-
>To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>For additional commands, e-mail: dev-h...@tomcat.apache.org
Feel free to revert my change (I won't be near my laptop for a few days.). The
bz issue needs a more careful look. It might end up as won't fix. Throw during
start, log during stop might work but I can't remember how this interacts with
the error state.
Mark
svn commit: r1681306 - /tomcat/native/trunk/native/tcnative.pc.in
Author: rjung
Date: Sat May 23 10:00:26 2015
New Revision: 1681306
URL: http://svn.apache.org/r1681306
Log:
Fix wrong version variable for APR.
Modified:
tomcat/native/trunk/native/tcnative.pc.in
Modified: tomcat/native/trunk/native/tcnative.pc.in
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/tcnative.pc.in?rev=1681306&r1=1681305&r2=1681306&view=diff
==
--- tomcat/native/trunk/native/tcnative.pc.in (original)
+++ tomcat/native/trunk/native/tcnative.pc.in Sat May 23 10:00:26 2015
@@ -25,6 +25,6 @@ Name: Tomcat native Java
Description: Companion Native Java library
Version: @TCNATIVE_DOTTED_VERSION@
# assume that tcnative requires libapr of same major version
-Requires: apr-@TCNATIVE_MAJOR_VERSION@
+Requires: apr-1
Libs: -L${libdir} -l@TCNATIVE_LIBNAME@ @TCNATIVE_EXPORT_LIBS@
Cflags: -I${includedir}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681308 - in /tomcat/native/branches/1.1.x: ./ native/src/network.c native/src/pool.c
Author: rjung
Date: Sat May 23 10:05:53 2015
New Revision: 1681308
URL: http://svn.apache.org/r1681308
Log:
Don't destroy pools explicitly if we are inside apr_terminate call
Backport of r992208 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/network.c
tomcat/native/branches/1.1.x/native/src/pool.c
Propchange: tomcat/native/branches/1.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 23 10:05:53 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496
+/tomcat/native/trunk:815411,992208,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/network.c?rev=1681308&r1=1681307&r2=1681308&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/network.c (original)
+++ tomcat/native/branches/1.1.x/native/src/network.c Sat May 23 10:05:53 2015
@@ -222,6 +222,11 @@ TCN_IMPLEMENT_CALL(void, Socket, destroy
UNREFERENCED_STDARGS;
TCN_ASSERT(sock != 0);
+if (!tcn_global_pool) {
+/* Socket will be destroyed by the cleanup
+ */
+return;
+}
as = s->sock;
s->sock = NULL;
apr_pool_cleanup_kill(s->pool, s, sp_socket_cleanup);
Modified: tomcat/native/branches/1.1.x/native/src/pool.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/pool.c?rev=1681308&r1=1681307&r2=1681308&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/pool.c (original)
+++ tomcat/native/branches/1.1.x/native/src/pool.c Sat May 23 10:05:53 2015
@@ -69,7 +69,8 @@ TCN_IMPLEMENT_CALL(void, Pool, destroy)(
apr_pool_t *p = J2P(pool, apr_pool_t *);
UNREFERENCED_STDARGS;
TCN_ASSERT(pool != 0);
-apr_pool_destroy(p);
+if (tcn_global_pool)
+apr_pool_destroy(p);
}
TCN_IMPLEMENT_CALL(jlong, Pool, parentGet)(TCN_STDARGS, jlong pool)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681310 - in /tomcat/native/branches/1.1.x: ./ native/configure.in native/src/pool.c
Author: rjung
Date: Sat May 23 10:15:38 2015
New Revision: 1681310
URL: http://svn.apache.org/r1681310
Log:
Add unmanaged pool api.
Partial backport of r1205445 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/configure.in
tomcat/native/branches/1.1.x/native/src/pool.c
Propchange: tomcat/native/branches/1.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 23 10:15:38 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,992208,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496
+/tomcat/native/trunk:815411,992208,1205445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/configure.in?rev=1681310&r1=1681309&r2=1681310&view=diff
==
--- tomcat/native/branches/1.1.x/native/configure.in (original)
+++ tomcat/native/branches/1.1.x/native/configure.in Sat May 23 10:15:38 2015
@@ -224,6 +224,8 @@ case $host in
;;
esac
+TCN_FIND_APR_FEATURE([apr_pool_create_unmanaged_ex],[POOL_UNMANAGED])
+
AC_SUBST(TCNATIVE_EXPORT_LIBS)
AC_SUBST(TCNATIVE_PRIV_INCLUDES)
AC_SUBST(TCNATIVE_INCLUDES)
Modified: tomcat/native/branches/1.1.x/native/src/pool.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/pool.c?rev=1681310&r1=1681309&r2=1681310&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/pool.c (original)
+++ tomcat/native/branches/1.1.x/native/src/pool.c Sat May 23 10:15:38 2015
@@ -56,6 +56,24 @@ cleanup:
return P2J(n);
}
+#if defined(HAVE_POOL_UNMANAGED)
+TCN_IMPLEMENT_CALL(jlong, Pool, unmanaged)(TCN_STDARGS)
+{
+apr_pool_t *n;
+
+UNREFERENCED(o);
+TCN_THROW_IF_ERR(apr_pool_create_unmanaged(&n), n);
+cleanup:
+return P2J(n);
+}
+#else
+TCN_IMPLEMENT_CALL(jlong, Pool, unmanaged)(TCN_STDARGS)
+{
+UNREFERENCED_STDARGS;
+return 0;
+}
+#endif
+
TCN_IMPLEMENT_CALL(void, Pool, clear)(TCN_STDARGS, jlong pool)
{
apr_pool_t *p = J2P(pool, apr_pool_t *);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681313 - in /tomcat/native/branches/1.1.x: ./ native/build/tcnative.m4 native/configure.in
Author: rjung
Date: Sat May 23 10:18:28 2015
New Revision: 1681313
URL: http://svn.apache.org/r1681313
Log:
Check if APR API feature is actually supported.
Backport of r988428 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/build/tcnative.m4
tomcat/native/branches/1.1.x/native/configure.in
Propchange: tomcat/native/branches/1.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 23 10:18:28 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,992208,1205445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496
+/tomcat/native/trunk:815411,988428,992208,1205445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/build/tcnative.m4?rev=1681313&r1=1681312&r2=1681313&view=diff
==
--- tomcat/native/branches/1.1.x/native/build/tcnative.m4 (original)
+++ tomcat/native/branches/1.1.x/native/build/tcnative.m4 Sat May 23 10:18:28
2015
@@ -411,3 +411,20 @@ then
APR_ADDTO(CFLAGS, [-DHAVE_OPENSSL])
fi
])
+
+dnl
+dnl TCN_FIND_APR_FEATURE: figure out if APR feature is suipported
+dnl
+AC_DEFUN(TCN_FIND_APR_FEATURE,[
+ saved_cflags="$CFLAGS"
+ saved_libs="$LIBS"
+ CFLAGS="$CFLAGS $APR_INCLUDES"
+ LIBS="$LIBS -lapr-1"
+ chk_result=0
+ AC_CHECK_LIB(apr-1, $1,[chk_result=1])
+ CFLAGS="$saved_cflags"
+ LIBS="$saved_libs"
+ if test "$chk_result" != "0"; then
+APR_ADDTO(CFLAGS, [-DHAVE_$2])
+ fi
+])
Modified: tomcat/native/branches/1.1.x/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/configure.in?rev=1681313&r1=1681312&r2=1681313&view=diff
==
--- tomcat/native/branches/1.1.x/native/configure.in (original)
+++ tomcat/native/branches/1.1.x/native/configure.in Sat May 23 10:18:28 2015
@@ -140,7 +140,7 @@ dnl
use_openssl=true;
-AC_ARG_ENABLE(openssl,
+AC_ARG_ENABLE(openssl,
[AS_HELP_STRING([--disable-openssl],[avoid using OpenSSL toolkit])],
[
case "${enableval}" in
@@ -224,7 +224,9 @@ case $host in
;;
esac
+TCN_FIND_APR_FEATURE([apr_pool_pre_cleanup_register],[POOL_PRE_CLEANUP])
TCN_FIND_APR_FEATURE([apr_pool_create_unmanaged_ex],[POOL_UNMANAGED])
+TCN_FIND_APR_FEATURE([apr_pollset_wakeup],[POLLSET_WAKEUP])
AC_SUBST(TCNATIVE_EXPORT_LIBS)
AC_SUBST(TCNATIVE_PRIV_INCLUDES)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681314 - /tomcat/native/trunk/native/src/network.c
Author: rjung
Date: Sat May 23 10:29:12 2015
New Revision: 1681314
URL: http://svn.apache.org/r1681314
Log:
Use old (problematic) variant if newer API is
not available.
Modified:
tomcat/native/trunk/native/src/network.c
Modified: tomcat/native/trunk/native/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/network.c?rev=1681314&r1=1681313&r2=1681314&view=diff
==
--- tomcat/native/trunk/native/src/network.c (original)
+++ tomcat/native/trunk/native/src/network.c Sat May 23 10:29:12 2015
@@ -194,8 +194,14 @@ TCN_IMPLEMENT_CALL(jlong, Socket, create
TCN_THROW_IF_ERR(apr_socket_create(&s,
f, t, protocol, c), a);
}
+#ifdef HAVE_POOL_PRE_CLEANUP
apr_pool_pre_cleanup_register(c, (const void *)a,
sp_socket_cleanup);
+#else
+apr_pool_cleanup_register(c, (const void *)a,
+ sp_socket_cleanup,
+ apr_pool_cleanup_null);
+#endif
#ifdef TCN_DO_STATISTICS
sp_created++;
@@ -388,8 +394,14 @@ TCN_IMPLEMENT_CALL(jlong, Socket, accept
TCN_THROW_IF_ERR(apr_socket_accept(&n, s->sock, p), n);
a->pool = p;
+#ifdef HAVE_POOL_PRE_CLEANUP
apr_pool_pre_cleanup_register(a->pool, (const void *)a,
sp_socket_cleanup);
+#else
+apr_pool_cleanup_register(a->pool, (const void *)a,
+ sp_socket_cleanup,
+ apr_pool_cleanup_null);
+#endif
}
else {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681315 - in /tomcat/native/branches/1.1.x: ./ native/src/network.c
Author: rjung
Date: Sat May 23 10:31:30 2015
New Revision: 1681315
URL: http://svn.apache.org/r1681315
Log:
- Step 1 in solving the JVM core on shutdown.
Use APR pool pre-cleanup API
- Use old (problematic) variant if newer API is
not available.
Backport of r988402 and 1681314 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/network.c
Propchange: tomcat/native/branches/1.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 23 10:31:30 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,988428,992208,1205445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496
+/tomcat/native/trunk:815411,988402,988428,992208,1205445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681314
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/network.c?rev=1681315&r1=1681314&r2=1681315&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/network.c (original)
+++ tomcat/native/branches/1.1.x/native/src/network.c Sat May 23 10:31:30 2015
@@ -196,9 +196,14 @@ TCN_IMPLEMENT_CALL(jlong, Socket, create
TCN_THROW_IF_ERR(apr_socket_create(&s,
f, t, protocol, c), a);
}
+#ifdef HAVE_POOL_PRE_CLEANUP
+apr_pool_pre_cleanup_register(c, (const void *)a,
+ sp_socket_cleanup);
+#else
apr_pool_cleanup_register(c, (const void *)a,
sp_socket_cleanup,
apr_pool_cleanup_null);
+#endif
#ifdef TCN_DO_STATISTICS
sp_created++;
@@ -395,9 +400,14 @@ TCN_IMPLEMENT_CALL(jlong, Socket, accept
TCN_THROW_IF_ERR(apr_socket_accept(&n, s->sock, p), n);
a->pool = p;
+#ifdef HAVE_POOL_PRE_CLEANUP
+apr_pool_pre_cleanup_register(a->pool, (const void *)a,
+ sp_socket_cleanup);
+#else
apr_pool_cleanup_register(a->pool, (const void *)a,
sp_socket_cleanup,
apr_pool_cleanup_null);
+#endif
}
else {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
OK to require APR 1.3 for tcnative 1.1?
APR is currently at 1.5.x and APR 1.3 goes back to 2008. Some of the differences between 1.1 and trunk are only because APR 1.2 is supported in 1.1. Is it OK to update the minimum required APR version to 1.3? Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: OK to require APR 1.3 for tcnative 1.1?
Scrap that question, 1.1 already requires APR 1.3. Am 23.05.2015 um 12:36 schrieb Rainer Jung: APR is currently at 1.5.x and APR 1.3 goes back to 2008. Some of the differences between 1.1 and trunk are only because APR 1.2 is supported in 1.1. Is it OK to update the minimum required APR version to 1.3? - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1681138 - in /tomcat/trunk/java/org/apache/catalina/util: LifecycleBase.java LocalStrings.properties
Feel free to revert my change (I won't be near my laptop for a few days.). The bz issue needs a more careful look. It might end up as won't fix. Throw during start, log during stop might work but I can't remember how this interacts with the error state. Will do. Have a nice time far from the keyboard :) Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681316 - in /tomcat/native/trunk/native: configure.in src/jnilib.c src/network.c src/pool.c
Author: rjung
Date: Sat May 23 10:50:06 2015
New Revision: 1681316
URL: http://svn.apache.org/r1681316
Log:
We require version 1.4.3, so pool pre cleanup
and unmanaged pools are always available.
Modified:
tomcat/native/trunk/native/configure.in
tomcat/native/trunk/native/src/jnilib.c
tomcat/native/trunk/native/src/network.c
tomcat/native/trunk/native/src/pool.c
Modified: tomcat/native/trunk/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/configure.in?rev=1681316&r1=1681315&r2=1681316&view=diff
==
--- tomcat/native/trunk/native/configure.in (original)
+++ tomcat/native/trunk/native/configure.in Sat May 23 10:50:06 2015
@@ -211,8 +211,6 @@ case $host in
;;
esac
-TCN_FIND_APR_FEATURE([apr_pool_pre_cleanup_register],[POOL_PRE_CLEANUP])
-TCN_FIND_APR_FEATURE([apr_pool_create_unmanaged_ex],[POOL_UNMANAGED])
TCN_FIND_APR_FEATURE([apr_pollset_wakeup],[POLLSET_WAKEUP])
AC_SUBST(TCNATIVE_EXPORT_LIBS)
Modified: tomcat/native/trunk/native/src/jnilib.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/jnilib.c?rev=1681316&r1=1681315&r2=1681316&view=diff
==
--- tomcat/native/trunk/native/src/jnilib.c (original)
+++ tomcat/native/trunk/native/src/jnilib.c Sat May 23 10:50:06 2015
@@ -60,27 +60,11 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM
apr_version(&apv);
apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
if (apvn < 1403) {
-if (apvn > 1400 && apvn < 1403) {
-/* APR versions below 1.4.3 are known to have
- * faulty wakeup code on windows platform
- */
-tcn_Throw(env, "Unsupported APR version %s: this tcnative requires
at least 1.4.3",
- apr_version_string());
-return JNI_ERR;
-}
-#if defined(HAVE_POOL_PRE_CLEANUP) && defined(HAVE_POLLSET_WAKEUP)
-/* Although not 1.4.x, APR has required functionality.
- * Note that this is compile time definition, and we
- * presume the required API's are present in the custom APR.
- */
-#else
tcn_Throw(env, "Unsupported APR version %s: this tcnative requires at
least 1.4.3",
apr_version_string());
return JNI_ERR;
-#endif
}
-
/* Initialize global java.lang.String class */
TCN_LOAD_CLASS(env, jString_class, "java/lang/String", JNI_ERR);
TCN_LOAD_CLASS(env, jFinfo_class, TCN_FINFO_CLASS, JNI_ERR);
Modified: tomcat/native/trunk/native/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/network.c?rev=1681316&r1=1681315&r2=1681316&view=diff
==
--- tomcat/native/trunk/native/src/network.c (original)
+++ tomcat/native/trunk/native/src/network.c Sat May 23 10:50:06 2015
@@ -194,14 +194,8 @@ TCN_IMPLEMENT_CALL(jlong, Socket, create
TCN_THROW_IF_ERR(apr_socket_create(&s,
f, t, protocol, c), a);
}
-#ifdef HAVE_POOL_PRE_CLEANUP
apr_pool_pre_cleanup_register(c, (const void *)a,
sp_socket_cleanup);
-#else
-apr_pool_cleanup_register(c, (const void *)a,
- sp_socket_cleanup,
- apr_pool_cleanup_null);
-#endif
#ifdef TCN_DO_STATISTICS
sp_created++;
@@ -394,15 +388,8 @@ TCN_IMPLEMENT_CALL(jlong, Socket, accept
TCN_THROW_IF_ERR(apr_socket_accept(&n, s->sock, p), n);
a->pool = p;
-#ifdef HAVE_POOL_PRE_CLEANUP
apr_pool_pre_cleanup_register(a->pool, (const void *)a,
sp_socket_cleanup);
-#else
-apr_pool_cleanup_register(a->pool, (const void *)a,
- sp_socket_cleanup,
- apr_pool_cleanup_null);
-#endif
-
}
else {
tcn_ThrowAPRException(e, APR_ENOTIMPL);
Modified: tomcat/native/trunk/native/src/pool.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/pool.c?rev=1681316&r1=1681315&r2=1681316&view=diff
==
--- tomcat/native/trunk/native/src/pool.c (original)
+++ tomcat/native/trunk/native/src/pool.c Sat May 23 10:50:06 2015
@@ -50,7 +50,6 @@ cleanup:
return P2J(n);
}
-#if defined(HAVE_POOL_UNMANAGED)
TCN_IMPLEMENT_CALL(jlong, Pool, unmanaged)(TCN_STDARGS)
{
apr_pool_t *n;
@@ -60,13 +59,6 @@ TCN_IMPLEMENT_CALL(jlong, Pool, unmanage
cleanup:
return P2J(n);
}
-#else
-TCN_IMPLEMENT_CALL(jlong, Pool, unmanaged)(TCN_STDARGS)
-{
-UNREFERENCED_STDARGS;
-return 0;
-}
-#endif
TCN_IMPLEMENT_CALL(void, Pool, clear)(TCN_STDARGS, jlong pool)
{
-
To unsubscribe, e-mail: dev-unsubscr...@tomca
Re: OK to require APR 1.3 for tcnative 1.1?
Am 23.05.2015 um 12:40 schrieb Rainer Jung: Scrap that question, 1.1 already requires APR 1.3. And again I have to correct myself: we only require 1.2.1 but suggest 1.3. We use a 1.3 feature but only in form of the flag APR_POLLSET_NOCOPY which gets defined to 0 if the APR version is to old. Am 23.05.2015 um 12:36 schrieb Rainer Jung: APR is currently at 1.5.x and APR 1.3 goes back to 2008. Some of the differences between 1.1 and trunk are only because APR 1.2 is supported in 1.1. Is it OK to update the minimum required APR version to 1.3? Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681321 - in /tomcat/native/trunk/native: include/tcn.h src/network.c src/poll.c
Author: rjung
Date: Sat May 23 11:17:11 2015
New Revision: 1681321
URL: http://svn.apache.org/r1681321
Log:
Forward port 1.1 changes to trunk:
r1518225 | schultz | 2013-08-28 16:52:00 +0200 (Wed, 28 Aug 2013) | 4 lines
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51813
Add NULL-checking for s->net to avoid SIGSEGV in situations where it appears a
socket has been recycled.
r1412919 | mturk | 2012-11-23 16:44:27 +0100 (Fri, 23 Nov 2012) | 1 line
Use apr_ring instead array for maintaining pollset
r1411077 | mturk | 2012-11-19 07:38:06 +0100 (Mon, 19 Nov 2012) | 1 line
Preformance tuning. Use APR_POLLSET_NOCOPY since we always have allocated
sockets and we depend on apr-1.3.x as minimum version
Modified:
tomcat/native/trunk/native/include/tcn.h
tomcat/native/trunk/native/src/network.c
tomcat/native/trunk/native/src/poll.c
Modified: tomcat/native/trunk/native/include/tcn.h
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/tcn.h?rev=1681321&r1=1681320&r2=1681321&view=diff
==
--- tomcat/native/trunk/native/include/tcn.h (original)
+++ tomcat/native/trunk/native/include/tcn.h Sat May 23 11:17:11 2015
@@ -23,6 +23,8 @@
#include "apr_pools.h"
#include "apr_portable.h"
#include "apr_network_io.h"
+#include "apr_poll.h"
+#include "apr_ring.h"
#include "apr_strings.h"
#ifndef APR_HAS_THREADS
@@ -138,7 +140,15 @@ typedef struct {
apr_status_t (APR_THREAD_FUNC *recv) (apr_socket_t *, char *, apr_size_t
*);
} tcn_nlayer_t;
-typedef struct {
+typedef struct tcn_socket_t tcn_socket_t;
+typedef struct tcn_pfde_t tcn_pfde_t;
+
+struct tcn_pfde_t {
+APR_RING_ENTRY(tcn_pfde_t) link;
+apr_pollfd_t fd;
+};
+
+struct tcn_socket_t {
apr_pool_t *pool;
apr_pool_t *child;
apr_socket_t *sock;
@@ -148,7 +158,7 @@ typedef struct {
tcn_nlayer_t *net;
apr_time_t last_active;
apr_interval_time_t timeout;
-} tcn_socket_t;
+};
/* Private helper functions */
voidtcn_Throw(JNIEnv *, const char *, ...);
Modified: tomcat/native/trunk/native/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/network.c?rev=1681321&r1=1681320&r2=1681321&view=diff
==
--- tomcat/native/trunk/native/src/network.c (original)
+++ tomcat/native/trunk/native/src/network.c Sat May 23 11:17:11 2015
@@ -203,8 +203,7 @@ TCN_IMPLEMENT_CALL(jlong, Socket, create
a->sock = s;
if (family >= 0)
a->net = &apr_socket_layer;
-a->opaque = s;
-
+a->opaque = s;
return P2J(a);
cleanup:
if (c)
@@ -434,6 +433,10 @@ TCN_IMPLEMENT_CALL(jint, Socket, send)(T
return -(jint)APR_ENOTSOCK;
}
TCN_ASSERT(s->opaque != NULL);
+if(!s->net) {
+tcn_ThrowAPRException(e, APR_EINVALSOCK);
+return -(jint)APR_EINVALSOCK;
+}
#ifdef TCN_DO_STATISTICS
sp_max_send = TCN_MAX(sp_max_send, nbytes);
sp_min_send = TCN_MIN(sp_min_send, nbytes);
@@ -510,6 +513,10 @@ TCN_IMPLEMENT_CALL(jint, Socket, sendb)(
}
TCN_ASSERT(s->opaque != NULL);
TCN_ASSERT(buf != NULL);
+if(!s->net) {
+tcn_ThrowAPRException(e, APR_EINVALSOCK);
+return -(jint)APR_EINVALSOCK;
+}
#ifdef TCN_DO_STATISTICS
sp_max_send = TCN_MAX(sp_max_send, nbytes);
sp_min_send = TCN_MIN(sp_min_send, nbytes);
@@ -550,6 +557,10 @@ TCN_IMPLEMENT_CALL(jint, Socket, sendib)
}
TCN_ASSERT(s->opaque != NULL);
TCN_ASSERT(buf != NULL);
+if(!s->net) {
+tcn_ThrowAPRException(e, APR_EINVALSOCK);
+return -(jint)APR_EINVALSOCK;
+}
#ifdef TCN_DO_STATISTICS
sp_max_send = TCN_MAX(sp_max_send, nbytes);
sp_min_send = TCN_MIN(sp_min_send, nbytes);
@@ -584,6 +595,10 @@ TCN_IMPLEMENT_CALL(jint, Socket, sendbb)
}
TCN_ASSERT(s->opaque != NULL);
TCN_ASSERT(s->jsbbuff != NULL);
+if(!s->net) {
+tcn_ThrowAPRException(e, APR_EINVALSOCK);
+return -(jint)APR_EINVALSOCK;
+}
#ifdef TCN_DO_STATISTICS
sp_max_send = TCN_MAX(sp_max_send, nbytes);
sp_min_send = TCN_MIN(sp_min_send, nbytes);
@@ -620,6 +635,10 @@ TCN_IMPLEMENT_CALL(jint, Socket, sendibb
}
TCN_ASSERT(s->opaque != NULL);
TCN_ASSERT(s->jsbbuff != NULL);
+if(!s->net) {
+tcn_ThrowAPRException(e, APR_EINVALSOCK);
+return -(jint)APR_EINVALSOCK;
+}
#ifdef TCN_DO_STATISTICS
sp_max_send = TCN_MAX(sp_max_send, nbytes);
sp_min_send = TCN_MIN(sp_min_send, nbytes);
@@ -651,6 +670,10 @@ TCN_IMPLEMENT_CALL(jint, Socket, sendv)(
UNREFERENCED(o);
TCN_ASSERT(sock != 0);
TCN_ASSERT(s->opaque != NULL);
+if(!s->net) {
+tcn_ThrowAPRException(e, APR_EINVALSOCK);
+return -(jint)APR_EINVALSOCK;
+}
nvec = (*e)->GetArrayLength(e, bufs);
if (nvec >= APR_MAX_IOVEC_SIZE)
@@ -720,6 +743,10 @@ TCN_IMPLEMENT_CALL(jint, S
svn commit: r1681323 - /tomcat/native/trunk/native/src/network.c
Author: rjung
Date: Sat May 23 11:25:28 2015
New Revision: 1681323
URL: http://svn.apache.org/r1681323
Log:
Style.
Modified:
tomcat/native/trunk/native/src/network.c
Modified: tomcat/native/trunk/native/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/network.c?rev=1681323&r1=1681322&r2=1681323&view=diff
==
--- tomcat/native/trunk/native/src/network.c (original)
+++ tomcat/native/trunk/native/src/network.c Sat May 23 11:25:28 2015
@@ -757,7 +757,7 @@ TCN_IMPLEMENT_CALL(jint, Socket, recv)(T
else {
jbyte *bytes = (*e)->GetByteArrayElements(e, buf, NULL);
ss = (*s->net->recv)(s->opaque, (char*)(bytes + offset), &nbytes);
-if ( ss == APR_SUCCESS) {
+if (ss == APR_SUCCESS) {
(*e)->ReleaseByteArrayElements(e, buf, bytes, nbytes ? 0 :
JNI_ABORT);
} else {
(*e)->ReleaseByteArrayElements(e, buf, bytes, JNI_ABORT);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681324 - in /tomcat/native/branches/1.1.x: ./ native/src/network.c
Author: rjung
Date: Sat May 23 11:26:35 2015
New Revision: 1681324
URL: http://svn.apache.org/r1681324
Log:
Small bug/leak when called with larger buffers.
Style.
Backport of r1295445 and 1681323 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/network.c
Propchange: tomcat/native/branches/1.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 23 11:26:35 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,988402,988428,992208,1205445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681314
+/tomcat/native/trunk:815411,988402,988428,992208,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681314,1681323
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/network.c?rev=1681324&r1=1681323&r2=1681324&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/network.c (original)
+++ tomcat/native/branches/1.1.x/native/src/network.c Sat May 23 11:26:35 2015
@@ -777,10 +777,12 @@ TCN_IMPLEMENT_CALL(jint, Socket, recv)(T
}
else {
jbyte *bytes = (*e)->GetByteArrayElements(e, buf, NULL);
-if ((ss = (*s->net->recv)(s->opaque, (char*)(bytes + offset),
- &nbytes)) == APR_SUCCESS)
-(*e)->ReleaseByteArrayElements(e, buf, bytes,
- nbytes ? 0 : JNI_ABORT);
+ss = (*s->net->recv)(s->opaque, (char*)(bytes + offset), &nbytes);
+if (ss == APR_SUCCESS) {
+(*e)->ReleaseByteArrayElements(e, buf, bytes, nbytes ? 0 :
JNI_ABORT);
+} else {
+(*e)->ReleaseByteArrayElements(e, buf, bytes, JNI_ABORT);
+}
}
#ifdef TCN_DO_STATISTICS
if (ss == APR_SUCCESS) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681326 - in /tomcat/native/branches/1.1.x: ./ examples/org/apache/tomcat/jni/ native/include/ native/os/netware/ native/os/unix/ native/os/win32/ native/src/ test/org/apache/tomcat/jni/
Author: rjung
Date: Sat May 23 11:33:57 2015
New Revision: 1681326
URL: http://svn.apache.org/r1681326
Log:
Remove $id and author tags.
author tags were only from Mladen and Jean-Frederic,
who both agreed on removal on TC trunk in 2014.
I guess removal here - although noit a trunk -
is also OK, especially since no other authors
were noted on the author tags.
Backport of r1681298 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/Echo.java
tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/LocalServer.java
tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/SSLServer.java
tomcat/native/branches/1.1.x/native/include/ssl_private.h
tomcat/native/branches/1.1.x/native/include/tcn.h
tomcat/native/branches/1.1.x/native/include/tcn_api.h
tomcat/native/branches/1.1.x/native/include/tcn_version.h
tomcat/native/branches/1.1.x/native/os/netware/system.c
tomcat/native/branches/1.1.x/native/os/unix/system.c
tomcat/native/branches/1.1.x/native/os/unix/uxpipe.c
tomcat/native/branches/1.1.x/native/os/win32/ntpipe.c
tomcat/native/branches/1.1.x/native/os/win32/registry.c
tomcat/native/branches/1.1.x/native/os/win32/system.c
tomcat/native/branches/1.1.x/native/src/address.c
tomcat/native/branches/1.1.x/native/src/bb.c
tomcat/native/branches/1.1.x/native/src/dir.c
tomcat/native/branches/1.1.x/native/src/error.c
tomcat/native/branches/1.1.x/native/src/file.c
tomcat/native/branches/1.1.x/native/src/info.c
tomcat/native/branches/1.1.x/native/src/jnilib.c
tomcat/native/branches/1.1.x/native/src/lock.c
tomcat/native/branches/1.1.x/native/src/misc.c
tomcat/native/branches/1.1.x/native/src/mmap.c
tomcat/native/branches/1.1.x/native/src/multicast.c
tomcat/native/branches/1.1.x/native/src/network.c
tomcat/native/branches/1.1.x/native/src/os.c
tomcat/native/branches/1.1.x/native/src/poll.c
tomcat/native/branches/1.1.x/native/src/pool.c
tomcat/native/branches/1.1.x/native/src/proc.c
tomcat/native/branches/1.1.x/native/src/shm.c
tomcat/native/branches/1.1.x/native/src/ssl.c
tomcat/native/branches/1.1.x/native/src/sslcontext.c
tomcat/native/branches/1.1.x/native/src/sslinfo.c
tomcat/native/branches/1.1.x/native/src/sslnetwork.c
tomcat/native/branches/1.1.x/native/src/sslutils.c
tomcat/native/branches/1.1.x/native/src/stdlib.c
tomcat/native/branches/1.1.x/native/src/thread.c
tomcat/native/branches/1.1.x/native/src/user.c
tomcat/native/branches/1.1.x/test/org/apache/tomcat/jni/FileTestSuite.java
tomcat/native/branches/1.1.x/test/org/apache/tomcat/jni/SocketServerTestBind.java
tomcat/native/branches/1.1.x/test/org/apache/tomcat/jni/SocketServerTestSuite.java
tomcat/native/branches/1.1.x/xdocs/style.xsl
Propchange: tomcat/native/branches/1.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 23 11:33:57 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,988402,988428,992208,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681314,1681323
+/tomcat/native/trunk:815411,988402,988428,992208,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681298,1681314,1681323
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/Echo.java
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/Echo.java?rev=1681326&r1=1681325&r2=1681326&view=diff
==
--- tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/Echo.java
(original)
+++ tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/Echo.java Sat
May 23 11:33:57 2015
@@ -21,9 +21,6 @@ import java.io.InputStream;
import java.util.Properties;
/** Echo server example
- *
- * @author Mladen Turk
- * @version $Id$
*/
public class Echo {
Modified:
tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/LocalServer.java
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/examples/org/apache/tomcat/jni/LocalServer.java?rev
svn commit: r1681327 - in /tomcat/native/branches/1.1.x/native/include: ssl_private.h tcn_version.h
Author: rjung
Date: Sat May 23 11:45:15 2015
New Revision: 1681327
URL: http://svn.apache.org/r1681327
Log:
Whitespace change, sync with trunk.
Modified:
tomcat/native/branches/1.1.x/native/include/ssl_private.h
tomcat/native/branches/1.1.x/native/include/tcn_version.h
Modified: tomcat/native/branches/1.1.x/native/include/ssl_private.h
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/ssl_private.h?rev=1681327&r1=1681326&r2=1681327&view=diff
==
--- tomcat/native/branches/1.1.x/native/include/ssl_private.h (original)
+++ tomcat/native/branches/1.1.x/native/include/ssl_private.h Sat May 23
11:45:15 2015
@@ -39,7 +39,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Modified: tomcat/native/branches/1.1.x/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/tcn_version.h?rev=1681327&r1=1681326&r2=1681327&view=diff
==
--- tomcat/native/branches/1.1.x/native/include/tcn_version.h (original)
+++ tomcat/native/branches/1.1.x/native/include/tcn_version.h Sat May 23
11:45:15 2015
@@ -91,4 +91,3 @@ extern "C" {
#endif
#endif /* TCN_VERSION_H */
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681328 - /tomcat/native/trunk/native/include/ssl_private.h
Author: rjung
Date: Sat May 23 11:45:41 2015
New Revision: 1681328
URL: http://svn.apache.org/r1681328
Log:
Whitespace change sync with 1.1.
Modified:
tomcat/native/trunk/native/include/ssl_private.h
Modified: tomcat/native/trunk/native/include/ssl_private.h
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/ssl_private.h?rev=1681328&r1=1681327&r2=1681328&view=diff
==
--- tomcat/native/trunk/native/include/ssl_private.h (original)
+++ tomcat/native/trunk/native/include/ssl_private.h Sat May 23 11:45:41 2015
@@ -304,7 +304,6 @@ typedef struct {
} reneg_state;
apr_socket_t *sock;
apr_pollset_t *pollset;
-
} tcn_ssl_conn_t;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57282] request process UML diagram seems outdated
https://bz.apache.org/bugzilla/show_bug.cgi?id=57282 --- Comment #23 from Stephen Chen --- Created attachment 32751 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32751&action=edit request process V5 -- 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 57282] request process UML diagram seems outdated
https://bz.apache.org/bugzilla/show_bug.cgi?id=57282 --- Comment #24 from Stephen Chen --- Created attachment 32752 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32752&action=edit authenticate v5 -- 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 57282] request process UML diagram seems outdated
https://bz.apache.org/bugzilla/show_bug.cgi?id=57282 --- Comment #25 from Stephen Chen --- Hello Mark, Good to hear from you again, for the request process diagram, that was a typo, andfixed now. for the authenticate diagram, revised with you nice suggestions, please have a look and review, thanks. -- 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: r1681334 - /tomcat/native/trunk/native/src/poll.c
Author: rjung
Date: Sat May 23 12:13:03 2015
New Revision: 1681334
URL: http://svn.apache.org/r1681334
Log:
Forward port from 1.1:
r1413136 | mturk | 2012-11-24 07:35:02 +0100 (Sat, 24 Nov 2012) | 1 line
Even if we have multiple instances of the same socket in the pollset they will
always point to the same client_data. No need to sweep trough entire set.
Modified:
tomcat/native/trunk/native/src/poll.c
Modified: tomcat/native/trunk/native/src/poll.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/poll.c?rev=1681334&r1=1681333&r2=1681334&view=diff
==
--- tomcat/native/trunk/native/src/poll.c (original)
+++ tomcat/native/trunk/native/src/poll.c Sat May 23 12:13:03 2015
@@ -298,17 +298,9 @@ static apr_status_t do_remove(tcn_pollse
static void update_last_active(tcn_pollset_t *p, const apr_pollfd_t *fd,
apr_time_t t)
{
-tcn_pfde_t *ep;
-
-APR_RING_FOREACH(ep, &p->poll_ring, tcn_pfde_t, link)
-{
-if (fd->desc.s == ep->fd.desc.s) {
-tcn_socket_t *s = (tcn_socket_t *)ep->fd.client_data;
-/* Found an instance of the fd: update last active time */
-s->last_active = t;
-break;
-}
-}
+tcn_socket_t *s = (tcn_socket_t *)fd->client_data;
+TCN_ASSERT(s != 0);
+s->last_active = t;
}
TCN_IMPLEMENT_CALL(jint, Poll, remove)(TCN_STDARGS, jlong pollset,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681338 - in /tomcat/native/trunk/native: include/tcn.h src/poll.c
Author: rjung
Date: Sat May 23 12:24:19 2015
New Revision: 1681338
URL: http://svn.apache.org/r1681338
Log:
Forward port lots of xies to poll.c from 1.1 to trunk:
r1667243 | markt | 2015-03-17 11:28:05 +0100 (Tue, 17 Mar 2015) | 1 line
Follow-up to r1665888. Review by kkolinko. else clause should not depend on
s->pe
r1665888 | markt | 2015-03-11 15:44:23 +0100 (Wed, 11 Mar 2015) | 1 line
Fix 57653. Crash when multiple events for same socket are returned via separate
apr_pollfd_t structures
r1525525 | rjung | 2013-09-23 10:08:56 +0200 (Mon, 23 Sep 2013) | 6 lines
Change return code when removing a socket from a poller, that was
actually not in the poller from APR_SUCCESS to APR_NOTFOUND.
This lead to corrupt poller handling in the Tomcat APR connector,
at least sporadically on Solaris Sparc.
r1441792 | mturk | 2013-02-02 20:25:49 +0100 (Sat, 02 Feb 2013) | 1 line
Fix BZ55413 by ensuring the returned value is number of event/sockets pairs
r1414562 | mturk | 2012-11-28 08:28:20 +0100 (Wed, 28 Nov 2012) | 1 line
Fix typo in --enable-maintainer-mode
r1414560 | mturk | 2012-11-28 08:19:46 +0100 (Wed, 28 Nov 2012) | 1 line
Limit socket to a single instance in the pollset. This allows to optimize
remove loop - actually remove it.
Modified:
tomcat/native/trunk/native/include/tcn.h
tomcat/native/trunk/native/src/poll.c
Modified: tomcat/native/trunk/native/include/tcn.h
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/tcn.h?rev=1681338&r1=1681337&r2=1681338&view=diff
==
--- tomcat/native/trunk/native/include/tcn.h (original)
+++ tomcat/native/trunk/native/include/tcn.h Sat May 23 12:24:19 2015
@@ -156,6 +156,7 @@ struct tcn_socket_t {
char *jsbbuff;
char *jrbbuff;
tcn_nlayer_t *net;
+tcn_pfde_t *pe;
apr_time_t last_active;
apr_interval_time_t timeout;
};
Modified: tomcat/native/trunk/native/src/poll.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/poll.c?rev=1681338&r1=1681337&r2=1681338&view=diff
==
--- tomcat/native/trunk/native/src/poll.c (original)
+++ tomcat/native/trunk/native/src/poll.c Sat May 23 12:24:19 2015
@@ -216,6 +216,14 @@ static apr_status_t do_add(tcn_pollset_t
#endif
return APR_ENOMEM;
}
+if (s->pe != NULL) {
+/* Socket is already added to the pollset.
+ */
+#ifdef TCN_DO_STATISTICS
+p->sp_equals++;
+#endif
+return APR_EEXIST;
+}
if (timeout == TCN_NO_SOCKET_TIMEOUT) {
timeout = p->default_timeout;
}
@@ -246,6 +254,7 @@ static apr_status_t do_add(tcn_pollset_t
}
else {
APR_RING_INSERT_TAIL(&p->poll_ring, elem, tcn_pfde_t, link);
+s->pe = elem;
}
return rv;
}
@@ -275,44 +284,21 @@ TCN_IMPLEMENT_CALL(jint, Poll, addWithTi
return (jint) do_add(p, s, (apr_int16_t)reqevents, J2T(socket_timeout));
}
-static apr_status_t do_remove(tcn_pollset_t *p, const apr_pollfd_t *fd)
-{
-apr_status_t rv;
-tcn_pfde_t *ep;
-
-rv = apr_pollset_remove(p->pollset, fd);
-APR_RING_FOREACH(ep, &p->poll_ring, tcn_pfde_t, link)
-{
-if (fd->desc.s == ep->fd.desc.s) {
-APR_RING_REMOVE(ep, link);
-APR_RING_INSERT_TAIL(&p->dead_ring, ep, tcn_pfde_t, link);
-p->nelts--;
-#ifdef TCN_DO_STATISTICS
-p->sp_removed++;
-#endif
-break;
-}
-}
-return rv;
-}
-
-static void update_last_active(tcn_pollset_t *p, const apr_pollfd_t *fd,
apr_time_t t)
-{
-tcn_socket_t *s = (tcn_socket_t *)fd->client_data;
-TCN_ASSERT(s != 0);
-s->last_active = t;
-}
-
TCN_IMPLEMENT_CALL(jint, Poll, remove)(TCN_STDARGS, jlong pollset,
jlong socket)
{
apr_pollfd_t fd;
+apr_status_t rv;
tcn_pollset_t *p = J2P(pollset, tcn_pollset_t *);
-tcn_socket_t *s = J2P(socket, tcn_socket_t *);
+tcn_socket_t *s = J2P(socket, tcn_socket_t *);
UNREFERENCED_STDARGS;
TCN_ASSERT(socket != 0);
+if (s->pe == NULL) {
+/* Already removed */
+return APR_NOTFOUND;
+}
fd.desc_type = APR_POLL_SOCKET;
fd.desc.s = s->sock;
fd.client_data = s;
@@ -321,7 +307,15 @@ TCN_IMPLEMENT_CALL(jint, Poll, remove)(T
p->sp_remove++;
#endif
-return (jint)do_remove(p, &fd);
+rv = apr_pollset_remove(p->pollset, &fd);
+APR_RING_REMOVE(s->pe, link);
+APR_RING_INSERT_TAIL(&p->dead_ring, s->pe, tcn_pfde_t, link);
+s->pe = NULL;
+p->nelts--;
+#ifdef TCN_DO_STATISTICS
+p->sp_removed++;
+#endif
+return rv;
}
@@ -350,8 +344,7 @@ TCN_IMPLEMENT_CALL(jint, Poll, poll)(TCN
APR_RING_FOREACH(ep, &p->poll_ring, tcn_pfde_t, link)
{
apr_interval_time_t socket_timeout = 0;
-tcn_socket_t *s;
-s = (tcn_sock
svn commit: r1681341 - in /tomcat/native/branches/1.1.x: ./ native/src/poll.c
Author: rjung
Date: Sat May 23 12:44:15 2015
New Revision: 1681341
URL: http://svn.apache.org/r1681341
Log:
Backport poller changes from trunk:
r1043696 | costin | 2010-12-08 22:45:05 +0100 (Wed, 08 Dec 2010) | 2 lines
Fix comment style, thanks Mladen.
r1043611 | costin | 2010-12-08 20:07:41 +0100 (Wed, 08 Dec 2010) | 6 lines
Javadoc for Poll.create() describes ENOTIMPL error if THREADSAFE is requested
but not supported.
The old code was silently removing THREADSAFE flag, java side wouldn't have any
way to know if it
needs to wait or can modify the poll set from a different thread.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/poll.c
Propchange: tomcat/native/branches/1.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 23 12:44:15 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,988402,988428,992208,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681298,1681314,1681323
+/tomcat/native/trunk:815411,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681298,1681314,1681323
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/src/poll.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/poll.c?rev=1681341&r1=1681340&r2=1681341&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/poll.c (original)
+++ tomcat/native/branches/1.1.x/native/src/poll.c Sat May 23 12:44:15 2015
@@ -109,9 +109,10 @@ TCN_IMPLEMENT_CALL(jlong, Poll, create)(
if (f & APR_POLLSET_THREADSAFE) {
apr_status_t rv = apr_pollset_create(&pollset, (apr_uint32_t)size, p,
f);
-if (rv == APR_ENOTIMPL)
-f &= ~APR_POLLSET_THREADSAFE;
-else if (rv != APR_SUCCESS) {
+/* Pass the ENOTIMPL to java, as described in javadocs. Java must
clean the
+ flag, will know it's not supported.
+*/
+if (rv != APR_SUCCESS) {
tcn_ThrowAPRException(e, rv);
goto cleanup;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681342 - in /tomcat/native/branches/1.1.x: ./ native/src/jnilib.c
Author: rjung
Date: Sat May 23 12:53:28 2015
New Revision: 1681342
URL: http://svn.apache.org/r1681342
Log:
Backport from trunk:
r988395 | mturk | 2010-08-24 08:07:28 +0200 (Tue, 24 Aug 2010) | 1 line
Fix 'dereferencing type-punned pointer will break strict-aliasing rules' warning
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/jnilib.c
Propchange: tomcat/native/branches/1.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 23 12:53:28 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681298,1681314,1681323
+/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681298,1681314,1681323
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/src/jnilib.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/jnilib.c?rev=1681342&r1=1681341&r2=1681342&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/jnilib.c (original)
+++ tomcat/native/branches/1.1.x/native/src/jnilib.c Sat May 23 12:53:28 2015
@@ -43,15 +43,16 @@ int tcn_parent_pid = 0;
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
{
JNIEnv *env;
+void *ppe;
apr_version_t apv;
int apvn;
UNREFERENCED(reserved);
-if ((*vm)->GetEnv(vm, (void **)&env, JNI_VERSION_1_4)) {
+if ((*vm)->GetEnv(vm, &ppe, JNI_VERSION_1_4)) {
return JNI_ERR;
}
tcn_global_vm = vm;
-
+env = (JNIEnv *)ppe;
/* Before doing anything else check if we have a valid
* APR version.
*/
@@ -96,13 +97,15 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM
JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *vm, void *reserved)
{
JNIEnv *env;
+void *ppe;
UNREFERENCED(reserved);
-if ((*vm)->GetEnv(vm, (void **)&env, JNI_VERSION_1_2)) {
+if ((*vm)->GetEnv(vm, &ppe, JNI_VERSION_1_2)) {
return;
}
if (tcn_global_pool) {
+env = (JNIEnv *)ppe;
TCN_UNLOAD_CLASS(env, jString_class);
TCN_UNLOAD_CLASS(env, jFinfo_class);
TCN_UNLOAD_CLASS(env, jAinfo_class);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681343 - /tomcat/native/branches/1.1.x/native/src/jnilib.c
Author: rjung
Date: Sat May 23 12:55:18 2015
New Revision: 1681343
URL: http://svn.apache.org/r1681343
Log:
Partial backport of r1144501 from trunk:
r1144501 | schultz | 2011-07-08 22:42:45 +0200 (Fri, 08 Jul 2011) | 4 lines
Added required APR version number to "unsupported APR version" message.
Fixed typos in comments and error messages.
Modified:
tomcat/native/branches/1.1.x/native/src/jnilib.c
Modified: tomcat/native/branches/1.1.x/native/src/jnilib.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/jnilib.c?rev=1681343&r1=1681342&r2=1681343&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/jnilib.c (original)
+++ tomcat/native/branches/1.1.x/native/src/jnilib.c Sat May 23 12:55:18 2015
@@ -59,7 +59,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM
apr_version(&apv);
apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
if (apvn < 1201) {
-tcn_Throw(env, "Unupported APR version (%s)",
+tcn_Throw(env, "Unsupported APR version (%s): this tcnative requires
at least 1.2.1",
apr_version_string());
return JNI_ERR;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681344 - /tomcat/native/branches/1.1.x/native/src/jnilib.c
Author: rjung
Date: Sat May 23 12:59:49 2015
New Revision: 1681344
URL: http://svn.apache.org/r1681344
Log:
Whitespace and minor changes to sync 1.1 with trunk.
Modified:
tomcat/native/branches/1.1.x/native/src/jnilib.c
Modified: tomcat/native/branches/1.1.x/native/src/jnilib.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/jnilib.c?rev=1681344&r1=1681343&r2=1681344&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/jnilib.c (original)
+++ tomcat/native/branches/1.1.x/native/src/jnilib.c Sat May 23 12:59:49 2015
@@ -54,17 +54,16 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM
tcn_global_vm = vm;
env = (JNIEnv *)ppe;
/* Before doing anything else check if we have a valid
- * APR version.
+ * APR version. We need version 1.2.1 as minimum.
*/
apr_version(&apv);
apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
if (apvn < 1201) {
-tcn_Throw(env, "Unsupported APR version (%s): this tcnative requires
at least 1.2.1",
+tcn_Throw(env, "Unsupported APR version %s: this tcnative requires at
least 1.2.1",
apr_version_string());
return JNI_ERR;
}
-
/* Initialize global java.lang.String class */
TCN_LOAD_CLASS(env, jString_class, "java/lang/String", JNI_ERR);
TCN_LOAD_CLASS(env, jFinfo_class, TCN_FINFO_CLASS, JNI_ERR);
@@ -229,7 +228,7 @@ TCN_IMPLEMENT_CALL(void, Library, termin
{
UNREFERENCED_STDARGS;
-if (tcn_global_pool) {
+if (tcn_global_pool) {
apr_pool_t *p = tcn_global_pool;
tcn_global_pool = NULL;
#ifdef TCN_DO_STATISTICS
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681346 - /tomcat/native/trunk/native/src/network.c
Author: rjung
Date: Sat May 23 13:04:49 2015
New Revision: 1681346
URL: http://svn.apache.org/r1681346
Log:
Add fix missing in original forward port r1490006 of:
r1490001 | markt | 2013-06-05 20:51:58 +0200 (Wed, 05 Jun 2013) | 1 line
Make sockets useable for non-blocking IO. Return bytes written if >0 and error
code is EAGAIN rather than the error code so the clients know how many bytes
were written.
Modified:
tomcat/native/trunk/native/src/network.c
Modified: tomcat/native/trunk/native/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/network.c?rev=1681346&r1=1681345&r2=1681346&view=diff
==
--- tomcat/native/trunk/native/src/network.c (original)
+++ tomcat/native/trunk/native/src/network.c Sat May 23 13:04:49 2015
@@ -652,7 +652,7 @@ TCN_IMPLEMENT_CALL(jint, Socket, sendibb
return (jint)nbytes;
else {
TCN_ERROR_WRAP(ss);
-return -(jint)nbytes;
+return -(jint)ss;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: OK to require APR 1.3 for tcnative 1.1?
On 23 May 2015 11:36:40 BST, Rainer Jung wrote: >APR is currently at 1.5.x and APR 1.3 goes back to 2008. Some of the >differences between 1.1 and trunk are only because APR 1.2 is supported > >in 1.1. > >Is it OK to update the minimum required APR version to 1.3? > >Regards, > >Rainer > >- >To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >For additional commands, e-mail: dev-h...@tomcat.apache.org +1 Also +1 for any later version should you find a need. Mark
svn commit: r1681357 - in /tomcat/native/branches/1.1.x: ./ native/include/ssl_private.h native/src/ssl.c native/src/sslcontext.c native/src/sslnetwork.c native/src/sslutils.c
Author: rjung
Date: Sat May 23 15:28:35 2015
New Revision: 1681357
URL: http://svn.apache.org/r1681357
Log:
Improve DH and ECDH ephemeral key handling.
Backport of r1681126,1681150-1681151,1681172,
1681189,1681218,1681295 from trunk
(which took it from mod_ssl).
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/include/ssl_private.h
tomcat/native/branches/1.1.x/native/src/ssl.c
tomcat/native/branches/1.1.x/native/src/sslcontext.c
tomcat/native/branches/1.1.x/native/src/sslnetwork.c
tomcat/native/branches/1.1.x/native/src/sslutils.c
Propchange: tomcat/native/branches/1.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 23 15:28:35 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681298,1681314,1681323
+/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681314,1681323
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/include/ssl_private.h
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/ssl_private.h?rev=1681357&r1=1681356&r2=1681357&view=diff
==
--- tomcat/native/branches/1.1.x/native/include/ssl_private.h (original)
+++ tomcat/native/branches/1.1.x/native/include/ssl_private.h Sat May 23
15:28:35 2015
@@ -65,20 +65,6 @@
#define SSL_AIDX_DSA (1)
#define SSL_AIDX_MAX (2)
-/*
- * Define IDs for the temporary RSA keys and DH params
- */
-
-#define SSL_TMP_KEY_RSA_512 (0)
-#define SSL_TMP_KEY_RSA_1024(1)
-#define SSL_TMP_KEY_RSA_2048(2)
-#define SSL_TMP_KEY_RSA_4096(3)
-#define SSL_TMP_KEY_DH_512 (4)
-#define SSL_TMP_KEY_DH_1024 (5)
-#define SSL_TMP_KEY_DH_2048 (6)
-#define SSL_TMP_KEY_DH_4096 (7)
-#define SSL_TMP_KEY_MAX (8)
-
#define SSL_CRT_FORMAT_UNDEF(0)
#define SSL_CRT_FORMAT_ASN1 (1)
#define SSL_CRT_FORMAT_TEXT (2)
@@ -204,14 +190,11 @@
#define OCSP_STATUS_REVOKED 1
#define OCSP_STATUS_UNKNOWN 2
-
/* ECC: make sure we have at least 1.0.0 */
#if !defined(OPENSSL_NO_EC) && defined(TLSEXT_ECPOINTFORMAT_uncompressed)
#define HAVE_ECC 1
#endif
-extern void *SSL_temp_keys[SSL_TMP_KEY_MAX];
-
typedef struct {
/* client can have any number of cert/key pairs */
const char *cert_file;
@@ -299,9 +282,11 @@ int SSL_password_prompt(tcn_pass
int SSL_password_callback(char *, int, int, void *);
voidSSL_BIO_close(BIO *);
voidSSL_BIO_doref(BIO *);
-DH *SSL_dh_get_tmp_param(int);
-DH *SSL_dh_get_param_from_file(const char *);
-RSA*SSL_callback_tmp_RSA(SSL *, int, int);
+DH *SSL_get_dh_params(unsigned keylen);
+DH *SSL_dh_GetParamFromFile(const char *);
+#ifdef HAVE_ECC
+EC_GROUP *SSL_ec_GetParamFromFile(const char *);
+#endif
DH *SSL_callback_tmp_DH(SSL *, int, int);
voidSSL_callback_handshake(const SSL *, int, int);
int SSL_CTX_use_certificate_chain(SSL_CTX *, const char *, int);
Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1681357&r1=1681356&r2=1681357&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Sat May 23 15:28:35 2015
@@ -28,7 +28,6 @@ static char *ssl_global_rand_file = NULL
extern apr_pool_t *tcn_global_pool;
ENGINE *tcn_ssl_engine = NULL;
-void *SSL_temp_keys[SSL_TMP_KEY_MAX];
tcn_pass_cb_t tcn_password_callback;
/* Global reference to the pool used by the dynamic mutexes */
@@ -42,43 +41,6 @@ struct CRYPTO_dynlock_value {
apr_thread_mutex_t *mutex;
};
-
-/*
- * Handle the Temporary RSA Keys and DH Params
- */
-
-#if (OPENSSL_VERSION_NUMBER < 0x1010L) || defined(OPENSSL_USE_DEPRECATED
[Bug 56108] Allow user-defined Diffie-Hellman parameters (secure DH-Cipher)
https://bz.apache.org/bugzilla/show_bug.cgi?id=56108 --- Comment #3 from Rainer Jung --- I have ported the current mod_ssl code from httpd to tcnative with the following features: - by default use the same size for DH as the key used in the certificate. So certificate strength reflects in key exchange strengths. - optionally you can generate your own DH params using "opsnssl dhparam" and add them into the certificate file. We will find the data there automatically (if present) and use these params instead. A docs update will follow soon. I guess with these improvements we can fix this issue here as soon as the next tcnative 1.1.34 gets released. -- 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: r1681359 - in /tomcat/trunk/java/org/apache/catalina/util: LifecycleBase.java LocalStrings.properties
Author: rjung
Date: Sat May 23 15:54:02 2015
New Revision: 1681359
URL: http://svn.apache.org/r1681359
Log:
Revert r1681138. Was:
Log errors processing LifecycleListener events and continue rather
than allowing uncaught exception to propagate (BZ 57939).
"The bz issue needs a more careful look."
Modified:
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java?rev=1681359&r1=1681358&r2=1681359&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Sat May 23
15:54:02 2015
@@ -117,13 +117,7 @@ public abstract class LifecycleBase impl
LifecycleEvent event = new LifecycleEvent(this, type, data);
LifecycleListener interested[] = listeners;
for (int i = 0; i < interested.length; i++) {
-try {
-interested[i].lifecycleEvent(event);
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-log.error(sm.getString("lifecycleBase.listenerFail",
-type, interested[i].getClass().getName()), t);
-}
+interested[i].lifecycleEvent(event);
}
}
Modified: tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties?rev=1681359&r1=1681358&r2=1681359&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties Sat May
23 15:54:02 2015
@@ -30,7 +30,6 @@ lifecycleBase.destroyFail=Failed to dest
lifecycleBase.destroyStopFail=Calling stop() on failed component [{0}] to
trigger clean-up did not complete.
lifecycleBase.initFail=Failed to initialize component [{0}]
lifecycleBase.invalidTransition=An invalid Lifecycle transition was attempted
([{0}]) for component [{1}] in state [{2}]
-lifecycleBase.listenerFail=Failed to processes [{0}] event for an instance of
[{1}]
lifecycleBase.setState=Setting state for [{0}] to [{1}]
lifecycleBase.startFail=Failed to start component [{0}]
lifecycleBase.stopFail=Failed to stop component [{0}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681360 - in /tomcat/tc8.0.x/trunk/java/org/apache/catalina/util: LifecycleSupport.java LocalStrings.properties
Author: rjung
Date: Sat May 23 15:57:28 2015
New Revision: 1681360
URL: http://svn.apache.org/r1681360
Log:
Revert r1681141. Was:
Log errors processing LifecycleListener events and continue rather
than allowing uncaught exception to propagate (BZ 57939).
"The bz issue needs a more careful look."
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java?rev=1681360&r1=1681359&r2=1681360&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java
Sat May 23 15:57:28 2015
@@ -22,10 +22,6 @@ package org.apache.catalina.util;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.ExceptionUtils;
-import org.apache.tomcat.util.res.StringManager;
/**
@@ -36,12 +32,10 @@ import org.apache.tomcat.util.res.String
*/
public final class LifecycleSupport {
-private static final Log log = LogFactory.getLog(LifecycleSupport.class);
-private static final StringManager sm =
StringManager.getManager("org.apache.catalina.util");
-
// --- Constructors
+
/**
* Construct a new LifecycleSupport object associated with the specified
* Lifecycle component.
@@ -119,15 +113,9 @@ public final class LifecycleSupport {
LifecycleEvent event = new LifecycleEvent(lifecycle, type, data);
LifecycleListener interested[] = listeners;
-for (int i = 0; i < interested.length; i++) {
-try {
-interested[i].lifecycleEvent(event);
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-log.error(sm.getString("lifecycleBase.listenerFail",
-type, interested[i].getClass().getName()), t);
-}
-}
+for (int i = 0; i < interested.length; i++)
+interested[i].lifecycleEvent(event);
+
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties?rev=1681360&r1=1681359&r2=1681360&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties
Sat May 23 15:57:28 2015
@@ -30,7 +30,6 @@ lifecycleBase.destroyFail=Failed to dest
lifecycleBase.destroyStopFail=Calling stop() on failed component [{0}] to
trigger clean-up did not complete.
lifecycleBase.initFail=Failed to initialize component [{0}]
lifecycleBase.invalidTransition=An invalid Lifecycle transition was attempted
([{0}]) for component [{1}] in state [{2}]
-lifecycleBase.listenerFail=Failed to processes [{0}] event for an instance of
[{1}]
lifecycleBase.setState=Setting state for [{0}] to [{1}]
lifecycleBase.startFail=Failed to start component [{0}]
lifecycleBase.stopFail=Failed to stop component [{0}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57939] Classloader leak in org.apache.naming.ContextBindings
https://bz.apache.org/bugzilla/show_bug.cgi?id=57939 Rainer Jung changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- --- Comment #3 from Rainer Jung --- The fix had to be reverted. Another fix is needed. -- 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
Drop support for EXPORT ciphers in tcnative 1.1?
mod_ssl dropped support for EXPORT ciphers in Apache 2.4 some time ago and will also drop it in Apache 2.2 in the sonn to be released next version. I applied a similar change to tcnative trunk and would also like to apply it to 1.1. Note that "drop support" would mean you can no longer enable export ciphers. Even if you do they will simply not get advertised to the client because the code filters them out. This is not just a question of defaults but whether export ciphers should be available or not. The change in question is http://svn.apache.org/r1681147 In the light of the downgrade attacks that were invented I have a tendency to drop support completely. Other opinions? Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-bio (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-bio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-bio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-BIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-bio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 46 mins 20 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150523-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150523.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150523-native-src.tar.gz -Dtest.temp=output/test-tmp-BIO -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150523/bin/o penssl -Dexecute.test.bio=true -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu ild/lib/
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 40 mins 31 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150523-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150523.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150523-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150523/bin /openssl -Dexecute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1259 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1681359 Blamelist: rjung Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/269 Buildbot URL: http://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] 1681360 Blamelist: rjung Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 40 mins 6 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150523-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150523/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150523.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150523-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150523/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib
[Bug 57946] New: Configuration example for mod_jk should be updated to follow Apache 2.4 syntax scheme
https://bz.apache.org/bugzilla/show_bug.cgi?id=57946 Bug ID: 57946 Summary: Configuration example for mod_jk should be updated to follow Apache 2.4 syntax scheme Product: Tomcat Connectors Version: 1.2.40 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: mod_jk Assignee: dev@tomcat.apache.org Reporter: a...@gambaru.de Many Linux distributions including Debian ship Apache 2.4 as the standard Apache web server. The example configuration in conf/http-jk.conf still uses the old and deprecated authentication configuration directives Order, Allow or Deny. These do not integrate well with the new authorization scheme of Apache 2.4. The configuration directives should be replaced with a suitable combination of , , Require all, Require local, Require ip, and Require method. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-native-make (in module tomcat-native) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-native-make has an issue affecting its community integration. This issue affects 4 projects, and has been outstanding for 7 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-native-make : Tomcat native library using Apache Portable Runtime - tomcat-native-make-install : Tomcat native library using Apache Portable Runtime - tomcat-tc7.0.x-test-apr : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... - tomcat-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-make/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-make/gump_work/build_tomcat-native_tomcat-native-make.html Work Name: build_tomcat-native_tomcat-native-make (Type: Build) Work ended in a state of : Failed Elapsed: 17 secs Command Line: make [Working Directory: /srv/gump/public/workspace/tomcat-native/native] - /bin/bash /srv/gump/public/workspace/apr-1/dest-20150524/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl-master/dest-20150524/include -I/srv/gump/public/workspace/apr-1/dest-20150524/include/apr-1 -o src/jnilib.lo -c src/jnilib.c && touch src/jnilib.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20150524/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl-master/dest-20150524/include -I/srv/gump/public/workspace/apr-1/dest-20150524/include/apr-1 -o src/lock.lo -c src/lock.c && touch src/lock.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20150524/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl-master/dest-20150524/include -I/srv/gump/public/workspace/apr-1/dest-20150524/include/apr-1 -o src/misc.lo -c src/misc.c && touch src/misc.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20150524/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl-master/dest-20150524/include -I/srv/gump/public/workspace/apr-1/dest-20150524/include/apr-1 -o src/mmap.lo -c src/mmap.c && touch src/mmap.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20150524/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl-master/dest-20150524/include -I/srv/gump/public/workspace/apr-1/dest-20150524/include/apr-1 -o src/multicast.lo -c src/multicast.c && touch src/multicast.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20150524/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl-master/dest-20150524/include -I/srv/gump/public/workspace/apr-1/dest-20150524/include/apr-1 -o src/network.lo -c src/network.c && touch src/network.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20150524/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -I/srv/gump/public/workspace/tomcat-native
[GUMP@vmgump]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio : 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-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 47 mins 31 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150524-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150524.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150524-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20150524/bin/o penssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-trunk/out
