svn commit: r1711922 - /tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Author: rjung Date: Mon Nov 2 09:39:29 2015 New Revision: 1711922 URL: http://svn.apache.org/viewvc?rev=1711922&view=rev Log: Add some minor changes to changelog. Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1711922&r1=1711921&r2=1711922&view=diff == --- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Mon Nov 2 09:39:29 2015 @@ -40,6 +40,23 @@ 58566: Enable Tomcat Native 1.2.x to work with Tomcat releases that do not have the necessary Java code to support SNI. (markt) + + Minor rework of "buildconf" script. (rjung) + + + Fix APR dependency version expression in RPM spec file. (rjung) + + + Fix major library version number in Windows build files, RPM spec file + and build description. (rjung) + + + Remove files "KEYS" and "download_deps.sh" from Windows (zip) + source distribution. (rjung) + + + Fix "unused variable" compiler warning. (rjung) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711925 - /tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Author: rjung Date: Mon Nov 2 09:46:07 2015 New Revision: 1711925 URL: http://svn.apache.org/viewvc?rev=1711925&view=rev Log: Add some minor items to changelog. Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1711925&r1=1711924&r2=1711925&view=diff == --- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Mon Nov 2 09:46:07 2015 @@ -86,6 +86,17 @@ Let OpenSSL master handle thread IDs itself. (billbarker) + + Minor rework of "buildconf" script. (rjung) + + + Fix APR dependency version expression and requirement expression in + RPM spec file. (rjung) + + + Try to make the changelog.xml served by SVN-HTTP viewable in a browser + by adding a stylesheet reference. (kpreisser, rjung) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57799] MessageCreationException: Couldn't create SOAP message with Nio2 connector protocol
https://bz.apache.org/bugzilla/show_bug.cgi?id=57799 Remy Maucherat changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #33 from Remy Maucherat --- Ok, so this looks like legacy blocking code, which calls available() to be smart. Then it breaks because the input stream's available is really meant to be used with isReady now (Servlet 3.1) and does a real async read. So maybe the available action could use an added optional boolean parameter and do the async read only if it is true (which would indicate Servlet 3.1 mode). -- 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 57799] MessageCreationException: Couldn't create SOAP message with Nio2 connector protocol
https://bz.apache.org/bugzilla/show_bug.cgi?id=57799 Remy Maucherat changed: What|Removed |Added Attachment #33243|0 |1 is obsolete|| --- Comment #34 from Remy Maucherat --- Created attachment 33247 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33247&action=edit Test patch With debug. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711934 - /tomcat/native/trunk/native/src/sslnetwork.c
Author: markt
Date: Mon Nov 2 10:32:58 2015
New Revision: 1711934
URL: http://svn.apache.org/viewvc?rev=1711934&view=rev
Log:
Port Bill's fix for OpenSSL constant name change from 1.1.x to trunk.
Modified:
tomcat/native/trunk/native/src/sslnetwork.c
Modified: tomcat/native/trunk/native/src/sslnetwork.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslnetwork.c?rev=1711934&r1=1711933&r2=1711934&view=diff
==
--- tomcat/native/trunk/native/src/sslnetwork.c (original)
+++ tomcat/native/trunk/native/src/sslnetwork.c Mon Nov 2 10:32:58 2015
@@ -627,8 +627,11 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
retVal = SSL_do_handshake(con->ssl);
if (retVal <= 0)
return APR_EGENERAL;
-
+#if OPENSSL_VERSION_NUMBER < 0x1010L
if (SSL_get_state(con->ssl) != SSL_ST_OK) {
+#else
+if (SSL_get_state(con->ssl) != TLS_ST_OK) {
+#endif
return APR_EGENERAL;
}
SSL_set_state(con->ssl, SSL_ST_ACCEPT);
@@ -649,8 +652,11 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
break;
}
con->reneg_state = RENEG_REJECT;
-
+#if OPENSSL_VERSION_NUMBER < 0x1010L
if (SSL_get_state(con->ssl) != SSL_ST_OK) {
+#else
+if (SSL_get_state(con->ssl) != TLS_ST_OK) {
+#endif
return APR_EGENERAL;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58081] Incorrect Java version in README
https://bz.apache.org/bugzilla/show_bug.cgi?id=58081 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas --- This was fixed in r1711587. -- 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: r1711935 - in /tomcat/native/trunk: build.properties.default build.xml
Author: markt
Date: Mon Nov 2 10:42:06 2015
New Revision: 1711935
URL: http://svn.apache.org/viewvc?rev=1711935&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58404
Don't duplicate properties from build.properties.default in build.xml
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=1711935&r1=1711934&r2=1711935&view=diff
==
--- tomcat/native/trunk/build.properties.default (original)
+++ tomcat/native/trunk/build.properties.default Mon Nov 2 10:42:06 2015
@@ -45,7 +45,6 @@ junit.version=3.8.2
# The directory containing your binary distribution of JUnit
# It will be automatically downloaded if it doesn't exist
junit.home=${base.path}/junit${junit.version}
-#junit.home = /usr/local/java/junit3.8.1
# The pathname of the "junit.jar" JAR file
junit.jar=${junit.home}/junit.jar
# The URL used to download JUnit if needed
Modified: tomcat/native/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/build.xml?rev=1711935&r1=1711934&r2=1711935&view=diff
==
--- tomcat/native/trunk/build.xml (original)
+++ tomcat/native/trunk/build.xml Mon Nov 2 10:42:06 2015
@@ -31,14 +31,7 @@
-
-
-
-
-
-
-
@@ -54,12 +47,6 @@
-
-
-
-
-
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58404] Duplicate property definitions compile.[source|target] in build.properties.default and build.xml
https://bz.apache.org/bugzilla/show_bug.cgi?id=58404 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas --- Fixed in r1711935 Note: Not back-porting to 1.1.x since a) this is clean-up rather than a bug and b) 1.2.x is intended/expected to replace 1.1.x rather than have the two releasing in parallel. -- 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 53847] High CPU usage in tomcat native 1.22+
https://bz.apache.org/bugzilla/show_bug.cgi?id=53847 Mark Thomas changed: What|Removed |Added Resolution|--- |DUPLICATE Status|NEEDINFO|RESOLVED --- Comment #2 from Mark Thomas --- No information received. Best guess this is a duplicate of 54085. *** This bug has been marked as a duplicate of bug 54085 *** -- 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 54085] ssl_socket_recv sometimes loops infinitely with non-blocking sockets
https://bz.apache.org/bugzilla/show_bug.cgi?id=54085 Mark Thomas changed: What|Removed |Added CC||asode...@agnitas.de --- Comment #2 from Mark Thomas --- *** Bug 53847 has been marked as a duplicate of this bug. *** -- 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 55706] broken apr version check in native v1.1.29 build; fails detect of installed v2.0.0
https://bz.apache.org/bugzilla/show_bug.cgi?id=55706 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |LATER --- Comment #3 from Mark Thomas --- A few years later and there is still no sign of an APR 2.x.x release. Since that API for 2.x.x is a moving target and there is nothing in 2.x.x that we need (if anything, the direction Tomcat is going in is to remove the dependency on 2.x.x) we can fix this later when/if we need to. -- 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 56878] Checking whether unsigned int is less than zero is useless
https://bz.apache.org/bugzilla/show_bug.cgi?id=56878 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Mark Thomas --- Fixed ~9 months ago in r1650304. -- 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: r1711945 - /tomcat/native/trunk/native/src/sslcontext.c
Author: markt
Date: Mon Nov 2 12:30:53 2015
New Revision: 1711945
URL: http://svn.apache.org/viewvc?rev=1711945&view=rev
Log:
Improve logic when SNI callback is not available or the SNI host name is
unknown.
Based on kkolinko's review of fix for BZ 58566.
Modified:
tomcat/native/trunk/native/src/sslcontext.c
Modified: tomcat/native/trunk/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1711945&r1=1711944&r2=1711945&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Mon Nov 2 12:30:53 2015
@@ -107,15 +107,17 @@ int ssl_callback_ServerNameIndication(SS
original_ssl_context = P2J(c->ctx);
// Make the call only if the static method exists
-if (sni_java_callback != 0) {
-new_ssl_context = (*env)->CallStaticLongMethod(env,
- ssl_context_class,
- sni_java_callback,
- original_ssl_context,
- hostname);
+if (sni_java_callback == NULL) {
+return SSL_TLSEXT_ERR_OK;
}
+
+new_ssl_context = (*env)->CallStaticLongMethod(env,
+ ssl_context_class,
+ sni_java_callback,
+ original_ssl_context,
+ hostname);
-if (original_ssl_context != new_ssl_context) {
+if (new_ssl_context != 0 && original_ssl_context != new_ssl_context) {
SSL_set_SSL_CTX(ssl, J2P(new_ssl_context, SSL_CTX *));
}
@@ -286,7 +288,7 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
sni_java_callback = (*e)->GetStaticMethodID(e, ssl_context_class,
"sniCallBack",
"(JLjava/lang/String;)J");
/* Older Tomcat versions may not have this static method */
-if ( JNI_TRUE == (*e)->ExceptionCheck(e) ) {
+if ( (*e)->ExceptionCheck(e) ) {
(*e)->ExceptionClear(e);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57136] EL Parser escaping dollar sign not ${ or ${...}
https://bz.apache.org/bugzilla/show_bug.cgi?id=57136 Violeta Georgieva changed: What|Removed |Added CC||amir.y...@gmail.com --- Comment #22 from Violeta Georgieva --- *** Bug 58567 has been marked as a duplicate of this bug. *** -- 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 58567] Error compiling EL expression with quotes - attribute not properly terminated.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58567 Violeta Georgieva changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #2 from Violeta Georgieva --- *** This bug has been marked as a duplicate of bug 57136 *** -- 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 58567] Error compiling EL expression with quotes - attribute not properly terminated.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58567 Yoni Amir changed: What|Removed |Added Resolution|DUPLICATE |--- Status|RESOLVED|REOPENED --- Comment #3 from Yoni Amir --- Why did you resolve this bug as duplicate? They may sound similar but I think the severity of them is much different. The other bug, 57136, exists in tomcat 7, and I never encountered it in my life or felt its pain in any way. This bug, however, is a regression between 8.0.26 and 8.0.27 and is hurting my JSPs very badly. 57136 is about $ and #, this bug is about quotes. -- 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 58567] Error compiling EL expression with quotes - attribute not properly terminated.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58567 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |DUPLICATE --- Comment #4 from Mark Thomas --- This was correctly marked as a duplicate of 57136. This issue described is not a regression, it is a side effect of fixing the long standing bug in EL parsing described in 57136. *** This bug has been marked as a duplicate of bug 57136 *** -- 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 57136] EL Parser escaping dollar sign not ${ or ${...}
https://bz.apache.org/bugzilla/show_bug.cgi?id=57136 --- Comment #23 from Mark Thomas --- *** Bug 58567 has been marked as a duplicate of this bug. *** -- 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: r1711953 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/servlets/WebdavServlet.java java/org/apache/catalina/tribes/membership/McastService.java java/org/apache/jasper/compiler/Pa
Author: violetagg Date: Mon Nov 2 13:05:24 2015 New Revision: 1711953 URL: http://svn.apache.org/viewvc?rev=1711953&view=rev Log: Merged revision 1710930 from tomcat/trunk: For https://bz.apache.org/bugzilla/show_bug.cgi?id=58547 (reviewing r1710760) Replace X.valueOf(String).xValue() with simple x.parseX(). Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/PageInfo.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Nov 2 13:05:24 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657 609,1657682,1657907,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,1 37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577 2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,169
svn commit: r1711954 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/servlets/WebdavServlet.java java/org/apache/catalina/tribes/membership/McastService.java java/org/apache/jasper/compiler/Pa
Author: violetagg Date: Mon Nov 2 13:09:03 2015 New Revision: 1711954 URL: http://svn.apache.org/viewvc?rev=1711954&view=rev Log: Merged revision 1710930 from tomcat/trunk: For https://bz.apache.org/bugzilla/show_bug.cgi?id=58547 (reviewing r1710760) Replace X.valueOf(String).xValue() with simple x.parseX(). Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/PageInfo.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Nov 2 13:09:03 2015 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702 748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046
[Bug 58567] Error compiling EL expression with quotes - attribute not properly terminated.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58567 --- Comment #5 from Yoni Amir --- Hi Mark, I am not sure if I understand your claim: you are saying that the side-effect is not a regression. Are you saying that it is a desired side-effect? Also, I see that 57136 is still open. Are there plans to fix it soon? Was this fix that you refer to (the one that created the side-effect) applied in 8.0.27? Thanks, Yoni -- 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: r1711960 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/servlets/ java/org/apache/cata
Author: violetagg Date: Mon Nov 2 13:23:54 2015 New Revision: 1711960 URL: http://svn.apache.org/viewvc?rev=1711960&view=rev Log: Merged revision 1710933 from tomcat/trunk: Replace Boolean.valueOf(String).booleanValue() with Boolean.parseBoolean(). Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Connector.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/StandardSession.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java tomcat/tc7.0.x/trunk/java/org/apache/el/util/Validation.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/Constants.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Parser.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java tomcat/tc7.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Nov 2 13:23:54 2015 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702 748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-121
svn commit: r1711958 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/servlets/ java/org/apache/cata
Author: violetagg Date: Mon Nov 2 13:17:14 2015 New Revision: 1711958 URL: http://svn.apache.org/viewvc?rev=1711958&view=rev Log: Merged revision 1710933 from tomcat/trunk: Replace Boolean.valueOf(String).booleanValue() with Boolean.parseBoolean(). Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/Globals.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Connector.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java tomcat/tc8.0.x/trunk/java/org/apache/el/lang/ELSupport.java tomcat/tc8.0.x/trunk/java/org/apache/el/util/Validation.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/Constants.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Generator.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Parser.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java tomcat/tc8.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Nov 2 13:17:14 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657 609,1657682,1657907,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
svn commit: r1711962 - in /tomcat/tc8.0.x/trunk: ./ java/javax/el/ java/org/apache/el/lang/ java/org/apache/jasper/runtime/ test/org/apache/coyote/ajp/ test/org/apache/tomcat/websocket/
Author: violetagg Date: Mon Nov 2 13:26:50 2015 New Revision: 1711962 URL: http://svn.apache.org/viewvc?rev=1711962&view=rev Log: Merged revision 1710945 from tomcat/trunk: For https://bz.apache.org/bugzilla/show_bug.cgi?id=58547 Replace Integer.valueOf(String).intValue() with simple parseInt(), and similar methods. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/javax/el/BeanELResolver.java tomcat/tc8.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java tomcat/tc8.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Nov 2 13:26:50 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657 609,1657682,1657907,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,1 37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1
svn commit: r1711963 - in /tomcat/tc7.0.x/trunk: ./ java/javax/el/ java/org/apache/el/lang/ java/org/apache/jasper/runtime/ test/org/apache/coyote/ajp/ test/org/apache/tomcat/websocket/
Author: violetagg Date: Mon Nov 2 13:32:14 2015 New Revision: 1711963 URL: http://svn.apache.org/viewvc?rev=1711963&view=rev Log: Merged revision 1710945 from tomcat/trunk: For https://bz.apache.org/bugzilla/show_bug.cgi?id=58547 Replace Integer.valueOf(String).intValue() with simple parseInt(), and similar methods. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/javax/el/BeanELResolver.java tomcat/tc7.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java tomcat/tc7.0.x/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Nov 2 13:32:14 2015 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702 748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,13368
[Bug 58567] Error compiling EL expression with quotes - attribute not properly terminated.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58567 --- Comment #6 from Mark Thomas --- (In reply to Yoni Amir from comment #5) Try reading the bug report for 57136. The answers to all of your questions may be found there. > I am not sure if I understand your claim: you are saying that the > side-effect is not a regression. Yes. > Are you saying that it is a desired side-effect? Yes. > Also, I see that 57136 is still open. It is open for an enhancement to add an option to restore the broken behaviour to give those users with broken web applications to upgrade to newer Tomcat versions without having to fix their applications. > Are there plans to fix it soon? The issue has already been fixed. There are no plans to implement the enhancement that I am aware of. > Was this fix that you refer to (the one that created the side-effect) > applied in 8.0.27? Yes. -- 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 58565] Connection will be closed on slow file download with non blocking http protocol
https://bz.apache.org/bugzilla/show_bug.cgi?id=58565 --- Comment #10 from Remy Maucherat --- IMO a direct "speed" configuration would be quite convoluted and users would have a hard time understanding it. It sounds better to me to keep buffer size and timeout instead. Are there really many who still want to support "large" files and dialup [without retry, since for example wget just happily resumes] ? In that situation, an admin should first increase the timeout, since 20s sounds too short for dialup even if not counting this issue. I'd say 60s in that situation at least, or maybe longer and using a separate shorter keepalive timeout. -- 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 57136] EL Parser escaping dollar sign not ${ or ${...}
https://bz.apache.org/bugzilla/show_bug.cgi?id=57136 --- Comment #24 from Yoni Amir --- Hello, I opened bug 58567, and Mark resolved it as a duplicate of this bug. I'd like to add to this discussion that I am suffering from the regression introduced in 8.0.27 and I didn't even try to escape the $ sign. I have quotes in the expression, something like this: I think that considering this issue as minor and just waiting for an enhancement is a bit weak, and will hurt users. Thanks, Yoni -- 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: r1711991 - /tomcat/native/trunk/native/src/sslcontext.c
Author: markt
Date: Mon Nov 2 13:48:08 2015
New Revision: 1711991
URL: http://svn.apache.org/viewvc?rev=1711991&view=rev
Log:
Implement review comments from kkolinko on the original fix for BZ 58566
Quit as early as possible if no SNI callback method is available in the Java
code
Ensure that Java long values always point to tcn_ssl_ctxt_t structures
Modified:
tomcat/native/trunk/native/src/sslcontext.c
Modified: tomcat/native/trunk/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1711991&r1=1711990&r2=1711991&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Mon Nov 2 13:48:08 2015
@@ -97,19 +97,21 @@ int ssl_callback_ServerNameIndication(SS
const char *servername;
jstring hostname;
jlong original_ssl_context, new_ssl_context;
+tcn_ssl_ctxt_t *new_c;
+
+// Continue only if the static method exists
+if (sni_java_callback == NULL) {
+return SSL_TLSEXT_ERR_OK;
+}
+
(*javavm)->AttachCurrentThread(javavm, (void **)&env, NULL);
// Get the host name presented by the client
servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
-// Convert parameters ready for the method call
+// Convert to Java compatible parameters ready for the method call
hostname = (*env)->NewStringUTF(env, servername);
-original_ssl_context = P2J(c->ctx);
-
-// Make the call only if the static method exists
-if (sni_java_callback == NULL) {
-return SSL_TLSEXT_ERR_OK;
-}
+original_ssl_context = P2J(c);
new_ssl_context = (*env)->CallStaticLongMethod(env,
ssl_context_class,
@@ -117,9 +119,10 @@ int ssl_callback_ServerNameIndication(SS
original_ssl_context,
hostname);
-if (new_ssl_context != 0 && original_ssl_context != new_ssl_context) {
-SSL_set_SSL_CTX(ssl, J2P(new_ssl_context, SSL_CTX *));
-}
+if (new_ssl_context != 0 && new_ssl_context != original_ssl_context) {
+new_c = J2P(new_ssl_context, tcn_ssl_ctxt_t *);
+SSL_set_SSL_CTX(ssl, new_c->ctx);
+ }
return SSL_TLSEXT_ERR_OK;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1712002 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java SSLHostConfig.java
Author: markt
Date: Mon Nov 2 13:50:40 2015
New Revision: 1712002
URL: http://svn.apache.org/viewvc?rev=1712002&view=rev
Log:
Implement review comments from kkolinko on the original fix for BZ 58566
Use correct type for return value and avoid unnecessary casts
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1712002&r1=1712001&r2=1712002&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Nov 2
13:50:40 2015
@@ -542,7 +542,7 @@ public class AprEndpoint extends Abstrac
sslHostConfig.setOpenSslContext(Long.valueOf(ctx));
}
SSLHostConfig defaultSSLHostConfig =
sslHostConfigs.get(getDefaultSSLHostConfigName());
-Long defaultSSLContext = (Long)
defaultSSLHostConfig.getOpenSslContext();
+Long defaultSSLContext = defaultSSLHostConfig.getOpenSslContext();
sslContext = defaultSSLContext.longValue();
SSLContext.registerDefault(defaultSSLContext, this);
}
@@ -552,7 +552,7 @@ public class AprEndpoint extends Abstrac
@Override
public long getSslContext(String sniHostName) {
SSLHostConfig sslHostConfig = getSSLHostConfig(sniHostName);
-Long ctx = (Long) sslHostConfig.getOpenSslContext();
+Long ctx = sslHostConfig.getOpenSslContext();
if (ctx != null) {
return ctx.longValue();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1712002&r1=1712001&r2=1712002&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Mon Nov 2
13:50:40 2015
@@ -107,7 +107,7 @@ public class SSLHostConfig {
}
-public Object getOpenSslContext() {
+public Long getOpenSslContext() {
return openSslContext;
}
-
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-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/135 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1711954 Blamelist: violetagg Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58566] NoSuchMethodError and JVM crash when running HTTPS test with Tomcat 7 (o.a.t.util.net.TestSsl)
https://bz.apache.org/bugzilla/show_bug.cgi?id=58566 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|REOPENED|RESOLVED --- Comment #6 from Mark Thomas --- Review comments all addressed. -- 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: r1712003 - /tomcat/trunk/java/org/apache/tomcat/jni/Library.java
Author: markt
Date: Mon Nov 2 14:14:10 2015
New Revision: 1712003
URL: http://svn.apache.org/viewvc?rev=1712003&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58058
Ensure only one thread can attempt to initialize the APR library at a time
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/Library.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Library.java?rev=1712003&r1=1712002&r2=1712003&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Library.java Mon Nov 2 14:14:10
2015
@@ -162,10 +162,13 @@ public final class Library {
* Setup any APR internal data structures. This MUST be the first function
* called for any APR library.
* @param libraryName the name of the library to load
+ *
+ * @return {@code true} if the native code was initialized successfully
+ * otherwise {@code false}
+ *
+ * @throws Exception if a problem occurred during initialization
*/
-public static boolean initialize(String libraryName)
-throws Exception
-{
+public synchronized static boolean initialize(String libraryName) throws
Exception {
if (_instance == null) {
if (libraryName == null)
_instance = new Library();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1712011 - /tomcat/trunk/java/org/apache/tomcat/jni/Library.java
Author: markt
Date: Mon Nov 2 14:26:47 2015
New Revision: 1712011
URL: http://svn.apache.org/viewvc?rev=1712011&view=rev
Log:
Align with 6/7/8
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/Library.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Library.java?rev=1712011&r1=1712010&r2=1712011&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Library.java Mon Nov 2 14:26:47
2015
@@ -41,7 +41,11 @@ public final class Library {
try {
System.loadLibrary(NAMES[i]);
loaded = true;
-} catch (ThreadDeath | VirtualMachineError t) {
+} catch (ThreadDeath t) {
+throw t;
+} catch (VirtualMachineError t) {
+// Don't use a Java 7 multiple exception catch so we can keep
+// the JNI code identical between Tomcat 6/7/8/9
throw t;
} catch (Throwable t) {
String name = System.mapLibraryName(NAMES[i]);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1712012 - /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java
Author: markt
Date: Mon Nov 2 14:30:40 2015
New Revision: 1712012
URL: http://svn.apache.org/viewvc?rev=1712012&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58058
Fix thread safety.
Align with 9.0.x
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java?rev=1712012&r1=1712011&r2=1712012&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java Mon Nov 2
14:30:40 2015
@@ -32,7 +32,7 @@ public final class Library {
*/
private static Library _instance = null;
-private Library() throws Throwable {
+private Library() throws Exception {
boolean loaded = false;
String path = System.getProperty("java.library.path");
String [] paths = path.split(File.pathSeparator);
@@ -45,7 +45,7 @@ public final class Library {
throw t;
} catch (VirtualMachineError t) {
// Don't use a Java 7 multiple exception catch so we can keep
-// the JNI code identical between Tomcat 6/7/8
+// the JNI code identical between Tomcat 6/7/8/9
throw t;
} catch (Throwable t) {
String name = System.mapLibraryName(NAMES[i]);
@@ -166,10 +166,13 @@ public final class Library {
* Setup any APR internal data structures. This MUST be the first function
* called for any APR library.
* @param libraryName the name of the library to load
+ *
+ * @return {@code true} if the native code was initialized successfully
+ * otherwise {@code false}
+ *
+ * @throws Exception if a problem occurred during initialization
*/
-public static boolean initialize(String libraryName)
-throws Throwable
-{
+public synchronized static boolean initialize(String libraryName) throws
Exception {
if (_instance == null) {
if (libraryName == null)
_instance = new Library();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1711667 - in /tomcat/native/trunk/native: ./ src/sslcontext.c
Mark,
On 10/31/15 2:57 PM, ma...@apache.org wrote:
> Author: markt
> Date: Sat Oct 31 18:57:58 2015
> New Revision: 1711667
>
> URL: http://svn.apache.org/viewvc?rev=1711667&view=rev
> Log:
> Update ignores
>
> Modified:
> tomcat/native/trunk/native/ (props changed)
> tomcat/native/trunk/native/src/sslcontext.c
>
> Propchange: tomcat/native/trunk/native/
> --
> --- svn:ignore (added)
> +++ svn:ignore Sat Oct 31 18:57:58 2015
> @@ -0,0 +1,9 @@
> +.make.dirs
> +Makefile
> +build-outputs.mk
> +config.log
> +config.nice
> +config.status
> +configure
> +tcnative.pc
> +tcnative.spec
>
> Modified: tomcat/native/trunk/native/src/sslcontext.c
> URL:
> http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1711667&r1=1711666&r2=1711667&view=diff
> ==
> --- tomcat/native/trunk/native/src/sslcontext.c (original)
> +++ tomcat/native/trunk/native/src/sslcontext.c Sat Oct 31 18:57:58 2015
> @@ -106,12 +106,14 @@ int ssl_callback_ServerNameIndication(SS
> hostname = (*env)->NewStringUTF(env, servername);
> original_ssl_context = P2J(c->ctx);
>
> -// Make the call
> -new_ssl_context = (*env)->CallStaticLongMethod(env,
> -
> ssl_context_class,
> -
> sni_java_callback,
> -
> original_ssl_context,
> -hostname);
> +// Make the call only if the statis methos exists
> +if (sni_java_callback != 0) {
> +new_ssl_context = (*env)->CallStaticLongMethod(env,
> + ssl_context_class,
> + sni_java_callback,
> + original_ssl_context,
> + hostname);
> +}
>
> if (original_ssl_context != new_ssl_context) {
> SSL_set_SSL_CTX(ssl, J2P(new_ssl_context, SSL_CTX *));
> @@ -283,6 +285,10 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
> ssl_context_class = (*e)->NewGlobalRef(e, o);
> sni_java_callback = (*e)->GetStaticMethodID(e, ssl_context_class,
> "sniCallBack",
> "(JLjava/lang/String;)J");
> +/* Older Tomcat versions may not have this static method */
> +if ( JNI_TRUE == (*e)->ExceptionCheck(e) ) {
> +(*e)->ExceptionClear(e);
> +}
> }
>
> /* Set up OpenSSL call back if SNI is provided by the client */
This commit looks to be more extensive than the commit comment would
suggest.
-chris
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Plan for Tomcat native 1.2.1
Mark, On 10/31/15 3:54 PM, Rémy Maucherat wrote: > 2015-10-31 20:17 GMT+01:00 Mark Thomas : > >> Given the issues with 1.2.0, I'd like to get 1.2.1 out sooner rather >> than later and then use that with 9.0.0.RC1. >> >> I think all the issues discovered so far have been fixed. If you know of >> one that hasn't, please speak up. >> >> Also, don't forget to update the changelog for the fixes you have made. >> >> I'm currently planning on tagging 1.2.1 this coming Monday (2015-11-02). >> >> +1 > > Thanks for fixing it so quickly. +1 I'll build on a few Linux systems to help out. I'm sorry I didn't have a chance to test this release before the vote conclusion. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Switch 6.0.x from RTC to CTR
The following votes were cast: Binding: +1: markt, remm, kkolinko, rjung, mgrigorov, jfclere, schultz, fschumacher, violetagg, kfujino Non-binding: +1: ognjen, 张乎兴(望陶) The vote therefore passes. Thanks, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1711667 - in /tomcat/native/trunk/native: ./ src/sslcontext.c
On 02/11/2015 14:32, Christopher Schultz wrote:
> Mark,
>
> On 10/31/15 2:57 PM, ma...@apache.org wrote:
>> Author: markt
>> Date: Sat Oct 31 18:57:58 2015
>> New Revision: 1711667
>>
>> URL: http://svn.apache.org/viewvc?rev=1711667&view=rev
>> Log:
>> Update ignores
>>
>> Modified:
>> tomcat/native/trunk/native/ (props changed)
>> tomcat/native/trunk/native/src/sslcontext.c
>>
>> Propchange: tomcat/native/trunk/native/
>> --
>> --- svn:ignore (added)
>> +++ svn:ignore Sat Oct 31 18:57:58 2015
>> @@ -0,0 +1,9 @@
>> +.make.dirs
>> +Makefile
>> +build-outputs.mk
>> +config.log
>> +config.nice
>> +config.status
>> +configure
>> +tcnative.pc
>> +tcnative.spec
>>
>> Modified: tomcat/native/trunk/native/src/sslcontext.c
>> URL:
>> http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1711667&r1=1711666&r2=1711667&view=diff
>> ==
>> --- tomcat/native/trunk/native/src/sslcontext.c (original)
>> +++ tomcat/native/trunk/native/src/sslcontext.c Sat Oct 31 18:57:58 2015
>> @@ -106,12 +106,14 @@ int ssl_callback_ServerNameIndication(SS
>> hostname = (*env)->NewStringUTF(env, servername);
>> original_ssl_context = P2J(c->ctx);
>>
>> -// Make the call
>> -new_ssl_context = (*env)->CallStaticLongMethod(env,
>> -
>> ssl_context_class,
>> -
>> sni_java_callback,
>> -
>> original_ssl_context,
>> -hostname);
>> +// Make the call only if the statis methos exists
>> +if (sni_java_callback != 0) {
>> +new_ssl_context = (*env)->CallStaticLongMethod(env,
>> + ssl_context_class,
>> + sni_java_callback,
>> + original_ssl_context,
>> + hostname);
>> +}
>>
>> if (original_ssl_context != new_ssl_context) {
>> SSL_set_SSL_CTX(ssl, J2P(new_ssl_context, SSL_CTX *));
>> @@ -283,6 +285,10 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
>> ssl_context_class = (*e)->NewGlobalRef(e, o);
>> sni_java_callback = (*e)->GetStaticMethodID(e, ssl_context_class,
>> "sniCallBack",
>> "(JLjava/lang/String;)J");
>> +/* Older Tomcat versions may not have this static method */
>> +if ( JNI_TRUE == (*e)->ExceptionCheck(e) ) {
>> +(*e)->ExceptionClear(e);
>> +}
>> }
>>
>> /* Set up OpenSSL call back if SNI is provided by the client */
>
> This commit looks to be more extensive than the commit comment would
> suggest.
If you look a little further up/down your inbox you'll see I corrected
the comment.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1712014 - in /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni: Library.java Socket.java
Author: markt
Date: Mon Nov 2 14:37:55 2015
New Revision: 1712014
URL: http://svn.apache.org/viewvc?rev=1712014&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58058
Fix thread safety.
Align with 8.0.x
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Socket.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java?rev=1712014&r1=1712013&r2=1712014&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java Mon Nov 2
14:37:55 2015
@@ -32,7 +32,7 @@ public final class Library {
*/
private static Library _instance = null;
-private Library() throws Throwable {
+private Library() throws Exception {
boolean loaded = false;
String path = System.getProperty("java.library.path");
String [] paths = path.split(File.pathSeparator);
@@ -45,7 +45,7 @@ public final class Library {
throw t;
} catch (VirtualMachineError t) {
// Don't use a Java 7 multiple exception catch so we can keep
-// the JNI code identical between Tomcat 6/7/8
+// the JNI code identical between Tomcat 6/7/8/9
throw t;
} catch (Throwable t) {
String name = System.mapLibraryName(NAMES[i]);
@@ -166,10 +166,13 @@ public final class Library {
* Setup any APR internal data structures. This MUST be the first function
* called for any APR library.
* @param libraryName the name of the library to load
+ *
+ * @return {@code true} if the native code was initialized successfully
+ * otherwise {@code false}
+ *
+ * @throws Exception if a problem occurred during initialization
*/
-public static boolean initialize(String libraryName)
-throws Throwable
-{
+public synchronized static boolean initialize(String libraryName) throws
Exception {
if (_instance == null) {
if (libraryName == null)
_instance = new Library();
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Socket.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Socket.java?rev=1712014&r1=1712013&r2=1712014&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Socket.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Socket.java Mon Nov 2
14:37:55 2015
@@ -379,7 +379,7 @@ public class Socket {
* @param buf The buffer to store the data in.
* @param offset Offset in the byte buffer.
* @param nbytes The number of bytes to read (-1) for full array.
- * @return If >= 0, the return value is the number of bytes read. Note a
+ * @return If ≥ 0, the return value is the number of bytes read. Note a
* non-blocking read with no data current available will return
* {@link Status#EAGAIN} and EOF will return {@link
Status#APR_EOF}.
*/
@@ -388,8 +388,8 @@ public class Socket {
/**
* Read data from a network using internally set ByteBuffer.
*
- * @return If > 0, the return value is the number of bytes read. If == 0,
- * the return value indicates EOF and if < 0 the return value is
the
+ * @return If > 0, the return value is the number of bytes read. If ==
0,
+ * the return value indicates EOF and if < 0 the return value
is the
* error code. Note a non-blocking read with no data current
* available will return {@link Status#EAGAIN} not zero.
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58058] Library _instance needs to be volatile
https://bz.apache.org/bugzilla/show_bug.cgi?id=58058 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Fixed in trunk for all current Tomcat versions (6.0.x, 7.0.x, 8.0.x and 9.0.x) -- 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: r1712015 - in /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni: Library.java Socket.java
Author: markt
Date: Mon Nov 2 14:39:12 2015
New Revision: 1712015
URL: http://svn.apache.org/viewvc?rev=1712015&view=rev
Log:
Fix BZ 58058
Fix thread safety.
Align with 7.0.x
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java?rev=1712015&r1=1712014&r2=1712015&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java Mon Nov 2
14:39:12 2015
@@ -32,7 +32,7 @@ public final class Library {
*/
private static Library _instance = null;
-private Library() throws Throwable {
+private Library() throws Exception {
boolean loaded = false;
String path = System.getProperty("java.library.path");
String [] paths = path.split(File.pathSeparator);
@@ -45,7 +45,7 @@ public final class Library {
throw t;
} catch (VirtualMachineError t) {
// Don't use a Java 7 multiple exception catch so we can keep
-// the JNI code identical between Tomcat 6/7/8
+// the JNI code identical between Tomcat 6/7/8/9
throw t;
} catch (Throwable t) {
String name = System.mapLibraryName(NAMES[i]);
@@ -166,10 +166,13 @@ public final class Library {
* Setup any APR internal data structures. This MUST be the first function
* called for any APR library.
* @param libraryName the name of the library to load
+ *
+ * @return {@code true} if the native code was initialized successfully
+ * otherwise {@code false}
+ *
+ * @throws Exception if a problem occurred during initialization
*/
-public static boolean initialize(String libraryName)
-throws Throwable
-{
+public synchronized static boolean initialize(String libraryName) throws
Exception {
if (_instance == null) {
if (libraryName == null)
_instance = new Library();
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java?rev=1712015&r1=1712014&r2=1712015&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java Mon Nov 2
14:39:12 2015
@@ -379,7 +379,7 @@ public class Socket {
* @param buf The buffer to store the data in.
* @param offset Offset in the byte buffer.
* @param nbytes The number of bytes to read (-1) for full array.
- * @return If >= 0, the return value is the number of bytes read. Note a
+ * @return If ≥ 0, the return value is the number of bytes read. Note a
* non-blocking read with no data current available will return
* {@link Status#EAGAIN} and EOF will return {@link
Status#APR_EOF}.
*/
@@ -388,8 +388,8 @@ public class Socket {
/**
* Read data from a network using internally set ByteBuffer.
*
- * @return If > 0, the return value is the number of bytes read. If == 0,
- * the return value indicates EOF and if < 0 the return value is
the
+ * @return If > 0, the return value is the number of bytes read. If ==
0,
+ * the return value indicates EOF and if < 0 the return value
is the
* error code. Note a non-blocking read with no data current
* available will return {@link Status#EAGAIN} not zero.
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/137 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1712014 Blamelist: markt BUILD FAILED: failed compile Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-6-trunk
The Buildbot has detected a new failure on builder tomcat-6-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-6-trunk/builds/12 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-6-commit' triggered this build Build Source Stamp: [branch tomcat/tc6.0.x/trunk] 1712015 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1712023 - in /tomcat/native/tags/TOMCAT_NATIVE_1_2_1: ./ native/include/tcn_version.h
Author: markt
Date: Mon Nov 2 14:48:45 2015
New Revision: 1712023
URL: http://svn.apache.org/viewvc?rev=1712023&view=rev
Log:
Tag 1.2.1
Added:
tomcat/native/tags/TOMCAT_NATIVE_1_2_1/
- copied from r1712022, tomcat/native/trunk/
Modified:
tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h
Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h?rev=1712023&r1=1712022&r2=1712023&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h Mon Nov
2 14:48:45 2015
@@ -69,7 +69,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1712024 - /tomcat/native/tags/TOMCAT_NATIVE_1_2_1/
Author: markt Date: Mon Nov 2 14:50:01 2015 New Revision: 1712024 URL: http://svn.apache.org/viewvc?rev=1712024&view=rev Log: Need to re-tag Removed: tomcat/native/tags/TOMCAT_NATIVE_1_2_1/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1712025 - /tomcat/native/trunk/java/org/apache/tomcat/
Author: markt Date: Mon Nov 2 14:51:33 2015 New Revision: 1712025 URL: http://svn.apache.org/viewvc?rev=1712025&view=rev Log: Update external for Java code Modified: tomcat/native/trunk/java/org/apache/tomcat/ (props changed) Propchange: tomcat/native/trunk/java/org/apache/tomcat/ -- --- svn:externals (original) +++ svn:externals Mon Nov 2 14:51:33 2015 @@ -1 +1 @@ -^/tomcat/trunk/java/org/apache/tomcat/jni@1708643 jni +^/tomcat/trunk/java/org/apache/tomcat/jni@1712012 jni - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1712026 - in /tomcat/native/tags/TOMCAT_NATIVE_1_2_1: ./ native/include/tcn_version.h
Author: markt
Date: Mon Nov 2 14:52:01 2015
New Revision: 1712026
URL: http://svn.apache.org/viewvc?rev=1712026&view=rev
Log:
Tag 1.2.1
Added:
tomcat/native/tags/TOMCAT_NATIVE_1_2_1/
- copied from r1712025, tomcat/native/trunk/
Modified:
tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h
Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h?rev=1712026&r1=1712025&r2=1712026&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h Mon Nov
2 14:52:01 2015
@@ -69,7 +69,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/
Author: markt Date: Mon Nov 2 15:10:18 2015 New Revision: 10986 Log: Upload Tomcat Native 1.2.1 source files Added: dev/tomcat/tomcat-connectors/native/1.2.1/ dev/tomcat/tomcat-connectors/native/1.2.1/source/ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz (with props) dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.md5 dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.sha1 Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz -- svn:mime-type = application/x-gzip Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc == --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc (added) +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc Mon Nov 2 15:10:18 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIcBAABCAAGBQJWN3rrAAoJEBDAHFovYFnnHnwP/RmW3NPQ8mRwvc3hLrU58+JI +eA5RQySFQphTaA16x5uMOTbg0WRf69lTGx8qpxD5lwvuZl/WYD6keWVm3mhTpnts +SIwf/d54im17O1ZPfJRAlU8sBYX/Xnu72KpgNOPPZvckhscrWpx1/c5MNpelSCW3 +Ud+9xyXMX+zo163uJnfmLplJZqtJYLmyl2qhtjRxm9bzePo9r8EuWKnCDUgMl3Yi +EnV5q5Ut3wMxdh/fykvmgcMnX9ACD+GVQf088dGAD7WtMuaRnk8rvsbFLU9/e1oX +keDEuuAgNhxHsBy/ULgXpOzTFice0Wo15dayFT20j2FPxtsb19LbGLMkUFm3QfPF +aJ+tUnvOmkAnCHzem0iX5EcXe5KFhh9JRBnog5LUEWwsz6/S0ITekIP9mFsdJB+f +og4v55WMZnnRH/tJ6TbDtFkZpMCq5VjpWCgpIzrs2luZDl8bL51nW675ri51peAe +Vu630/UIaxS+w8Jt92bSI4sBd46YCNUOCOeQ28Ua3JnudUqOxp9aaBFQv0eBkapc +U1ubGXtFYgEwOB1syo/GrdA+LX4EkpqqNcSh+ltV7KK+eFwq4jwl7uLmTB4i6Ndt +BmEkm4Qi+QSTQ6ySqEpDXKfdAeQMg32MyvPKX29a9HeS2VRUwydLfvNXEYlGKVmd +IphDjxfz9/3o0XObqT6Y +=F6qM +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 == --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 (added) +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 Mon Nov 2 15:10:18 2015 @@ -0,0 +1 @@ +2fc6c513e8cbef00bf87abdca697995a *tomcat-native-1.2.1-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 == --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 (added) +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 Mon Nov 2 15:10:18 2015 @@ -0,0 +1 @@ +a3698c32bcc02b0054c7b6c8362f6793902fe77b *tomcat-native-1.2.1-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc == --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc (added) +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc Mon Nov 2 15:10:18 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIcBAABCAAGBQJWN3rrAAoJEBDAHFovYFnnnqgQAJ9av9GzZWy6dCyCxaFCJSRE ++SO2d/9kaPsC1l48HpLnSfzGgQMm5PElPS5fmrXCz+U5MLz6sAWYb67u7Cey3Btk +PtWWrJgEqvzGIJPXU/0EjFiShLFyKUFBB9ul0OLi2eUqnyuR5lVYDqVPMt/QehNM +gC74esyQpQ4yUCAhnKvqRE89gTnG3lp7flbUDVOli4dydTS7rpKuH8l3PXefNIPM +miYKr1ur+w/zgVQcUkTTXl/XQqq9g+lsod6MbeoWXxQczfMZyR1QYxSKqv4FrNbC +/+xfdvt0QRbqmQNo/NJBapcUYHD1BOncvvn0X+ZO5yFSuhzOHxwVvdIam4L2JVky +w/kYHDQvWRk6b9gKV8u9HlhimUZV1KFXnKvnZxI4UuAHtsEf06Xo
svn commit: r1712038 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java
Author: markt
Date: Mon Nov 2 15:12:20 2015
New Revision: 1712038
URL: http://svn.apache.org/viewvc?rev=1712038&view=rev
Log: (empty)
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java?rev=1712038&r1=1712037&r2=1712038&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Library.java Mon Nov 2
15:12:20 2015
@@ -32,7 +32,7 @@ public final class Library {
*/
private static Library _instance = null;
-private Library() throws Exception {
+private Library() throws Throwable {
boolean loaded = false;
String path = System.getProperty("java.library.path");
String [] paths = path.split(File.pathSeparator);
@@ -170,9 +170,9 @@ public final class Library {
* @return {@code true} if the native code was initialized successfully
* otherwise {@code false}
*
- * @throws Exception if a problem occurred during initialization
+ * @throws Throwable if a problem occurred during initialization
*/
-public synchronized static boolean initialize(String libraryName) throws
Exception {
+public static synchronized boolean initialize(String libraryName) throws
Throwable {
if (_instance == null) {
if (libraryName == null)
_instance = new Library();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1712039 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java
Author: markt
Date: Mon Nov 2 15:15:20 2015
New Revision: 1712039
URL: http://svn.apache.org/viewvc?rev=1712039&view=rev
Log:
Correct back-port so it compiles with Java 5
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java?rev=1712039&r1=1712038&r2=1712039&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java Mon Nov 2
15:15:20 2015
@@ -32,7 +32,7 @@ public final class Library {
*/
private static Library _instance = null;
-private Library() throws Exception {
+private Library() throws Throwable {
boolean loaded = false;
String path = System.getProperty("java.library.path");
String [] paths = path.split(File.pathSeparator);
@@ -170,9 +170,9 @@ public final class Library {
* @return {@code true} if the native code was initialized successfully
* otherwise {@code false}
*
- * @throws Exception if a problem occurred during initialization
+ * @throws Throwable if a problem occurred during initialization
*/
-public synchronized static boolean initialize(String libraryName) throws
Exception {
+public static synchronized boolean initialize(String libraryName) throws
Throwable {
if (_instance == null) {
if (libraryName == null)
_instance = new Library();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1712041 - /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java
Author: markt
Date: Mon Nov 2 15:16:36 2015
New Revision: 1712041
URL: http://svn.apache.org/viewvc?rev=1712041&view=rev
Log:
Fix checkstyle issue
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java?rev=1712041&r1=1712040&r2=1712041&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/jni/Library.java Mon Nov 2
15:16:36 2015
@@ -172,7 +172,7 @@ public final class Library {
*
* @throws Exception if a problem occurred during initialization
*/
-public synchronized static boolean initialize(String libraryName) throws
Exception {
+public static synchronized boolean initialize(String libraryName) throws
Exception {
if (_instance == null) {
if (libraryName == null)
_instance = new Library();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a new failure on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/222 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] 1711962 Blamelist: violetagg BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1712043 - /tomcat/trunk/java/org/apache/tomcat/jni/Library.java
Author: markt
Date: Mon Nov 2 15:17:57 2015
New Revision: 1712043
URL: http://svn.apache.org/viewvc?rev=1712043&view=rev
Log:
Fix checkstyle issue
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/Library.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Library.java?rev=1712043&r1=1712042&r2=1712043&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Library.java Mon Nov 2 15:17:57
2015
@@ -172,7 +172,7 @@ public final class Library {
*
* @throws Exception if a problem occurred during initialization
*/
-public synchronized static boolean initialize(String libraryName) throws
Exception {
+public static synchronized boolean initialize(String libraryName) throws
Exception {
if (_instance == null) {
if (libraryName == null)
_instance = new Library();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/
On 02/11/2015 15:10, ma...@apache.org wrote: > Author: markt > Date: Mon Nov 2 15:10:18 2015 > New Revision: 10986 > > Log: > Upload Tomcat Native 1.2.1 source files The Windows binaries should follow shortly. I've tested building on OSX from the tar.gz archive and that works so I believe that the problems with 1.2.0 are resolved. Mark > > Added: > dev/tomcat/tomcat-connectors/native/1.2.1/ > dev/tomcat/tomcat-connectors/native/1.2.1/source/ > > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz >(with props) > > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc > > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 > > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 > > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip >(with props) > > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc > > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.md5 > > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.sha1 > > Added: > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz > == > Binary file - no diff available. > > Propchange: > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz > -- > svn:mime-type = application/x-gzip > > Added: > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc > == > --- > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc > (added) > +++ > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc > Mon Nov 2 15:10:18 2015 > @@ -0,0 +1,17 @@ > +-BEGIN PGP SIGNATURE- > +Comment: GPGTools - http://gpgtools.org > + > +iQIcBAABCAAGBQJWN3rrAAoJEBDAHFovYFnnHnwP/RmW3NPQ8mRwvc3hLrU58+JI > +eA5RQySFQphTaA16x5uMOTbg0WRf69lTGx8qpxD5lwvuZl/WYD6keWVm3mhTpnts > +SIwf/d54im17O1ZPfJRAlU8sBYX/Xnu72KpgNOPPZvckhscrWpx1/c5MNpelSCW3 > +Ud+9xyXMX+zo163uJnfmLplJZqtJYLmyl2qhtjRxm9bzePo9r8EuWKnCDUgMl3Yi > +EnV5q5Ut3wMxdh/fykvmgcMnX9ACD+GVQf088dGAD7WtMuaRnk8rvsbFLU9/e1oX > +keDEuuAgNhxHsBy/ULgXpOzTFice0Wo15dayFT20j2FPxtsb19LbGLMkUFm3QfPF > +aJ+tUnvOmkAnCHzem0iX5EcXe5KFhh9JRBnog5LUEWwsz6/S0ITekIP9mFsdJB+f > +og4v55WMZnnRH/tJ6TbDtFkZpMCq5VjpWCgpIzrs2luZDl8bL51nW675ri51peAe > +Vu630/UIaxS+w8Jt92bSI4sBd46YCNUOCOeQ28Ua3JnudUqOxp9aaBFQv0eBkapc > +U1ubGXtFYgEwOB1syo/GrdA+LX4EkpqqNcSh+ltV7KK+eFwq4jwl7uLmTB4i6Ndt > +BmEkm4Qi+QSTQ6ySqEpDXKfdAeQMg32MyvPKX29a9HeS2VRUwydLfvNXEYlGKVmd > +IphDjxfz9/3o0XObqT6Y > +=F6qM > +-END PGP SIGNATURE- > > Added: > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 > == > --- > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 > (added) > +++ > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 > Mon Nov 2 15:10:18 2015 > @@ -0,0 +1 @@ > +2fc6c513e8cbef00bf87abdca697995a *tomcat-native-1.2.1-src.tar.gz > \ No newline at end of file > > Added: > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 > == > --- > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 > (added) > +++ > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 > Mon Nov 2 15:10:18 2015 > @@ -0,0 +1 @@ > +a3698c32bcc02b0054c7b6c8362f6793902fe77b *tomcat-native-1.2.1-src.tar.gz > \ No newline at end of file > > Added: > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip > == > Binary file - no diff available. > > Propchange: > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip > -- > svn:mime-type = application/octet-stream > > Added: > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc > == > --- > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc > (added) > +++ > dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc > Mon Nov 2 15:10:18 2015 > @@ -0,0 +1,17 @@ > +-BEGIN PGP SIGNATURE- > +Comment: GPGTools - http://gpgtools.org
svn commit: r1712044 - in /tomcat/trunk/java/org/apache: catalina/connector/InputBuffer.java catalina/connector/LocalStrings.properties coyote/http11/Http11InputBuffer.java coyote/http11/Http11Process
Author: remm
Date: Mon Nov 2 15:20:44 2015
New Revision: 1712044
URL: http://svn.apache.org/viewvc?rev=1712044&view=rev
Log:
- Tentative patch for the elusive 57799: some blocking IO code uses
InputStream.available() (a useless call that has always been in the java.io
API). Following the introduction of non blocking, available() now causes real
IO to occur. While this should be mostly harmless for APR and NIO (which can
"read" 0 bytes), it would leave an async read pending with NIO2. The read IO
operation will now not occur unless a read listener has been set (in which case
available() is mostly equivalent to the newer isReady() method).
- Will wait until the fix is confirmed to work to port to 8, if not I will
rework this.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1712044&r1=1712043&r2=1712044&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Mon Nov 2
15:20:44 2015
@@ -224,7 +224,7 @@ public class InputBuffer extends Reader
available = cb.getLength();
}
if (available == 0) {
-coyoteRequest.action(ActionCode.AVAILABLE, null);
+coyoteRequest.action(ActionCode.AVAILABLE,
Boolean.valueOf(coyoteRequest.getReadListener() != null));
available = (coyoteRequest.getAvailable() > 0) ? 1 : 0;
}
return available;
@@ -269,7 +269,7 @@ public class InputBuffer extends Reader
public boolean isReady() {
if (coyoteRequest.getReadListener() == null) {
-throw new IllegalStateException("not in non blocking mode.");
+throw new
IllegalStateException(sm.getString("inputBuffer.requiresNonBlocking"));
}
if (isFinished()) {
// If this is a non-container thread, need to trigger a read
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1712044&r1=1712043&r2=1712044&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Mon
Nov 2 15:20:44 2015
@@ -64,6 +64,7 @@ coyoteResponse.sendRedirect.note=<
coyoteResponse.setBufferSize.ise=Cannot change buffer size after data has been
written
inputBuffer.streamClosed=Stream closed
+inputBuffer.requiresNonBlocking=Not available in non blocking mode
outputBuffer.writeNull=The String argument to write(String,int,int) may not be
null
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java?rev=1712044&r1=1712043&r2=1712044&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java Mon Nov
2 15:20:44 2015
@@ -626,14 +626,14 @@ public class Http11InputBuffer implement
* Available bytes in the buffers (note that due to encoding, this may not
* correspond).
*/
-int available() {
+int available(boolean read) {
int available = lastValid - pos;
if ((available == 0) && (lastActiveFilter >= 0)) {
for (int i = 0; (available == 0) && (i <= lastActiveFilter); i++) {
available = activeFilters[i].available();
}
}
-if (available > 0) {
+if (available > 0 || !read) {
return available;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1712044&r1=1712043&r2=1712044&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Mon Nov 2
15:20:44 2015
@@ -758,7 +758,7 @@ public class Http11Processor extends Abs
break;
}
case AVAILABLE: {
-request.setAvailable(inputBuffer.available());
+request.setAvailable(input
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/138 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1712038 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-6-trunk
The Buildbot has detected a restored build on builder tomcat-6-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-6-trunk/builds/13 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-6-commit' triggered this build Build Source Stamp: [branch tomcat/tc6.0.x/trunk] 1712039 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot 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/223 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] 1712012 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57799] MessageCreationException: Couldn't create SOAP message with Nio2 connector protocol
https://bz.apache.org/bugzilla/show_bug.cgi?id=57799 --- Comment #35 from Justin --- (In reply to Remy Maucherat from comment #34) > Created attachment 33247 [details] > Test patch > > With debug. Excellent, this patch has resolved the problem. I tested both HTTP and HTTPS. I see no exceptions in the logs and my client works as expected. Thanks for your help. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/
Am 02.11.2015 um 16:20 schrieb Mark Thomas: On 02/11/2015 15:10, ma...@apache.org wrote: Author: markt Date: Mon Nov 2 15:10:18 2015 New Revision: 10986 Log: Upload Tomcat Native 1.2.1 source files The Windows binaries should follow shortly. I've tested building on OSX from the tar.gz archive and that works so I believe that the problems with 1.2.0 are resolved. I did a quick build on Solaris and RHEL 6, looks OK. Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1712081 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/connector/ java/org/apache/coyote/http11/ webapps/docs/
Author: remm
Date: Mon Nov 2 16:46:59 2015
New Revision: 1712081
URL: http://svn.apache.org/viewvc?rev=1712081&view=rev
Log:
- 57799: Some blocking IO code uses InputStream.available() (a useless call
that has always been in the java.io API). Following the introduction of non
blocking, available() now causes real IO to occur. While this should be mostly
harmless for APR and NIO (which can "read" 0 bytes), it would leave an async
read pending with NIO2. The read IO operation will now not occur unless a read
listener has been set (in which case available() is mostly equivalent to the
newer isReady() method).
- Also add a missing i18n.
- Adapt patch from trunk to the 8 connectors.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1712081&r1=1712080&r2=1712081&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
Mon Nov 2 16:46:59 2015
@@ -241,7 +241,7 @@ public class InputBuffer extends Reader
available = cb.getLength();
}
if (available == 0) {
-coyoteRequest.action(ActionCode.AVAILABLE, null);
+coyoteRequest.action(ActionCode.AVAILABLE,
Boolean.valueOf(coyoteRequest.getReadListener() != null));
available = (coyoteRequest.getAvailable() > 0) ? 1 : 0;
}
return available;
@@ -286,7 +286,7 @@ public class InputBuffer extends Reader
public boolean isReady() {
if (coyoteRequest.getReadListener() == null) {
-throw new IllegalStateException("not in non blocking mode.");
+throw new
IllegalStateException(sm.getString("inputBuffer.requiresNonBlocking"));
}
// Need to check is finished before we check available() as BIO always
// returns 1 for isAvailable()
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1712081&r1=1712080&r2=1712081&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
Mon Nov 2 16:46:59 2015
@@ -68,6 +68,7 @@ coyoteResponse.sendRedirect.note=<
coyoteResponse.setBufferSize.ise=Cannot change buffer size after data has been
written
inputBuffer.streamClosed=Stream closed
+inputBuffer.requiresNonBlocking=Not available in non blocking mode
outputBuffer.writeNull=The String argument to write(String,int,int) may not be
null
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1712081&r1=1712080&r2=1712081&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Mon Nov 2 16:46:59 2015
@@ -873,7 +873,7 @@ public abstract class AbstractHttp11Proc
break;
}
case AVAILABLE: {
-request.setAvailable(inputBuffer.available());
+request.setAvailable(inputBuffer.available(param == Boolean.TRUE));
break;
}
case NB_WRITE_INTEREST: {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java?rev=1712081&r1=1712080&r2=1712081&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
Mon Nov 2 16:46:59 2015
@@ -326,14 +326,14 @@ public abstract class AbstractInputBuffe
* Available bytes in the buffers (note that due to encoding, this may not
* correspond).
*/
-pub
[Bug 57799] MessageCreationException: Couldn't create SOAP message with Nio2 connector protocol
https://bz.apache.org/bugzilla/show_bug.cgi?id=57799 Remy Maucherat changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #36 from Remy Maucherat --- The fix will be in 8.0.29, committed as r1712081. You should drop your test patch since the debug exception will impact performance. Thanks for the testing. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/
Hi tested on Debian and I got this compilation error: In file included from /home/ebourg/packaging/tomcat-native/native/include/tcn.h:52:0, from src/ssl.c:17: src/ssl.c: In function 'Java_org_apache_tomcat_jni_SSL_setVerify': src/ssl.c:1557:16: error: 'ctx' undeclared (first use in this function) TCN_ASSERT(ctx != 0); ^ src/ssl.c:1557:5: note: in expansion of macro 'TCN_ASSERT' TCN_ASSERT(ctx != 0); ^ src/ssl.c:1557:16: note: each undeclared identifier is reported only once for each function it appears in TCN_ASSERT(ctx != 0); ^ src/ssl.c:1557:5: note: in expansion of macro 'TCN_ASSERT' TCN_ASSERT(ctx != 0); ^ /home/ebourg/packaging/tomcat-native/native/build/rules.mk:206: recipe for target 'src/ssl.lo' failed The full build log is available here: https://paste.apache.org/8kFY Emmanuel Bourg - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a build exception on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/225 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] 1712081 Blamelist: remm BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/
Le 02/11/2015 18:11, Emmanuel Bourg a écrit : > src/ssl.c: In function 'Java_org_apache_tomcat_jni_SSL_setVerify': > src/ssl.c:1557:16: error: 'ctx' undeclared (first use in this function) >TCN_ASSERT(ctx != 0); I applied this patch to fix the error, is this correct? --- a/native/src/ssl.c +++ b/native/src/ssl.c @@ -1554,7 +1554,7 @@ verify = SSL_VERIFY_NONE; UNREFERENCED(o); -TCN_ASSERT(ctx != 0); +TCN_ASSERT(c->ctx != 0); c->verify_mode = level; if (c->verify_mode == SSL_CVERIFY_UNSET) Emmanuel Bourg - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1712038 - svn:log
Author: kkolinko Revision: 1712038 Modified property: svn:log Modified: svn:log at Mon Nov 2 19:51:14 2015 -- --- svn:log (original) +++ svn:log Mon Nov 2 19:51:14 2015 @@ -0,0 +1 @@ +Correct back-port so it compiles with Java 5 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r10995 - /dev/tomcat/tomcat-connectors/native/1.2.1/binaries/
Author: markt Date: Mon Nov 2 19:59:07 2015 New Revision: 10995 Log: Upload the Windows binaries for x86 and x64 (no ia64) Added: dev/tomcat/tomcat-connectors/native/1.2.1/binaries/ dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-ocsp-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-ocsp-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-ocsp-win32-bin.zip.md5 dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-ocsp-win32-bin.zip.sha1 dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-win32-bin.zip.md5 dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-win32-bin.zip.sha1 Added: dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-ocsp-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-ocsp-win32-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-ocsp-win32-bin.zip.asc == --- dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-ocsp-win32-bin.zip.asc (added) +++ dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-ocsp-win32-bin.zip.asc Mon Nov 2 19:59:07 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIcBAABCAAGBQJWN79sAAoJEBDAHFovYFnn6fAP/i45T/EHCmS4PCS3mqnCtXmI +mECG/+dz4SCJ8Xm1P8lbi2DaYhQoejBDvI2mxLbh0hM+Jg6QAjmifSnaUxGQrBgw +FmcmwrqZIPUvtkukGTqiz2uGiZsEv1E9WougXjZVROKdLXuFCRWsHmvlRXwu8Gpn +Ae/pOP9kpT5loieGYdKSUuzD9PDVnXCS//U16Y5XMlzL/v4guCipfwY/A3HI8sAB +Vt6hkV8cmrctIxKj2+3xqiQc5aUeRxLjkny445feW939BrkZcamsSl2gPg2+8Rnq +90WFHjewNm8V963pPH8i80bj4q5PYyd02tcK/exzKEVTzpqCzeRk8sWx/PCSsLJa +SsE3dYRHFiSqlM9HPOHvRUwiermIgvRN5yreBN5hzvZMmXx46qR+Nsv1X1umTCgM +CBlY6cByHCjN10a0/RsMhnJIlvhtJwDz7WG2H7VepEH25BE+Ix8JlDuOqKOKT+E7 +OqoHm5oDLKfVsRJQKHhd3OBC0vWvtnOyOThnauXIGdz4Q6A1n5FVlxpaeJE7YUJk +MomTXdTp5YWfHfW+DYElrUxsAqdadTGc4b+4BpoabvHWfUurBXRegOPt4V9XPMgH +eNXssJt0yt9ShR05V98DeTKwmEU3TJOnhDh7tzCex89ZhoS9Le5ptnDwkjpc0ZYP +BuhP8qFSCvqMxZY3/ES0 +=dlZI +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-ocsp-win32-bin.zip.md5 == --- dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-ocsp-win32-bin.zip.md5 (added) +++ dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-ocsp-win32-bin.zip.md5 Mon Nov 2 19:59:07 2015 @@ -0,0 +1 @@ +046d7322347779f882194f29f56fa752 *tomcat-native-1.2.1-ocsp-win32-bin.zip \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-ocsp-win32-bin.zip.sha1 == --- dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-ocsp-win32-bin.zip.sha1 (added) +++ dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-ocsp-win32-bin.zip.sha1 Mon Nov 2 19:59:07 2015 @@ -0,0 +1 @@ +e0171909d6ab2c310839b5ca94deaa002e63600e *tomcat-native-1.2.1-ocsp-win32-bin.zip \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-win32-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-win32-bin.zip.asc == --- dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-win32-bin.zip.asc (added) +++ dev/tomcat/tomcat-connectors/native/1.2.1/binaries/tomcat-native-1.2.1-win32-bin.zip.asc Mon Nov 2 19:59:07 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIcBAABCAAGBQJWN79sAAoJEBDAHFovYFnncJEQANZrMZ8RnYk+m8gp/dH+yN0s +xDZ1bEcwPRcQ2IS+divjCc3YAF8u3FoI6qEJ0xVEF3/LcmLw1gI2UbY0sS+H2+bq +/ZMidgto64Xt/46s0rwm9HJaUOinAOwSIYoI4sKlUPykZb9d0j+S6nMxl/7B6Lqr +VyG4B92ZAGbCnq6tjsl/qMvtRSkbscbY3IqZB+JmE2cb1EXGzfLN5zxAXjo9k2bu +joru6XuqGEOYxqRZv5BOd0M8
svn commit: r1712135 - in /tomcat/native/trunk: build.properties.default native/include/tcn_version.h native/os/win32/libtcnative.rc
Author: markt
Date: Mon Nov 2 20:03:34 2015
New Revision: 1712135
URL: http://svn.apache.org/viewvc?rev=1712135&view=rev
Log:
Update version number ready for next tag
Modified:
tomcat/native/trunk/build.properties.default
tomcat/native/trunk/native/include/tcn_version.h
tomcat/native/trunk/native/os/win32/libtcnative.rc
Modified: tomcat/native/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/build.properties.default?rev=1712135&r1=1712134&r2=1712135&view=diff
==
--- tomcat/native/trunk/build.properties.default (original)
+++ tomcat/native/trunk/build.properties.default Mon Nov 2 20:03:34 2015
@@ -18,7 +18,7 @@
# - Version Control Flags -
version.major=1
version.minor=2
-version.build=1
+version.build=2
version.patch=0
version.suffix=-dev
Modified: tomcat/native/trunk/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/tcn_version.h?rev=1712135&r1=1712134&r2=1712135&view=diff
==
--- tomcat/native/trunk/native/include/tcn_version.h (original)
+++ tomcat/native/trunk/native/include/tcn_version.h Mon Nov 2 20:03:34 2015
@@ -63,7 +63,7 @@ extern "C" {
#define TCN_MINOR_VERSION 2
/** patch level */
-#define TCN_PATCH_VERSION 1
+#define TCN_PATCH_VERSION 2
/**
* This symbol is defined for internal, "development" copies of TCN. This
Modified: tomcat/native/trunk/native/os/win32/libtcnative.rc
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/libtcnative.rc?rev=1712135&r1=1712134&r2=1712135&view=diff
==
--- tomcat/native/trunk/native/os/win32/libtcnative.rc (original)
+++ tomcat/native/trunk/native/os/win32/libtcnative.rc Mon Nov 2 20:03:34 2015
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
"See the License for the specific language governing " \
"permissions and limitations under the License."
-#define TCN_VERSION "1.2.1"
+#define TCN_VERSION "1.2.2"
1000 ICON "apache.ico"
1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,2,1,0
- PRODUCTVERSION 1,2,1,0
+ FILEVERSION 1,2,2,0
+ PRODUCTVERSION 1,2,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/
Am 02.11.2015 um 16:20 schrieb Mark Thomas: On 02/11/2015 15:10, ma...@apache.org wrote: Author: markt Date: Mon Nov 2 15:10:18 2015 New Revision: 10986 Log: Upload Tomcat Native 1.2.1 source files The Windows binaries should follow shortly. I've tested building on OSX from the tar.gz archive and that works so I believe that the problems with 1.2.0 are resolved. I tried to build it on ubuntu 14.04 LTS, but since that only includes openssl 1.0.1, it will not build (out of the box). Felix Mark Added: dev/tomcat/tomcat-connectors/native/1.2.1/ dev/tomcat/tomcat-connectors/native/1.2.1/source/ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz (with props) dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.md5 dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.sha1 Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz -- svn:mime-type = application/x-gzip Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc == --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc (added) +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.asc Mon Nov 2 15:10:18 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIcBAABCAAGBQJWN3rrAAoJEBDAHFovYFnnHnwP/RmW3NPQ8mRwvc3hLrU58+JI +eA5RQySFQphTaA16x5uMOTbg0WRf69lTGx8qpxD5lwvuZl/WYD6keWVm3mhTpnts +SIwf/d54im17O1ZPfJRAlU8sBYX/Xnu72KpgNOPPZvckhscrWpx1/c5MNpelSCW3 +Ud+9xyXMX+zo163uJnfmLplJZqtJYLmyl2qhtjRxm9bzePo9r8EuWKnCDUgMl3Yi +EnV5q5Ut3wMxdh/fykvmgcMnX9ACD+GVQf088dGAD7WtMuaRnk8rvsbFLU9/e1oX +keDEuuAgNhxHsBy/ULgXpOzTFice0Wo15dayFT20j2FPxtsb19LbGLMkUFm3QfPF +aJ+tUnvOmkAnCHzem0iX5EcXe5KFhh9JRBnog5LUEWwsz6/S0ITekIP9mFsdJB+f +og4v55WMZnnRH/tJ6TbDtFkZpMCq5VjpWCgpIzrs2luZDl8bL51nW675ri51peAe +Vu630/UIaxS+w8Jt92bSI4sBd46YCNUOCOeQ28Ua3JnudUqOxp9aaBFQv0eBkapc +U1ubGXtFYgEwOB1syo/GrdA+LX4EkpqqNcSh+ltV7KK+eFwq4jwl7uLmTB4i6Ndt +BmEkm4Qi+QSTQ6ySqEpDXKfdAeQMg32MyvPKX29a9HeS2VRUwydLfvNXEYlGKVmd +IphDjxfz9/3o0XObqT6Y +=F6qM +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 == --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 (added) +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.md5 Mon Nov 2 15:10:18 2015 @@ -0,0 +1 @@ +2fc6c513e8cbef00bf87abdca697995a *tomcat-native-1.2.1-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 == --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 (added) +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-src.tar.gz.sha1 Mon Nov 2 15:10:18 2015 @@ -0,0 +1 @@ +a3698c32bcc02b0054c7b6c8362f6793902fe77b *tomcat-native-1.2.1-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc == --- dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc (added) +++ dev/tomcat/tomcat-connectors/native/1.2.1/source/tomcat-native-1.2.1-win32-src.zip.asc Mon Nov 2 15:10:18 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIcBAABCAAGBQJWN3rrAAoJEBDAHFovYFnn
Re: svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/
Am 02.11.2015 um 18:26 schrieb Emmanuel Bourg:
Le 02/11/2015 18:11, Emmanuel Bourg a écrit :
src/ssl.c: In function 'Java_org_apache_tomcat_jni_SSL_setVerify':
src/ssl.c:1557:16: error: 'ctx' undeclared (first use in this function)
TCN_ASSERT(ctx != 0);
I applied this patch to fix the error, is this correct?
--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -1554,7 +1554,7 @@
verify = SSL_VERIFY_NONE;
UNREFERENCED(o);
-TCN_ASSERT(ctx != 0);
+TCN_ASSERT(c->ctx != 0);
c->verify_mode = level;
if (c->verify_mode == SSL_CVERIFY_UNSET)
The problem happens, because you do a DEBUG build, maybe using
--enable-maintainer-mode for configure. In normal build the TCN_ASSERT
will be removed automatically.
The wrong ASSERT is in the file from the first commit of the setVerify()
function. I'd say instead one would like to check c for not being NULL.
A TCN_ASSERT() could be used for TCN_ASSERT(ssl != 0), but the function
already does "SSL *ssl_ = J2P(ssl, SSL *);" and directly next checks for
"ssl_ == NULL" and throws an exception if that is the case. So ssl_
should be safe. The next step is "c = SSL_get_app_data2(ssl_);" and then
using the pointer c. So as a safety check, one could check against c
being NULL and throw an exception if it is.
So something like
@@ -1554,7 +1554,11 @@
verify = SSL_VERIFY_NONE;
UNREFERENCED(o);
-TCN_ASSERT(ctx != 0);
+
+if (c == NULL) {
+tcn_ThrowException(e, "context is null");
+return;
+}
c->verify_mode = level;
if (c->verify_mode == SSL_CVERIFY_UNSET)
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1712026 - in /tomcat/native/tags/TOMCAT_NATIVE_1_2_1: ./ native/include/tcn_version.h
Am 02.11.2015 um 15:52 schrieb ma...@apache.org:
Author: markt
Date: Mon Nov 2 14:52:01 2015
New Revision: 1712026
URL: http://svn.apache.org/viewvc?rev=1712026&view=rev
Log:
Tag 1.2.1
Added:
tomcat/native/tags/TOMCAT_NATIVE_1_2_1/
- copied from r1712025, tomcat/native/trunk/
Modified:
tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h
Modified: tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h?rev=1712026&r1=1712025&r2=1712026&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h Mon Nov
2 14:52:01 2015
@@ -69,7 +69,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
Not sure, but would we also want to change the
version.suffix=-dev
line in build.properties.default for a tag?
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1712026 - in /tomcat/native/tags/TOMCAT_NATIVE_1_2_1: ./ native/include/tcn_version.h
On 02/11/2015 20:34, Rainer Jung wrote:
> Am 02.11.2015 um 15:52 schrieb ma...@apache.org:
>> Author: markt
>> Date: Mon Nov 2 14:52:01 2015
>> New Revision: 1712026
>>
>> URL: http://svn.apache.org/viewvc?rev=1712026&view=rev
>> Log:
>> Tag 1.2.1
>>
>> Added:
>> tomcat/native/tags/TOMCAT_NATIVE_1_2_1/
>>- copied from r1712025, tomcat/native/trunk/
>> Modified:
>> tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h
>>
>> Modified:
>> tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h
>> URL:
>> http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h?rev=1712026&r1=1712025&r2=1712026&view=diff
>>
>> ==
>>
>> ---
>> tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h
>> (original)
>> +++
>> tomcat/native/tags/TOMCAT_NATIVE_1_2_1/native/include/tcn_version.h
>> Mon Nov 2 14:52:01 2015
>> @@ -69,7 +69,7 @@ extern "C" {
>>* This symbol is defined for internal, "development" copies of
>> TCN. This
>>* symbol will be #undef'd for releases.
>>*/
>> -#define TCN_IS_DEV_VERSION 1
>> +#define TCN_IS_DEV_VERSION 0
>>
>>
>> /** The formatted string of APU's version */
>
> Not sure, but would we also want to change the
>
> version.suffix=-dev
>
> line in build.properties.default for a tag?
We should but since we don't build the Java lib from here I can live
with it for 1.2.1. I've fixed my release build area for 1.2.2.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat Native 1.2.1
Version 1.2.1 includes the following changes: - Fix to enable 1.2.x to work with Tomcat releases that do not have the SNI callback implemented on the Java side The proposed release artefacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 1.2.1 is [ ] Stable, go ahead and release [ ] Broken because of ... [1] https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.1/ [2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1712163 - /tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
Author: markt
Date: Mon Nov 2 21:25:49 2015
New Revision: 1712163
URL: http://svn.apache.org/viewvc?rev=1712163&view=rev
Log:
Fix an IDE nag and a Javadoc error
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1712163&r1=1712162&r2=1712163&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Mon Nov 2
21:25:49 2015
@@ -365,13 +365,15 @@ public class JDBCRealm
/**
- * Return the Principal associated with the specified username and
- * credentials, if there is one; otherwise return null.
+ * Attempt to authenticate the user with the provided credentials.
*
* @param dbConnection The database connection to be used
* @param username Username of the Principal to look up
- * @param credentials Password or other credentials to use in
- * authenticating this username
+ * @param credentials Password or other credentials to use in
authenticating
+ *this username
+ *
+ * @return Return the Principal associated with the specified username and
+ * credentials, if there is one; otherwise return
null.
*/
public synchronized Principal authenticate(Connection dbConnection,
String username,
@@ -386,7 +388,7 @@ public class JDBCRealm
// Look up the user's credentials
String dbCredentials = getPassword(username);
-if (credentials == null || dbCredentials == null) {
+if (dbCredentials == null) {
if (containerLog.isTraceEnabled())
containerLog.trace(sm.getString("jdbcRealm.authenticateFailure",
username));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1712164 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/realm/JDBCRealm.java
Author: markt Date: Mon Nov 2 21:26:55 2015 New Revision: 1712164 URL: http://svn.apache.org/viewvc?rev=1712164&view=rev Log: Fix an IDE nag and a Javadoc error. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Nov 2 21:26:55 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657 609,1657682,1657907,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,1 37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577 2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696
[Tomcat Wiki] Update of "TomcatVersions" by markt
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "TomcatVersions" page has been changed by markt: https://wiki.apache.org/tomcat/TomcatVersions?action=diff&rev1=25&rev2=26 Comment: 6.0.x is now CTR ||Security Fixes: ||Yes || ||Releases: ||Yes || ||Release Manager: ||Jean-Frederic Clere (jfclere) || - ||Process: ||RTC || + ||Process: ||CTR || ||Listed on download pages: ||Yes || - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/
Le 02/11/2015 21:31, Rainer Jung a écrit : > So as a safety check, one could check against c > being NULL and throw an exception if it is. Thank you for the suggestion, I'll use that for the Debian package instead. Emmanuel Bourg - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1712166 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Author: markt Date: Mon Nov 2 21:34:55 2015 New Revision: 1712166 URL: http://svn.apache.org/viewvc?rev=1712166&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58568 Deprecate unused code. Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1712166&r1=1712165&r2=1712166&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Mon Nov 2 21:34:55 2015 @@ -466,7 +466,9 @@ public abstract class WebappClassLoaderB /** * The system class loader. + * @deprecated Unused. Always null. Will be removed in 8.0.x. */ +@Deprecated protected ClassLoader system = null; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58568] WebappClassLoaderBase exposes null "system" instance member
https://bz.apache.org/bugzilla/show_bug.cgi?id=58568 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- I've deprecated it. It is protected so removing it could cause problems for custom sub-classes. -- 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 58568] WebappClassLoaderBase exposes null "system" instance member
https://bz.apache.org/bugzilla/show_bug.cgi?id=58568 --- Comment #2 from Alexander Brand --- Thanks for looking into this. Would it make sense to set system = j2seeClassLoader in addition to deprecating system? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r10986 - in /dev/tomcat/tomcat-connectors/native/1.2.1: ./ source/
Am 02.11.2015 um 22:32 schrieb Emmanuel Bourg: Le 02/11/2015 21:31, Rainer Jung a écrit : So as a safety check, one could check against c being NULL and throw an exception if it is. Thank you for the suggestion, I'll use that for the Debian package instead. I'll include --enable-maintainer-mode plus the suggested patch in my release checks and report in the VOTE thread for 1.2.1. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58554] Cannot output html from jsp files inside of lambdas
https://bz.apache.org/bugzilla/show_bug.cgi?id=58554 Mark Thomas changed: What|Removed |Added Resolution|--- |WONTFIX Status|NEW |RESOLVED --- Comment #3 from Mark Thomas --- There is nothing I could find in the JSP specification that states that the implicit variables are final. The current JSP code generation is clearly written on the basis that they are not final and that they may change during the execution of the JSP page. As an aside, the example in the description wouldn't work even if out were final due to the IOExceptions thrown. A try/catch block is also required. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a new failure on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/226 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] 1712164 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58548] support certifcate transparency
https://bz.apache.org/bugzilla/show_bug.cgi?id=58548 Mark Thomas changed: What|Removed |Added Target Milestone|--- |- Component|Connectors |Connectors Severity|normal |enhancement OS|Windows NT |All Product|Tomcat 7|Tomcat 9 Hardware|PC |All --- Comment #1 from Mark Thomas --- Moving to Tomcat 9 since supporting the TLS extension will require support from JSSE and OpenSSL. Currently CT support is available in OpenSSL 1.0.2 and that means Tomcat 9. I couldn't find any indication the Java supports or plans to support CT. Using a certificate with the CT extension should work for all current Tomcat versions with all connectors immediately. -- 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 58543] JspFactoryImpl inefficient static initialization
https://bz.apache.org/bugzilla/show_bug.cgi?id=58543 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- Fixed in trunk, 8.0.x (for 8.0.29 onwards) and 7.0.x (for 7.0.66 onwards). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58542] Improve McastService property management
https://bz.apache.org/bugzilla/show_bug.cgi?id=58542 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Fixed in trunk, 8.0.x (for 8.0.29 onwards) and 7.0.x (for 7.0.66 onwards). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[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: 21 secs Command Line: make [Working Directory: /srv/gump/public/workspace/tomcat-native/native] - make[1]: Entering directory `/srv/gump/public/workspace/tomcat-native/native' /bin/bash /srv/gump/public/workspace/apr-1/dest-20151103/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -DHAVE_POOL_PRE_CLEANUP -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-20151103/include -I/srv/gump/public/workspace/apr-1/dest-20151103/include/apr-1 -o src/address.lo -c src/address.c && touch src/address.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20151103/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -DHAVE_POOL_PRE_CLEANUP -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-20151103/include -I/srv/gump/public/workspace/apr-1/dest-20151103/include/apr-1 -o src/bb.lo -c src/bb.c && touch src/bb.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20151103/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -DHAVE_POOL_PRE_CLEANUP -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-20151103/include -I/srv/gump/public/workspace/apr-1/dest-20151103/include/apr-1 -o src/dir.lo -c src/dir.c && touch src/dir.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20151103/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -DHAVE_POOL_PRE_CLEANUP -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-20151103/include -I/srv/gump/public/workspace/apr-1/dest-20151103/include/apr-1 -o src/error.lo -c src/error.c && touch src/error.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20151103/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -DHAVE_POOL_PRE_CLEANUP -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-20151103/include -I/srv/gump/public/workspace/apr-1/dest-20151103/include/apr-1 -o src/file.lo -c src/file.c && touch src/file.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20151103/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -DHAVE_POOL_PRE_CLEANUP -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-20151103/include -I/srv/gump/public/workspace/apr-1/dest-20151103/include/apr-1 -o src/info.lo -c src/info.c && touch src/info.lo /bin/bash /srv/gump/public/workspace/apr-1/dest
svn commit: r1712199 - in /tomcat/native/branches/1.1.x/native/src: ssl.c sslnetwork.c sslutils.c
Author: billbarker
Date: Tue Nov 3 02:07:20 2015
New Revision: 1712199
URL: http://svn.apache.org/viewvc?rev=1712199&view=rev
Log:
Align with OpenSSL master. The big change is that now OpenSSL take full control
of the SSL state machine, so we can't change it anymore. But it also looks like
doing a read after renegotiate isn't necessary anymore. I'll wait to see how
Gump reacts before porting to 1.2.x
Modified:
tomcat/native/branches/1.1.x/native/src/ssl.c
tomcat/native/branches/1.1.x/native/src/sslnetwork.c
tomcat/native/branches/1.1.x/native/src/sslutils.c
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=1712199&r1=1712198&r2=1712199&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Tue Nov 3 02:07:20 2015
@@ -654,12 +654,14 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize
TCN_FREE_CSTRING(engine);
return (jint)APR_SUCCESS;
}
+#if OPENSSL_VERSION_NUMBER < 0x1010L
if (SSLeay() < 0x0090700L) {
TCN_FREE_CSTRING(engine);
tcn_ThrowAPRException(e, APR_EINVAL);
ssl_initialized = 0;
return (jint)APR_EINVAL;
}
+#enduf
/* We must register the library in full, to ensure our configuration
* code can successfully test the SSL environment.
*/
Modified: tomcat/native/branches/1.1.x/native/src/sslnetwork.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslnetwork.c?rev=1712199&r1=1712198&r2=1712199&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslnetwork.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslnetwork.c Tue Nov 3 02:07:20
2015
@@ -645,6 +645,7 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
#endif
return APR_EGENERAL;
}
+#if OPENSSL_VERSION_NUMBER < 0x1010L
#if OPENSSL_VERSION_NUMBER >= 0x1000100fL
SSL_set_state(con->ssl, SSL_ST_ACCEPT);
#else
@@ -668,13 +669,11 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
break;
}
con->reneg_state = RENEG_REJECT;
-#if OPENSSL_VERSION_NUMBER < 0x1010L
+
if (SSL_get_state(con->ssl) != SSL_ST_OK) {
-#else
-if (SSL_get_state(con->ssl) != TLS_ST_OK) {
-#endif
return APR_EGENERAL;
}
+#endif
return APR_SUCCESS;
}
Modified: tomcat/native/branches/1.1.x/native/src/sslutils.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslutils.c?rev=1712199&r1=1712198&r2=1712199&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslutils.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslutils.c Tue Nov 3 02:07:20 2015
@@ -225,7 +225,11 @@ int SSL_CTX_use_certificate_chain(SSL_CT
unsigned long err;
int n;
+#if OPENSSL_VERSION_NUMBER < 0x1010L
if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
+#else
+if ((bio = BIO_new(BIO_s_file())) == NULL)
+#endif
return -1;
if (BIO_read_filename(bio, file) <= 0) {
BIO_free(bio);
@@ -534,9 +538,11 @@ void SSL_callback_handshake(const SSL *s
if ((where & SSL_CB_ACCEPT_LOOP) && con->reneg_state == RENEG_REJECT) {
int state = SSL_get_state(ssl);
-if (state == SSL3_ST_SR_CLNT_HELLO_A
#if OPENSSL_VERSION_NUMBER < 0x1010L
+if (state == SSL3_ST_SR_CLNT_HELLO_A
|| state == SSL23_ST_SR_CLNT_HELLO_A
+#else
+if (state == TLS_ST_SR_CLNT_HELLO
#endif
) {
con->reneg_state = RENEG_ABORT;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1712200 - /tomcat/native/branches/1.1.x/native/src/ssl.c
Author: billbarker Date: Tue Nov 3 02:18:13 2015 New Revision: 1712200 URL: http://svn.apache.org/viewvc?rev=1712200&view=rev Log: Fix typo Modified: tomcat/native/branches/1.1.x/native/src/ssl.c 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=1712200&r1=1712199&r2=1712200&view=diff == --- tomcat/native/branches/1.1.x/native/src/ssl.c (original) +++ tomcat/native/branches/1.1.x/native/src/ssl.c Tue Nov 3 02:18:13 2015 @@ -661,7 +661,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize ssl_initialized = 0; return (jint)APR_EINVAL; } -#enduf +#endif /* We must register the library in full, to ensure our configuration * code can successfully test the SSL environment. */ - 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-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, 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-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 -WARNING- No directory [/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: 37 mins 23 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.3-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151103-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151103.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151103-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-20151103/bin /openssl -Dexecute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-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
[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 -WARNING- No directory [/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: 42 mins 4 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151103-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151103.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151103-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-ma ster/dest-20151103/bin/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-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/jaspic-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/gu
[GUMP@vmgump]: Project tomcat-trunk-test-apr (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-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 14 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-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-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 46 mins 16 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.3-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151103-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20151103/lib -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151103.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151103-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-master/dest-20151103/bin/openssl -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-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/jaspic-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/tom
