Re: svn commit: r1676864 - in /tomcat/native/trunk/native: include/ssl_private.h src/sslcontext.c
On 29/04/2015 23:04, Christopher Schultz wrote:
> On 4/29/15 5:31 PM, ma...@apache.org wrote:
>> Author: markt
>> Date: Wed Apr 29 21:31:43 2015
>> New Revision: 1676864
>>
>> URL: http://svn.apache.org/r1676864
>> Log:
>> Implement the native part of SNI
>> Modified: tomcat/native/trunk/native/src/sslcontext.c
>> URL:
>> http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1676864&r1=1676863&r2=1676864&view=diff
>> ==
>> --- tomcat/native/trunk/native/src/sslcontext.c (original)
>> +++ tomcat/native/trunk/native/src/sslcontext.c Wed Apr 29 21:31:43 2015
>> @@ -62,12 +62,37 @@ static apr_status_t ssl_context_cleanup(
>> return APR_SUCCESS;
>> }
>>
>> +static jclassssl_context_class;
>> +static jmethodID sni_java_callback;
>> +
>> /* Callback used when OpenSSL receives a client hello with a Server Name
>> * Indication extension.
>> */
>> int ssl_callback_ServerNameIndication(SSL *ssl, int *al, tcn_ssl_ctxt_t *c)
>> {
>> -printf("SNI callback received");
>> +// Get the JNI environment for this callback
>> +JavaVM *javavm = tcn_get_java_vm();
>> +JNIEnv *env;
>> +(*javavm)->AttachCurrentThread(javavm, (void **)&env, NULL);
>
> Is OpenSSL running the handshake in another thread? I don't know enough
> about OpenSSL to know how it does things like callbacks for this stuff.
> What thread is active when ssl_callback_ServerNameIndication is being
> called? Is it a thread that initially requested the handshake (and is
> therefore already bound to the JVM)?
I believe the handshake does remain in a single thread and it is
triggered by a Java call. Therefore it should be possible to cache
JNIenv* from there. I'm not sure how much difference it will make. I'll
add a TODO.
>> @@ -206,9 +231,14 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
>> SSL_CTX_set_default_passwd_cb_userdata(c->ctx, (void
>> *)(&tcn_password_callback));
>> SSL_CTX_set_info_callback(c->ctx, SSL_callback_handshake);
>>
>> -/* Set Server Name Indication (SNI) callback */
>> -c->jnienv = e;
>> -c->java_object = o;
>> +/* Cache Java side SNI callback if not already cached */
>> +if (ssl_context_class == 0) {
>
> This is okay, but graybeards might prefer:
>
> if(!ssl_context_class)
I'll follow Chuck's advice on that one.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676919 - /tomcat/native/trunk/native/src/sslcontext.c
Author: markt
Date: Thu Apr 30 08:03:28 2015
New Revision: 1676919
URL: http://svn.apache.org/r1676919
Log:
Review from schultz & Chuck
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=1676919&r1=1676918&r2=1676919&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Thu Apr 30 08:03:28 2015
@@ -70,6 +70,8 @@ static jmethodID sni_java_callback;
*/
int ssl_callback_ServerNameIndication(SSL *ssl, int *al, tcn_ssl_ctxt_t *c)
{
+// TODO: Is it better to cache the JNIEnv* during the call to handshake?
+
// Get the JNI environment for this callback
JavaVM *javavm = tcn_get_java_vm();
JNIEnv *env;
@@ -232,7 +234,7 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
SSL_CTX_set_info_callback(c->ctx, SSL_callback_handshake);
/* Cache Java side SNI callback if not already cached */
-if (ssl_context_class == 0) {
+if (ssl_context_class == NULL) {
ssl_context_class = (*e)->NewGlobalRef(e, o);
sni_java_callback = (*e)->GetStaticMethodID(e, ssl_context_class,
"sniCallBack",
"(JLjava/lang/String;)J");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57865] session.invalidate does not work when during startup war file is deployed
https://bz.apache.org/bugzilla/show_bug.cgi?id=57865 --- Comment #3 from Alessandro Trolli --- Created attachment 32700 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32700&action=edit Sample Webapp sample webapp used for debug (working on 7.0.61) -- 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-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 26 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 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: 38 mins 8 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150430-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20150430/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150430.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150430-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-20150430/bin/openssl -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/out
svn commit: r1676926 - in /tomcat/trunk: java/org/apache/catalina/loader/WebappClassLoaderBase.java webapps/docs/class-loader-howto.xml
Author: markt
Date: Thu Apr 30 08:34:15 2015
New Revision: 1676926
URL: http://svn.apache.org/r1676926
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57875
Update docs for relaxed approach to SRV.10.7.2 in Tomcat 8 onwards.
Add javax.websocket.* to the list of classes where we always delegate first
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/webapps/docs/class-loader-howto.xml
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1676926&r1=1676925&r2=1676926&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Thu
Apr 30 08:34:15 2015
@@ -2793,6 +2793,10 @@ public abstract class WebappClassLoaderB
// Must never load javax.el.* classes
return false;
}
+if (name.startsWith("javax.websocket")) {
+// Must never load javax.websocket.* classes
+return false;
+}
// Assume everything else is OK
return true;
Modified: tomcat/trunk/webapps/docs/class-loader-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/class-loader-howto.xml?rev=1676926&r1=1676925&r2=1676926&view=diff
==
--- tomcat/trunk/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/trunk/webapps/docs/class-loader-howto.xml Thu Apr 30 08:34:15 2015
@@ -181,10 +181,10 @@ part of the JRE base classes cannot be o
such as the XML parser components which can be overridden using the appropriate
JVM feature which is the endorsed standards override feature for Java <= 8
and the upgradeable modules feature for Java 9+.
-Last, any JAR file that contains Servlet API classes will be explicitly
-ignored by the classloader — Do not include such JARs in your web
-application.
-All other class loaders in Tomcat follow the usual delegation pattern.
+Lastly, the web application class loader will always delegate first for JavaEE
+API classes for the specifications implemented by Tomcat
+(Servlet, JSP, EL, WebSocket). All other class loaders in Tomcat follow the
+usual delegation pattern.
Therefore, from the perspective of a web application, class or resource
loading looks in the following repositories, in this order:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57865] session.invalidate does not work when during startup war file is deployed
https://bz.apache.org/bugzilla/show_bug.cgi?id=57865 --- Comment #4 from Alessandro Trolli --- Created attachment 32701 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32701&action=edit config files -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676927 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/loader/WebappClassLoaderBase.java webapps/docs/changelog.xml webapps/docs/class-loader-howto.xml
Author: markt Date: Thu Apr 30 08:38:03 2015 New Revision: 1676927 URL: http://svn.apache.org/r1676927 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57875 Update docs for relaxed approach to SRV.10.7.2 in Tomcat 8 onwards. Add javax.websocket.* to the list of classes where we always delegate first Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml tomcat/tc8.0.x/trunk/webapps/docs/class-loader-howto.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 30 08:38:03 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721 +/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
[Bug 57875] Classloading guide on Servlet API classes
https://bz.apache.org/bugzilla/show_bug.cgi?id=57875 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED OS||All Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Thanks for the report. Tomcat 8 is more relaxed about this. It delegates first for all the JavaEE API classes for the specs Tomcat implements. This achieves the same ends with less impact on the user if they accidently ship an JavaEE API JAR in their web application. The updated docs will be in 8.0.23 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot 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/234 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] 1676927 Blamelist: markt BUILD FAILED: exception svn upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57865] session.invalidate does not work when during startup war file is deployed
https://bz.apache.org/bugzilla/show_bug.cgi?id=57865 --- Comment #5 from Alessandro Trolli --- I'm actually not able to reproduce using a simple webapp (please find in attachements war and config files) but even with complete webapp result is not deterministic. The thing I've observed during first debug session is that Principal was available after logout (calling session.invalidate and issuing a client redirect to root context) without being redirect to authentication form by SingleSignOn valve -- 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 56438] If jar scan does not find context config or TLD config, log a message
https://bz.apache.org/bugzilla/show_bug.cgi?id=56438 --- Comment #11 from VIN --- Created attachment 32702 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32702&action=edit Fix for adding debug log message for positive matches of tld-Tomcat7 This patch contains fix Tomcat7 for for below things: 1) Added debug log messages to print positive matches when tld files are found 2) Added info log message to print both negative and positive tld matches in tldScanResourcePaths(Web_Inf). But did not mention that "Consider adding this path to ...". Summary message "At least one resource path was scanned for TLDs yet contained no TLDs" is also not added because 8.0 and trunk are not having this. -- 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: r1676931 - /tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
Author: markt
Date: Thu Apr 30 08:58:20 2015
New Revision: 1676931
URL: http://svn.apache.org/r1676931
Log:
Add some Javadoc
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java?rev=1676931&r1=1676930&r2=1676931&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java Thu Apr 30 08:58:20
2015
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.jni;
import java.util.Map;
@@ -26,9 +25,9 @@ import java.util.concurrent.ConcurrentHa
*/
public final class SSLContext {
-
/**
- * Initialize new SSL context
+ * Create a new SSL context.
+ *
* @param pool The pool to use.
* @param protocol The SSL protocol to use. It can be any combination of
* the following:
@@ -46,9 +45,13 @@ public final class SSLContext {
* SSL_MODE_SERVER
* SSL_MODE_COMBINED
*
+ *
+ * @return The Java representation of a pointer to the newly created SSL
+ * Context
+ *
+ * @throws Exception If the SSL Context could not be created
*/
-public static native long make(long pool, int protocol, int mode)
-throws Exception;
+public static native long make(long pool, int protocol, int mode) throws
Exception;
/**
* Free the resources used by the Context
@@ -293,24 +296,85 @@ public final class SSLContext {
public static native int setALPN(long ctx, byte[] proto, int len);
-public static long sniCallBack(long defaultCtx, String sniHostName) {
-SNICallBack sniCallBack = sniCallBacks.get(Long.valueOf(defaultCtx));
+/**
+ * When tc-native encounters a SNI extension in the TLS handshake it will
+ * call this method to determine which OpenSSL SSLContext to use for the
+ * connection.
+ *
+ * @param currentCtx The OpenSSL SSLContext that the handshake started to
+ * use. This will be the default OpenSSL SSLContext for
+ * the endpoint associated with the socket.
+ * @param sniHostName The host name requested by the client
+ *
+ * @return The Java representation of the pointer to the OpenSSL SSLContext
+ * to use for the given host or zero if no SSLContext could be
+ * identified
+ */
+public static long sniCallBack(long currentCtx, String sniHostName) {
+SNICallBack sniCallBack = sniCallBacks.get(Long.valueOf(currentCtx));
if (sniCallBack == null) {
return 0;
}
return sniCallBack.getSslContext(sniHostName);
}
+/*
+ * A map of default SSL Contexts to SNICallBack instances (in Tomcat these
+ * are instances of AprEndpoint) that will be used to determine the SSL
+ * Context to use bases on the SNI host name. It is structured this way
+ * since a Tomcat instance may have several TLS enabled endpoints that each
+ * have different SSL Context mappings for the same host name.
+ */
private static Map sniCallBacks = new
ConcurrentHashMap<>();
+
+/**
+ * Register an OpenSSL SSLContext that will be used to initiate TLS
+ * connections that may use the SNI extension with the component that will
+ * be used to map the requested hostname to the correct OpenSSL SSLContext
+ * for the remainder of the connection.
+ *
+ * @param defaultSSLContext The Java representation of a pointer to the
+ * OpenSSL SSLContext that will be used to
+ * initiate TLS connections
+ * @param sniCallBack The component that will map SNI hosts names received
+ *via connections initiated using
+ *defaultSSLContext to the correct
OpenSSL
+ *SSLContext
+ */
public static void registerDefault(Long defaultSSLContext,
SNICallBack sniCallBack) {
sniCallBacks.put(defaultSSLContext, sniCallBack);
}
-public static void unregisterDefault(Long ctx) {
-sniCallBacks.remove(ctx);
+
+/**
+ * Unregister an OpenSSL SSLContext that will no longer be used to initiate
+ * TLS connections that may use the SNI extension.
+ *
+ * @param defaultSSLContext The Java representation of a pointer to the
+ * OpenSSL SSLContext that will no longer be used
+ */
+public static void unregisterDefault(Long defaultSSLContext) {
+sniCallBacks.remove(defaultSSLContext);
}
+
+/**
+ * Interface implemented by components that will receive the call back to
+ * s
Fwd: [Bug 56438] If jar scan does not find context config or TLD config, log a message
Hi Mark, I have provided second fix as you mentioned in issue description. Can you review and let me know? Thanks, pravallika -- Forwarded message -- From: Date: Thu, Apr 30, 2015 at 2:17 PM Subject: [Bug 56438] If jar scan does not find context config or TLD config, log a message To: dev@tomcat.apache.org https://bz.apache.org/bugzilla/show_bug.cgi?id=56438 --- Comment #11 from VIN --- Created attachment 32702 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32702&action=edit Fix for adding debug log message for positive matches of tld-Tomcat7 This patch contains fix Tomcat7 for for below things: 1) Added debug log messages to print positive matches when tld files are found 2) Added info log message to print both negative and positive tld matches in tldScanResourcePaths(Web_Inf). But did not mention that "Consider adding this path to ...". Summary message "At least one resource path was scanned for TLDs yet contained no TLDs" is also not added because 8.0 and trunk are not having this.
svn commit: r1676932 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Author: markt
Date: Thu Apr 30 09:10:36 2015
New Revision: 1676932
URL: http://svn.apache.org/r1676932
Log:
Javadoc updates
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.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=1676932&r1=1676931&r2=1676932&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu Apr 30
09:10:36 2015
@@ -297,9 +297,13 @@ public class AprEndpoint extends Abstrac
protected boolean SSLHonorCipherOrder = false;
/**
- * Set to true to enforce the server's cipher order
- * instead of the default which is to allow the client to choose a
- * preferred cipher.
+ * Configures whether or not this endpoint enforces the server's preference
+ * order ciphers.
+ *
+ * @param SSLHonorCipherOrder Set to true to enforce the
+ * server's cipher order instead of the
default
+ * which is to allow the client to choose a
+ * preferred cipher.
*/
public void setSSLHonorCipherOrder(boolean SSLHonorCipherOrder) {
this.SSLHonorCipherOrder = SSLHonorCipherOrder; }
public boolean getSSLHonorCipherOrder() { return SSLHonorCipherOrder; }
@@ -312,8 +316,11 @@ public class AprEndpoint extends Abstrac
protected boolean SSLDisableCompression = false;
/**
- * Set to true to disable SSL compression. This thwarts CRIME
- * attack.
+ * Configures whether or not to use SSL compression. The default is
+ * false.
+ *
+ * @param SSLDisableCompression Set to true to disable SSL
+ * compression. This thwarts the CRIMEattack.
*/
public void setSSLDisableCompression(boolean SSLDisableCompression) {
this.SSLDisableCompression = SSLDisableCompression; }
public boolean getSSLDisableCompression() { return SSLDisableCompression; }
@@ -364,7 +371,9 @@ public class AprEndpoint extends Abstrac
// - Public Methods
/**
- * Number of keepalive sockets.
+ * Obtain the number of kept alive sockets.
+ *
+ * @return The number of open sockets currently managed by the Poller
*/
public int getKeepAliveCount() {
if (poller == null) {
@@ -376,7 +385,9 @@ public class AprEndpoint extends Abstrac
/**
- * Number of sendfile sockets.
+ * Obtain the number of sendfile sockets.
+ *
+ * @return The number of sockets currently managed by the Sendfile poller.
*/
public int getSendfileCount() {
if (sendfile == null) {
@@ -941,7 +952,14 @@ public class AprEndpoint extends Abstrac
/**
- * Process given socket. Typically keep alive or upgraded protocol.
+ * Process the given socket. Typically keep alive or upgraded protocol.
+ *
+ * @param socketThe socket to process
+ * @param statusThe current status of the socket
+ *
+ * @return true if the processing completed normally otherwise
+ * false which indicates an error occurred and that
the
+ * socket should be closed
*/
public boolean processSocket(long socket, SocketStatus status) {
try {
@@ -1191,6 +1209,8 @@ public class AprEndpoint extends Abstrac
/**
* Removes the specified socket from the poller.
*
+ * @param socket The socket to remove
+ *
* @return The configured timeout for the socket or zero if the socket
* was not in the list of socket timeouts
*/
@@ -2929,6 +2949,5 @@ public class AprEndpoint extends Abstrac
// TODO Auto-generated method stub
throw new UnsupportedOperationException();
}
-
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676940 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AbstractEndpoint.java LocalStrings.properties
Author: markt
Date: Thu Apr 30 09:42:19 2015
New Revision: 1676940
URL: http://svn.apache.org/r1676940
Log:
Javadoc updates
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1676940&r1=1676939&r2=1676940&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Apr
30 09:42:19 2015
@@ -44,6 +44,8 @@ import org.apache.tomcat.util.threads.Ta
import org.apache.tomcat.util.threads.ThreadPoolExecutor;
/**
+ * @param The type for the sockets managed by this endpoint.
+ *
* @author Mladen Turk
* @author Remy Maucherat
*/
@@ -82,6 +84,8 @@ public abstract class AbstractEndpointhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1676940&r1=1676939&r2=1676940&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Thu
Apr 30 09:42:19 2015
@@ -44,12 +44,14 @@ endpoint.debug.unlock=Caught exception t
endpoint.accept.fail=Socket accept failed
endpoint.alpn.fail=Failed to configure endpoint for ALPN using {0}
endpoint.alpn.negotiated=Negotiated [{0}] protocol using ALPN
+endpoint.duplicateSslHostName=Multiple SSLHostConfig elements were provided
for the host name [{0}]. Host names must be unique.
endpoint.executor.fail=Executor rejected socket [{0}] for processing
endpoint.getAttribute=[{0}] is [{1}]
endpoint.init.bind=Socket bind failed: [{0}] {1}
endpoint.init.listen=Socket listen failed: [{0}] {1}
endpoint.init.notavail=APR not available
endpoint.noNegotiation=TLS was not configured for the [{0}] connector so
negotiation via ALPN for {1} is not available
+endpoint.noSslHostName=No host name was provided for the SSL host configuration
endpoint.poll.limitedpollsize=Failed to create poller with specified size of
{0}
endpoint.poll.initfail=Poller creation failed
endpoint.poll.fail=Critical poller failure (restarting poller): [{0}] {1}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676941 - /tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Author: markt
Date: Thu Apr 30 09:44:31 2015
New Revision: 1676941
URL: http://svn.apache.org/r1676941
Log:
Considered. It is not a good idea to do this generally.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1676941&r1=1676940&r2=1676941&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Apr
30 09:44:31 2015
@@ -722,7 +722,6 @@ public abstract class AbstractEndpoint utmo)
utmo = getSocketProperties().getUnlockTimeout();
s.setSoTimeout(stmo);
-// TODO Consider hard-coding to s.setSoLinger(true,0)
s.setSoLinger(getSocketProperties().getSoLingerOn(),getSocketProperties().getSoLingerTime());
if (getLog().isDebugEnabled()) {
getLog().debug("About to unlock socket for:"+saddr);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676943 - /tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
Author: markt
Date: Thu Apr 30 10:04:08 2015
New Revision: 1676943
URL: http://svn.apache.org/r1676943
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57871
Ensure that setting the allowHttpSepsInV0 property of LegacyCookieProcessor to
false only prevents HTTP separators from being used without quotes.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java?rev=1676943&r1=1676942&r2=1676943&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
Thu Apr 30 10:04:08 2015
@@ -184,7 +184,7 @@ public final class LegacyCookieProcessor
if (allowHttpSepsInV0) {
allowedWithoutQuotes.set(sep);
} else {
-allowedWithoutQuotes.clear();
+allowedWithoutQuotes.clear(sep);
}
}
if (getForwardSlashIsSeparator() && !allowHttpSepsInV0) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676944 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/http/LegacyCookieProcessor.java webapps/docs/changelog.xml
Author: markt Date: Thu Apr 30 10:06:05 2015 New Revision: 1676944 URL: http://svn.apache.org/r1676944 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57871 Ensure that setting the allowHttpSepsInV0 property of LegacyCookieProcessor to false only prevents HTTP separators from being used without quotes. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Apr 30 10:06:05 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926 +/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
[Bug 57871] LegacyCookieProcessor.setAllowHttpSepsInV0(false) affects all characters, not just separators
https://bz.apache.org/bugzilla/show_bug.cgi?id=57871 Mark Thomas changed: What|Removed |Added OS||All Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Fixed in trunk and 8.0.x. Will be in 8.0.23 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 57802] Compatibility with ICEfaces 1.8 over JSF 1.1 apps
https://bz.apache.org/bugzilla/show_bug.cgi?id=57802 --- Comment #16 from Mark Thomas --- The download appears to require registration and/or payment. I suggest you remove the JARs from WEB-INF/lib and replace them with a list of files and versions (assuming we can grab them from Maven central). That should bring the example under the BZ attachment limit. Alternatively, place the file somewhere that doesn't require payment or registration. -- 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: r1676927 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/loader/WebappClassLoaderBase.java webapps/docs/changelog.xml webapps/docs/class-loader-howto.xml
2015-04-30 11:38 GMT+03:00 : > > Author: markt > Date: Thu Apr 30 08:38:03 2015 > New Revision: 1676927 > > URL: http://svn.apache.org/r1676927 > Log: > Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57875 > Update docs for relaxed approach to SRV.10.7.2 in Tomcat 8 onwards. > Add javax.websocket.* to the list of classes where we always delegate first > > Modified: > tomcat/tc8.0.x/trunk/ (props changed) > tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java > tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml > tomcat/tc8.0.x/trunk/webapps/docs/class-loader-howto.xml > > Propchange: tomcat/tc8.0.x/trunk/ > -- > --- svn:mergeinfo (original) > +++ svn:mergeinfo Thu Apr 30 08:38:03 2015 > @@ -1 +1 @@ > -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 > ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 > 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 > 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721 > +/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,1643
Re: svn commit: r1676927 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/loader/WebappClassLoaderBase.java webapps/docs/changelog.xml webapps/docs/class-loader-howto.xml
On 30/04/2015 12:25, Violeta Georgieva wrote: > 2015-04-30 11:38 GMT+03:00 : >> >> Author: markt >> Date: Thu Apr 30 08:38:03 2015 >> New Revision: 1676927 >> >> URL: http://svn.apache.org/r1676927 >> Log: >> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57875 >> Update docs for relaxed approach to SRV.10.7.2 in Tomcat 8 onwards. >> Add javax.websocket.* to the list of classes where we always delegate > first >> >> Modified: >> tomcat/tc8.0.x/trunk/ (props changed) >> > tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java >> tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml >> tomcat/tc8.0.x/trunk/webapps/docs/class-loader-howto.xml >> >> Propchange: tomcat/tc8.0.x/trunk/ >> > -- >> --- svn:mergeinfo (original) >> +++ svn:mergeinfo Thu Apr 30 08:38:03 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,16448 9 2 >> > > ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,16 5 7 >> > > 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149 , 1 >> > > 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721 >> > +/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,16
[Bug 57865] session.invalidate does not work when during startup war file is deployed
https://bz.apache.org/bugzilla/show_bug.cgi?id=57865 Mark Thomas changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #6 from Mark Thomas --- The detail on this issue is still sketchy but I'll take a look at the provided web applicaion and see if that clarifies things. -- 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 57865] session.invalidate does not work when during startup war file is deployed
https://bz.apache.org/bugzilla/show_bug.cgi?id=57865 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME --- Comment #7 from Mark Thomas --- This works as expected for me with trunk. I also don't see any changes between 7.0.59 and 7.0.61 that might explain any odd behavoir. If this issue is re-opened then the *exact* steps to reproduce the issue with the latest stable 7.0.x release need to be provided. A clear description of the observed behabiour, the expected behaviour and what the differences are 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
svn commit: r1676973 - /tomcat/trunk/webapps/examples/WEB-INF/classes/util/HTMLFilter.java
Author: markt
Date: Thu Apr 30 12:26:57 2015
New Revision: 1676973
URL: http://svn.apache.org/r1676973
Log:
Javadoc
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/util/HTMLFilter.java
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/util/HTMLFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/util/HTMLFilter.java?rev=1676973&r1=1676972&r2=1676973&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/util/HTMLFilter.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/util/HTMLFilter.java Thu Apr
30 12:26:57 2015
@@ -31,6 +31,8 @@ public final class HTMLFilter {
* codes in the request URL that is often reported in error messages.
*
* @param message The message string to be filtered
+ *
+ * @return the filtered version of the message
*/
public static String filter(String message) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1676978 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/jsse/ webapps/docs/config/
Author: markt
Date: Thu Apr 30 13:15:36 2015
New Revision: 1676978
URL: http://svn.apache.org/r1676978
Log:
Move algorithm to SSLHostConfig
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/trunk/webapps/docs/config/http.xml
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java?rev=1676978&r1=1676977&r2=1676978&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
Thu Apr 30 13:15:36 2015
@@ -25,9 +25,6 @@ public abstract class AbstractHttp11Jsse
super(endpoint);
}
-public String getAlgorithm() { return getEndpoint().getAlgorithm();}
-public void setAlgorithm(String s ) { getEndpoint().setAlgorithm(s);}
-
public String getClientAuth() { return getEndpoint().getClientAuth();}
public void setClientAuth(String s ) { getEndpoint().setClientAuth(s);}
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1676978&r1=1676977&r2=1676978&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
Apr 30 13:15:36 2015
@@ -379,6 +379,11 @@ public abstract class AbstractHttp11Prot
defaultSSLHostConfig.setCertificateKeyFile(certificateKeyFile);
}
+public void setAlgorithm(String certificateAlgorithm) {
+registerDefaultSSLHostConfig();
+defaultSSLHostConfig.setCertificateAlgorithm(certificateAlgorithm);
+}
+
// - Common
code
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1676978&r1=1676977&r2=1676978&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Apr
30 13:15:36 2015
@@ -31,8 +31,6 @@ import java.util.concurrent.ConcurrentHa
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
-import javax.net.ssl.KeyManagerFactory;
-
import org.apache.juli.logging.Log;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.net.AbstractEndpoint.Acceptor.AcceptorState;
@@ -986,10 +984,6 @@ public abstract class AbstractEndpointhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1676978&r1=1676977&r2=1676978&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Thu Apr 30
13:15:36 2015
@@ -21,6 +21,8 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import javax.net.ssl.KeyManagerFactory;
+
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
@@ -45,6 +47,7 @@ public class SSLHostConfig {
private Set protocols = new HashSet<>();
// JSSE
private String keystoreFile = System.getProperty("user.home")+"/.keystore";
+private String certificateAlgorithm =
KeyManagerFactory.getDefaultAlgorithm();
// OpenSSL
private String certificateFile;
private String certificateKeyFile;
@@ -145,6 +148,17 @@ public class SSLHostConfig {
}
+public void setCertificateAlgorithm(String certificateAlgorithm) {
+setProperty("certificateAlgorithm", Type.JSSE);
+this.certificateAlgorithm = certificateAlgorithm;
+}
+
+
+public String getCertificateAlgorithm() {
+return certificateAlgorithm;
+}
+
+
// --- OpenSSL specific configuration
properties
public void setCertificateFile(String certificateFile) {
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactor
Re: svn commit: r1676864 - in /tomcat/native/trunk/native: include/ssl_private.h src/sslcontext.c
2015-04-29 23:34 GMT+02:00 Mark Thomas : > I have some tidying up of this that I'll do tomorrow (docs, comments, > i18n etc.) and then I plan to get on with the HTTP/2 implementation. > > I'll gladly help you. The new IO calls I added (only in NIO2 so far) are supposed to be well suited for it (fixed length header, easy to determine if there's a complete meaningful packet, etc, so the code processing the algorithm can focus on that rather than dealing with read/write states and - most problematic as we've seen - the associated syncs and notifications), and there's ongoing work on SSL as well. Eventually, there are likely many things that can be done with HTTP/2, for example it looks to me it can be used as a better AJP. Rémy
svn commit: r1676981 - in /tomcat/trunk: java/org/apache/coyote/http11/AbstractHttp11Protocol.java java/org/apache/tomcat/util/net/SSLHostConfig.java java/org/apache/tomcat/util/net/jsse/JSSESocketFac
Author: markt
Date: Thu Apr 30 13:28:54 2015
New Revision: 1676981
URL: http://svn.apache.org/r1676981
Log:
Rename afer a review
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1676981&r1=1676980&r2=1676981&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
Apr 30 13:28:54 2015
@@ -379,9 +379,9 @@ public abstract class AbstractHttp11Prot
defaultSSLHostConfig.setCertificateKeyFile(certificateKeyFile);
}
-public void setAlgorithm(String certificateAlgorithm) {
+public void setAlgorithm(String keyManagerAlgorithm) {
registerDefaultSSLHostConfig();
-defaultSSLHostConfig.setCertificateAlgorithm(certificateAlgorithm);
+defaultSSLHostConfig.setKeyManagerAlgorithm(keyManagerAlgorithm);
}
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=1676981&r1=1676980&r2=1676981&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Thu Apr 30
13:28:54 2015
@@ -46,8 +46,8 @@ public class SSLHostConfig {
// Common
private Set protocols = new HashSet<>();
// JSSE
+private String keyManagerAlgorithm =
KeyManagerFactory.getDefaultAlgorithm();
private String keystoreFile = System.getProperty("user.home")+"/.keystore";
-private String certificateAlgorithm =
KeyManagerFactory.getDefaultAlgorithm();
// OpenSSL
private String certificateFile;
private String certificateKeyFile;
@@ -137,25 +137,25 @@ public class SSLHostConfig {
// -- JSSE specific configuration
properties
-public void setKeystoreFile(String keystoreFile) {
-setProperty("keystoreFile", Type.JSSE);
-this.keystoreFile = keystoreFile;
+public void setKeyManagerAlgorithm(String keyManagerAlgorithm) {
+setProperty("keyManagerAlgorithm", Type.JSSE);
+this.keyManagerAlgorithm = keyManagerAlgorithm;
}
-public String getKeystoreFile() {
-return keystoreFile;
+public String getKeyManagerAlgorithm() {
+return keyManagerAlgorithm;
}
-public void setCertificateAlgorithm(String certificateAlgorithm) {
-setProperty("certificateAlgorithm", Type.JSSE);
-this.certificateAlgorithm = certificateAlgorithm;
+public void setKeystoreFile(String keystoreFile) {
+setProperty("keystoreFile", Type.JSSE);
+this.keystoreFile = keystoreFile;
}
-public String getCertificateAlgorithm() {
-return certificateAlgorithm;
+public String getKeystoreFile() {
+return keystoreFile;
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1676981&r1=1676980&r2=1676981&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Thu Apr 30 13:28:54 2015
@@ -387,7 +387,7 @@ public class JSSESocketFactory implement
}
return getKeyManagers(keystoreType, endpoint.getKeystoreProvider(),
-sslHostConfig.getCertificateAlgorithm(),
endpoint.getKeyAlias());
+sslHostConfig.getKeyManagerAlgorithm(),
endpoint.getKeyAlias());
}
@Override
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1676981&r1=1676980&r2=1676981&view=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Thu Apr 30 13:28:54 2015
@@ -1051,14 +1051,6 @@
-
- The certificate encoding algorithm to be used. This defaults to
- KeyManagerFactory.getDefaultAlgorithm() which returns
- SunX509 for Sun JVMs. IBM JVMs return
- IbmX509. For other vendors, consult the JVM
- documentation for the default val
Re: [VOTE] Release Apache Tomcat 8.0.22
2015-04-29 18:41 GMT+02:00 Mark Thomas : > The proposed Apache Tomcat 8.0.22 release is now available for voting. > > The proposed 8.0.22 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.0.22 > > Rémy
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1174 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1676981 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1677006 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ webapps/docs/config/
Author: markt
Date: Thu Apr 30 14:33:58 2015
New Revision: 1677006
URL: http://svn.apache.org/r1677006
Log:
Move clientAuth/verifyClient to SSLHostConfig
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/webapps/docs/config/http.xml
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java?rev=1677006&r1=1677005&r2=1677006&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
Thu Apr 30 14:33:58 2015
@@ -25,9 +25,6 @@ public abstract class AbstractHttp11Jsse
super(endpoint);
}
-public String getClientAuth() { return getEndpoint().getClientAuth();}
-public void setClientAuth(String s ) { getEndpoint().setClientAuth(s);}
-
public String getKeystorePass() { return getEndpoint().getKeystorePass();}
public void setKeystorePass(String s ) { getEndpoint().setKeystorePass(s);}
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1677006&r1=1677005&r2=1677006&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
Apr 30 14:33:58 2015
@@ -356,6 +356,9 @@ public abstract class AbstractHttp11Prot
}
+// TODO: All of these SSL setters can be removed once it is no longer
+// necessary to support the old configuration attributes (Tomcat 10?).
+
public void setSslEnabledProtocols(String enabledProtocols) {
registerDefaultSSLHostConfig();
defaultSSLHostConfig.setProtocols(enabledProtocols);
@@ -384,6 +387,16 @@ public abstract class AbstractHttp11Prot
defaultSSLHostConfig.setKeyManagerAlgorithm(keyManagerAlgorithm);
}
+public void setClientAuth(String certificateVerification) {
+registerDefaultSSLHostConfig();
+
defaultSSLHostConfig.setCertificateVerification(certificateVerification);
+}
+
+public void setSSLVerifyClient(String certificateVerification) {
+registerDefaultSSLHostConfig();
+
defaultSSLHostConfig.setCertificateVerification(certificateVerification);
+}
+
// - Common
code
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1677006&r1=1677005&r2=1677006&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Thu Apr
30 14:33:58 2015
@@ -133,13 +133,6 @@ public class Http11AprProtocol extends A
/**
- * SSL verify client.
- */
-public String getSSLVerifyClient() { return
((AprEndpoint)getEndpoint()).getSSLVerifyClient(); }
-public void setSSLVerifyClient(String SSLVerifyClient) {
((AprEndpoint)getEndpoint()).setSSLVerifyClient(SSLVerifyClient); }
-
-
-/**
* SSL verify depth.
*/
public int getSSLVerifyDepth() { return
((AprEndpoint)getEndpoint()).getSSLVerifyDepth(); }
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1677006&r1=1677005&r2=1677006&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Apr
30 14:33:58 2015
@@ -984,10 +984,6 @@ public abstract class AbstractEndpointhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1677006&r1=1677005&r2=1677006&view=diff
==
--- tomcat/trunk/j
svn commit: r1677008 - /tomcat/trunk/webapps/docs/config/http.xml
Author: markt Date: Thu Apr 30 14:35:43 2015 New Revision: 1677008 URL: http://svn.apache.org/r1677008 Log: Tweak Modified: tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1677008&r1=1677007&r2=1677008&view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Thu Apr 30 14:35:43 2015 @@ -1051,8 +1051,8 @@ - - OpenSSL only (required). + + OpenSSL only. Name of the file that contains the server certificate. The format is PEM-encoded. @@ -1087,6 +1087,7 @@ + JSSE only. The KeyManager algorithm to be used. This defaults to KeyManagerFactory.getDefaultAlgorithm() which returns SunX509 for Sun JVMs. IBM JVMs return - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.22
On 29/04/2015 17:41, Mark Thomas wrote: > The proposed 8.0.22 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.0.22 Unit tests all pass for NIO, NIO2 and APR/native on OSX, Linux and Windows (all 64-bit) with latest Java 1.7 JDK. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1175 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1677008 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 57802] Compatibility with ICEfaces 1.8 over JSF 1.1 apps
https://bz.apache.org/bugzilla/show_bug.cgi?id=57802 --- Comment #17 from Patrick WENDJI --- Comment on attachment 32699 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32699 ICEfaces 1.8.1 component showcase on Myfaces 1.1.5/Tomahawk 1.1.6 http://dl.free.fr/fKFKRAwpc -- 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: r1677074 - /tomcat/trunk/java/org/apache/tomcat/jni/SSLSocket.java
Author: markt
Date: Thu Apr 30 21:12:58 2015
New Revision: 1677074
URL: http://svn.apache.org/r1677074
Log:
Javadoc updates
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/SSLSocket.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSLSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSLSocket.java?rev=1677074&r1=1677073&r2=1677074&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/SSLSocket.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSLSocket.java Thu Apr 30 21:12:58
2015
@@ -74,6 +74,9 @@ public class SSLSocket {
*
* @param sock The socket to change.
* @param level Type of Client Certificate verification.
+ * @param depth Maximum number of certificates to permit in chain from
+ * client to trusted CA. Use a value of 0 or less to leave the
+ * current value unchanged
*/
public static native void setVerify(long sock, int level, int depth);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1677075 - in /tomcat/trunk/java/org/apache: coyote/http11/ tomcat/util/net/ tomcat/util/net/jsse/
Author: markt
Date: Thu Apr 30 21:14:35 2015
New Revision: 1677075
URL: http://svn.apache.org/r1677075
Log:
Move trustMaxCertLength/SSLVerifyDepth to SSLHostConfig
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java?rev=1677075&r1=1677074&r2=1677075&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
Thu Apr 30 21:14:35 2015
@@ -73,13 +73,6 @@ public abstract class AbstractHttp11Jsse
return getEndpoint().getTruststoreAlgorithm();
}
-public void setTrustMaxCertLength(String s){
-getEndpoint().setTrustMaxCertLength(s);
-}
-public String getTrustMaxCertLength(){
-return getEndpoint().getTrustMaxCertLength();
-}
-
public void setCrlFile(String s){getEndpoint().setCrlFile(s);}
public String getCrlFile(){ return getEndpoint().getCrlFile();}
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1677075&r1=1677074&r2=1677075&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
Apr 30 21:14:35 2015
@@ -397,6 +397,15 @@ public abstract class AbstractHttp11Prot
defaultSSLHostConfig.setCertificateVerification(certificateVerification);
}
+public void setTrustMaxCertLength(int certificateVerificationDepth){
+registerDefaultSSLHostConfig();
+
defaultSSLHostConfig.setCertificateVerificationDepth(certificateVerificationDepth);
+}
+public void setSSLVerifyDepth(int certificateVerificationDepth) {
+registerDefaultSSLHostConfig();
+
defaultSSLHostConfig.setCertificateVerificationDepth(certificateVerificationDepth);
+}
+
// - Common
code
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1677075&r1=1677074&r2=1677075&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Thu Apr
30 21:14:35 2015
@@ -133,12 +133,6 @@ public class Http11AprProtocol extends A
/**
- * SSL verify depth.
- */
-public int getSSLVerifyDepth() { return
((AprEndpoint)getEndpoint()).getSSLVerifyDepth(); }
-public void setSSLVerifyDepth(int SSLVerifyDepth) {
((AprEndpoint)getEndpoint()).setSSLVerifyDepth(SSLVerifyDepth); }
-
-/**
* Disable SSL compression.
*/
public boolean getSSLDisableCompression() { return
((AprEndpoint)getEndpoint()).getSSLDisableCompression(); }
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1677075&r1=1677074&r2=1677075&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Apr
30 21:14:35 2015
@@ -1063,12 +1063,6 @@ public abstract class AbstractEndpointhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1677075&r1=1677074&r2=1677075&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu Apr 30
21:14:35 2015
@@ -272,14 +272,6 @@ public class AprEndpoint extends Abstrac
public void setSSLDisableSessionTickets(boolean SSLDisableSessionTickets)
{ this.SSLDisableSessionTickets = SSLDisableSessionTickets; }
/**
- * SSL verify depth.
-
svn commit: r1677077 - /tomcat/trunk/webapps/docs/config/http.xml
Author: markt Date: Thu Apr 30 21:19:52 2015 New Revision: 1677077 URL: http://svn.apache.org/r1677077 Log: Move trustMaxCertLength/SSLVerifyDepth to SSLHostConfig (update docs) Modified: tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1677077&r1=1677076&r2=1677077&view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Thu Apr 30 21:19:52 2015 @@ -1079,6 +1079,12 @@ security constraint that uses CLIENT-CERT authentication. + + The maximum number of intermediate certificates that will be allowed + when validating client certificates. If not specified, the default value + of 10 will be used. + + The name of the SSL Host. This should either be the fully qualified domain name (e.g. tomcat.apache.org) or a wild card domain @@ -1265,9 +1271,9 @@ - The maximum number of intermediate certificates that will be allowed - when validating client certificates. If not specified, the default value - of 5 will be used. + This is an alias for the certificateVerificationDepth + attribute of the default + SSLHostConfig element. @@ -1442,8 +1448,9 @@ - Maximum verification depth for client certificates. The default is - "10". + This is an alias for the certificateVerificationDepth + attribute of the default + SSLHostConfig element. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1677080 - in /tomcat/trunk: java/org/apache/tomcat/util/net/AbstractEndpoint.java java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java webapps/docs/config/http.xml
Author: markt
Date: Thu Apr 30 21:33:27 2015
New Revision: 1677080
URL: http://svn.apache.org/r1677080
Log:
Make cipher suite order significant (expressing preference) for JSSE to align
with OpenSSL.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1677080&r1=1677079&r2=1677080&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Apr
30 21:33:27 2015
@@ -1006,10 +1006,6 @@ public abstract class AbstractEndpointhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1677080&r1=1677079&r2=1677080&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Thu
Apr 30 21:33:27 2015
@@ -98,7 +98,12 @@ public abstract class AbstractJsseEndpoi
engine.setEnabledCipherSuites(sslContextWrapper.getEnabledCiphers());
engine.setEnabledProtocols(sslContextWrapper.getEnabledProtocols());
-configureUseServerCipherSuitesOrder(engine);
+// Force server cipher suite order to be honored
+SSLParameters sslParameters = engine.getSSLParameters();
+sslParameters.setUseCipherSuitesOrder(true);
+// Following line may not be required. Depends if JRE takes a defensive
+// copy. Keep the line to avoid any possible issues.
+engine.setSSLParameters(sslParameters);
return engine;
}
@@ -112,24 +117,6 @@ public abstract class AbstractJsseEndpoi
}
-/**
- * Configures SSLEngine to honor cipher suites ordering based upon
- * endpoint configuration.
- */
-private void configureUseServerCipherSuitesOrder(SSLEngine engine) {
-String useServerCipherSuitesOrderStr = this
-.getUseServerCipherSuitesOrder().trim();
-
-SSLParameters sslParameters = engine.getSSLParameters();
-boolean useServerCipherSuitesOrder =
-("true".equalsIgnoreCase(useServerCipherSuitesOrderStr)
-|| "yes".equalsIgnoreCase(useServerCipherSuitesOrderStr));
-
-sslParameters.setUseCipherSuitesOrder(useServerCipherSuitesOrder);
-engine.setSSLParameters(sslParameters);
-}
-
-
private KeyManager[] wrap(KeyManager[] managers) {
if (managers==null) return null;
KeyManager[] result = new KeyManager[managers.length];
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1677080&r1=1677079&r2=1677080&view=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Thu Apr 30 21:33:27 2015
@@ -1158,8 +1158,8 @@
branch.
If not specified, a default (using the OpenSSL notation) of
HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5 will be used.
- Note that Java does not treat the order in which ciphers are defined
as
- an order of preference. See useServerCipherSuitesOrder.
+ Note that JSSE based connectors will always be configured to treat the
+ order in which ciphers are defined as an order of preference.
@@ -1318,15 +1318,6 @@
the default.
-
-
-Set to true to enforce the server's cipher order
-(from the ciphers setting). Set to false
-to choose the first acceptable cipher suite presented by the client.
-Default is false.
-
-
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.22
On 29.4.2015 18:41, Mark Thomas wrote: The proposed 8.0.22 release is: [X] Broken - do not release [ ] Stable - go ahead and release as 8.0.22 Tested .zip distribution on Windows 7 64-bit, Oracle JDK 1.8.0_45 and APR/native 1.1.33: - Crawled all links (except /manager, /host-manager and /examples/async*). No broken links found, except links to JavaDocs. - Smoke tests of BIO, NIO, NIO2 and APR, with and without TLS. Only NIO2+TLS fails. Connector configuration: protocol="org.apache.coyote.http11.Http11Nio2Protocol" SSLEnabled="true" maxThreads="150" scheme="https" secure="true" clientAuth="false" sslProtocol="TLS" keystoreFile="(snip).p12" keyAlias="(snip)" keystoreType="pkcs12" /> I smoke tested with this crawler: https://bz.apache.org/bugzilla/attachment.cgi?id=31184 I get in the logs some of those: 01-May-2015 01:29:59.631 SEVERE [http-apr-83-exec-7] org.apache.coyote.http11.AbstractHttp11Processor.endRequest Error finishing response org.apache.tomcat.jni.Error: 20005: An invalid socket was returned at org.apache.tomcat.jni.Socket.sendbb(Native Method) at org.apache.coyote.http11.InternalAprOutputBuffer.writeToSocket(InternalAprOutputBuffer.java:287) at org.apache.coyote.http11.InternalAprOutputBuffer.writeToSocket(InternalAprOutputBuffer.java:244) at org.apache.coyote.http11.InternalAprOutputBuffer.flushBuffer(InternalAprOutputBuffer.java:213) at org.apache.coyote.http11.AbstractOutputBuffer.endRequest(AbstractOutputBuffer.java:378) at org.apache.coyote.http11.AbstractHttp11Processor.endRequest(AbstractHttp11Processor.java:1800) at org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:1143) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:668) at org.apache.tomcat.util.net.AprEndpoint$SocketProcessor.doRun(AprEndpoint.java:2463) at org.apache.tomcat.util.net.AprEndpoint$SocketProcessor.run(AprEndpoint.java:2452) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.lang.Thread.run(Thread.java:745) And a lot of those: 01-May-2015 01:29:59.625 WARNING [http-nio2-84-exec-6] org.apache.tomcat.util.net.AbstractEndpoint.countDownConnection Incorrect connection count, multiple socket.close called on the same socket. 01-May-2015 01:29:59.627 WARNING [http-nio2-84-exec-4] org.apache.tomcat.util.net.AbstractEndpoint.countDownConnection Incorrect connection count, multiple socket.close called on the same socket. 01-May-2015 01:29:59.627 WARNING [http-nio2-84-exec-1] org.apache.tomcat.util.net.AbstractEndpoint.countDownConnection Incorrect connection count, multiple socket.close called on the same socket. I probably won't be able to do any more tests before Monday. -Ognjen - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 3 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-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 34 mins 2 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150501-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150501/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150501.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150501-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150501/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/
[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, and has been outstanding for 3 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-nio : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 35 mins 46 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150501-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150501.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150501-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20150501/bin/o penssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-spdy.jar:/srv/
