[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (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-nio2 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 4 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : 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-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 39 mins 30 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150507-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-20150507.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150507-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20150507/bi n/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-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
svn commit: r1678141 - 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 May 7 07:30:11 2015
New Revision: 1678141
URL: http://svn.apache.org/r1678141
Log:
Move sslProtocol 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=1678141&r1=1678140&r2=1678141&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
Thu May 7 07:30:11 2015
@@ -25,9 +25,6 @@ public abstract class AbstractHttp11Jsse
super(endpoint);
}
-public String getSslProtocol() { return getEndpoint().getSslProtocol();}
-public void setSslProtocol(String s) { getEndpoint().setSslProtocol(s);}
-
public void setSessionCacheSize(String
s){getEndpoint().setSessionCacheSize(s);}
public String getSessionCacheSize(){ return
getEndpoint().getSessionCacheSize();}
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=1678141&r1=1678140&r2=1678141&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
May 7 07:30:11 2015
@@ -506,6 +506,12 @@ public abstract class AbstractHttp11Prot
}
+public void setSslProtocol(String sslProtocol) {
+registerDefaultSSLHostConfig();
+defaultSSLHostConfig.setSslProtocol(sslProtocol);
+}
+
+
// - Common
code
// Common configuration required for all new HTTP11 processors
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=1678141&r1=1678140&r2=1678141&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu May
7 07:30:11 2015
@@ -963,10 +963,6 @@ public abstract class AbstractEndpointhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1678141&r1=1678140&r2=1678141&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Thu May 7
07:30:11 2015
@@ -64,6 +64,7 @@ public class SSLHostConfig {
private String certificateKeystoreProvider =
System.getProperty("javax.net.ssl.keyStoreProvider");
private String certificateKeystoreType =
System.getProperty("javax.net.ssl.keyStoreType");
private String keyManagerAlgorithm =
KeyManagerFactory.getDefaultAlgorithm();
+private String sslProtocol = "TLS";
private String trustManagerClassName;
private String truststoreAlgorithm =
TrustManagerFactory.getDefaultAlgorithm();
private String truststoreFile =
System.getProperty("javax.net.ssl.trustStore");
@@ -315,6 +316,17 @@ public class SSLHostConfig {
}
+public void setSslProtocol(String sslProtocol) {
+setProperty("sslProtocol", Type.JSSE);
+this.sslProtocol = sslProtocol;
+}
+
+
+public String getSslProtocol() {
+return sslProtocol;
+}
+
+
public void setTrustManagerClassName(String trustManagerClassName) {
setProperty("trustManagerClassName", Type.JSSE);
this.trustManagerClassName = trustManagerClassName;
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=1678141&r1=1678140&r2=1678141&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 May 7 07:30:11 2015
@@ -81,8 +81,6 @@ public class JSSESocketFactory implement
private static f
svn commit: r1678142 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/jsse/ test/org/apache/tomcat/util/net/ test/org/apache/tomcat/u
Author: markt
Date: Thu May 7 08:18:11 2015
New Revision: 1678142
URL: http://svn.apache.org/r1678142
Log:
Move the remaining Host specific ssl settings (sessionCacheSize and
sessionTiemout) 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/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/TesterBug50640SslImpl.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=1678142&r1=1678141&r2=1678142&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
Thu May 7 08:18:11 2015
@@ -25,12 +25,6 @@ public abstract class AbstractHttp11Jsse
super(endpoint);
}
-public void setSessionCacheSize(String
s){getEndpoint().setSessionCacheSize(s);}
-public String getSessionCacheSize(){ return
getEndpoint().getSessionCacheSize();}
-
-public void setSessionTimeout(String
s){getEndpoint().setSessionTimeout(s);}
-public String getSessionTimeout(){ return
getEndpoint().getSessionTimeout();}
-
public String getSslImplementationName() { return
getEndpoint().getSslImplementationName(); }
public void setSslImplementationName(String s) {
getEndpoint().setSslImplementationName(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=1678142&r1=1678141&r2=1678142&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
May 7 08:18:11 2015
@@ -512,6 +512,18 @@ public abstract class AbstractHttp11Prot
}
+public void setSessionCacheSize(int sessionCacheSize){
+registerDefaultSSLHostConfig();
+defaultSSLHostConfig.setSessionCacheSize(sessionCacheSize);
+}
+
+
+public void setSessionTimeout(int sessionTimeout){
+registerDefaultSSLHostConfig();
+defaultSSLHostConfig.setSessionTimeout(sessionTimeout);
+}
+
+
// - Common
code
// Common configuration required for all new HTTP11 processors
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=1678142&r1=1678141&r2=1678142&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu May
7 08:18:11 2015
@@ -963,14 +963,6 @@ public abstract class AbstractEndpoint> waitingRequests = Collections
.newSetFromMap(new ConcurrentHashMap,
Boolean>());
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1678142&r1=1678141&r2=1678142&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Thu
May 7 08:18:11 2015
@@ -46,22 +46,13 @@ public abstract class AbstractJsseEndpoi
if (isSSLEnabled()) {
sslImplementation =
SSLImplementation.getInstance(getSslImplementationName());
-// TODO: Temp code until config refactoring is complete. Remove
once
-// refactoring is complete.
-if (sslHostConfigs.size() == 0) {
-SSLHostConfig defaultSslHostConfig = new SSLHostConfig();
-
defaultSslHostConfig.setHostName(SSLHostConfig.DEFAULT_SSL_HOST_NAME);
-sslHostConfigs.put(SSLHostConfig.DEFAULT_SSL_HOST_NAME,
defaultS
[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 33 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: 39 mins 11 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-20150507-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-20150507/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150507.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150507-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-20150507/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
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/1197 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] 1678142 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
Re: Tomcat Grid write up
2015-05-07 6:42 GMT+03:00 Alarcón Vladimir : > I guess I got a little bit carried away when writing the architecture and > description, but I guess it's better to be ambitious. We can decide later on > what we actually want from this tool. > > Please find attached the write up. > Your attachment was removed by mailing list server. The users' list rules apply here as well, http://tomcat.apache.org/lists.html#tomcat-users -> 7. *.txt text/plain attachments may pass through the server, but zip/doc/image/binary are certainly dropped. Best regards, Konstantin Kolinko - 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 #13 from VIN --- Created attachment 32719 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32719&action=edit Fix for adding debug log message for positive matches of tld-trunk This patch contains fix for Tomcat recent trunk: 1) Added debug log message when positive tld match was found 2) Added debug log messages for both positive and negative matches of tld at resource path scan(previously it has only for JAR scanning). Summary message is not added. 3) Added debug log messages for both positive and negative matches of tld at directory level scan like Web-Inf/classes. Summary message is not added. Please verify the fix and let me know. Thanks, Pravallika(VIN) -- 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 #14 from VIN --- Created attachment 32720 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32720&action=edit Fix for adding debug log message for positive matches of tld-Tomcat8 This patch contains fix for Tomcat8: 1) Added debug log message when positive tld match was found 2) Added debug log messages for both positive and negative matches of tld at resource path scan(previously it has only for JAR scanning). Summary message is not added. 3) Added debug log messages for both positive and negative matches of tld at directory level scan like Web-Inf/classes. Summary message is not added. Please verify the fix and let me know. Thanks, Pravallika(VIN) -- 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: r1678155 - in /tomcat/trunk/java/org/apache/tomcat/util/net/jsse: JSSESocketFactory.java JSSESupport.java LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties Loca
Author: markt
Date: Thu May 7 10:27:23 2015
New Revision: 1678155
URL: http://svn.apache.org/r1678155
Log:
Move string resources to be alongside classes that use them (like the majority
of the Tomcat code base)
Added:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
- copied unchanged from r1677982,
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_es.properties
- copied unchanged from r1677982,
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
- copied unchanged from r1677982,
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
- copied unchanged from r1677982,
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties
Removed:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/res/
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
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=1678155&r1=1678154&r2=1678155&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 May 7 10:27:23 2015
@@ -75,8 +75,7 @@ import org.apache.tomcat.util.res.String
public class JSSESocketFactory implements SSLUtil {
private static final Log log = LogFactory.getLog(JSSESocketFactory.class);
-private static final StringManager sm =
-StringManager.getManager("org.apache.tomcat.util.net.jsse.res");
+private static final StringManager sm =
StringManager.getManager(JSSESocketFactory.class);
private final SSLHostConfig sslHostConfig;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java?rev=1678155&r1=1678154&r2=1678155&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java Thu May
7 10:27:23 2015
@@ -50,8 +50,7 @@ public class JSSESupport implements SSLS
private static final Log log = LogFactory.getLog(JSSESupport.class);
-private static final StringManager sm =
-StringManager.getManager("org.apache.tomcat.util.net.jsse.res");
+private static final StringManager sm =
StringManager.getManager(JSSESupport.class);
private static final Map keySizeCache = new HashMap<>();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1678156 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AbstractJsseEndpoint.java LocalStrings.properties
Author: markt
Date: Thu May 7 10:32:51 2015
New Revision: 1678156
URL: http://svn.apache.org/r1678156
Log:
Fix an i18n TODO
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1678156&r1=1678155&r2=1678156&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Thu
May 7 10:32:51 2015
@@ -67,8 +67,8 @@ public abstract class AbstractJsseEndpoi
SSLHostConfig sslHostConfig = getSSLHostConfig(sniHostName);
SSLContextWrapper sslContextWrapper = (SSLContextWrapper)
sslHostConfig.getSslContext();
if (sslContextWrapper == null) {
-// TODO i18n
-throw new IllegalStateException();
+throw new IllegalStateException(
+sm.getString("endpoint.jsse.noSslContext", sniHostName));
}
SSLEngine engine = sslContextWrapper.getSSLContext().createSSLEngine();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1678156&r1=1678155&r2=1678156&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Thu
May 7 10:32:51 2015
@@ -73,6 +73,7 @@ endpoint.apr.pollError=Poller failed wit
endpoint.apr.pollMergeEvents=Merge poller event [{1}] for socket [{0}] to
create merged event [{2}]
endpoint.apr.pollUnknownEvent=A socket was returned from the poller with an
unrecognized event [{0}]
endpoint.apr.remoteport=APR socket [{0}] opened with remote port [{1}]
+endpoint.jsse.noSslContext=No SSLContext could be found for the host name [{0}]
endpoint.nio.selectorCloseFail=Failed to close selector when closing the poller
endpoint.nio2.exclusiveExecutor=The NIO2 connector requires an exclusive
executor to operate properly on shutdown
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1678162 - /tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
Author: kkolinko
Date: Thu May 7 10:41:32 2015
New Revision: 1678162
URL: http://svn.apache.org/r1678162
Log:
Correct typo in the name of a private field in LegacyCookieProcessor.
Getter method name is OK.
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=1678162&r1=1678161&r2=1678162&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
Thu May 7 10:41:32 2015
@@ -96,7 +96,7 @@ public final class LegacyCookieProcessor
@SuppressWarnings("deprecation") // Default to STRICT_SERVLET_COMPLIANCE
// when deprecated code is removed
-private boolean presserveCookieHeader =
CookieSupport.PRESERVE_COOKIE_HEADER;
+private boolean preserveCookieHeader =
CookieSupport.PRESERVE_COOKIE_HEADER;
@SuppressWarnings("deprecation") // Default to !STRICT_SERVLET_COMPLIANCE
// when deprecated code is removed
@@ -196,12 +196,12 @@ public final class LegacyCookieProcessor
public boolean getPreserveCookieHeader() {
-return presserveCookieHeader;
+return preserveCookieHeader;
}
-public void setPreserveCookieHeader(boolean presserveCookieHeader) {
-this.presserveCookieHeader = presserveCookieHeader;
+public void setPreserveCookieHeader(boolean preserveCookieHeader) {
+this.preserveCookieHeader = preserveCookieHeader;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1678163 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
Author: kkolinko Date: Thu May 7 10:51:35 2015 New Revision: 1678163 URL: http://svn.apache.org/r1678163 Log: Correct typo in the name of a private field in LegacyCookieProcessor. Getter method name is OK. Merged r1678162 from tomcat/trunk. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 7 10:51:35 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011 +/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-1
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/243 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] 1678163 Blamelist: kkolinko 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
svn commit: r1678165 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ webapps/docs/config/
Author: markt
Date: Thu May 7 11:07:50 2015
New Revision: 1678165
URL: http://svn.apache.org/r1678165
Log:
Move remaining OpenSSL TLS config attributes to SSLHostConfig
Modified:
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/AprEndpoint.java
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/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1678165&r1=1678164&r2=1678165&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
May 7 11:07:50 2015
@@ -524,6 +524,36 @@ public abstract class AbstractHttp11Prot
}
+public void setSSLCertificateChainFile(String certificateChainFile) {
+registerDefaultSSLHostConfig();
+defaultSSLHostConfig.setCertificateChainFile(certificateChainFile);
+}
+
+
+public void setSSLCACertificatePath(String caCertificatePath) {
+registerDefaultSSLHostConfig();
+defaultSSLHostConfig.setCaCertificatePath(caCertificatePath);
+}
+
+
+public void setSSLCACertificateFile(String caCertificateFile) {
+registerDefaultSSLHostConfig();
+defaultSSLHostConfig.setCaCertificateFile(caCertificateFile);
+}
+
+
+public void setSSLDisableCompression(boolean disableCompression) {
+registerDefaultSSLHostConfig();
+defaultSSLHostConfig.setDisableCompression(disableCompression);
+}
+
+
+public void setSSLDisableSessionTickets(boolean disableSessionTickets) {
+registerDefaultSSLHostConfig();
+defaultSSLHostConfig.setDisableSessionTickets(disableSessionTickets);
+}
+
+
// - Common
code
// Common configuration required for all new HTTP11 processors
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=1678165&r1=1678164&r2=1678165&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Thu May
7 11:07:50 2015
@@ -70,42 +70,6 @@ public class Http11AprProtocol extends A
public void setDeferAccept(boolean deferAccept) {
((AprEndpoint)getEndpoint()).setDeferAccept(deferAccept); }
-// SSL related properties
-
-/**
- * SSL certificate chain file.
- */
-public String getSSLCertificateChainFile() { return
((AprEndpoint)getEndpoint()).getSSLCertificateChainFile(); }
-public void setSSLCertificateChainFile(String SSLCertificateChainFile) {
((AprEndpoint)getEndpoint()).setSSLCertificateChainFile(SSLCertificateChainFile);
}
-
-
-/**
- * SSL CA certificate path.
- */
-public String getSSLCACertificatePath() { return
((AprEndpoint)getEndpoint()).getSSLCACertificatePath(); }
-public void setSSLCACertificatePath(String SSLCACertificatePath) {
((AprEndpoint)getEndpoint()).setSSLCACertificatePath(SSLCACertificatePath); }
-
-
-/**
- * SSL CA certificate file.
- */
-public String getSSLCACertificateFile() { return
((AprEndpoint)getEndpoint()).getSSLCACertificateFile(); }
-public void setSSLCACertificateFile(String SSLCACertificateFile) {
((AprEndpoint)getEndpoint()).setSSLCACertificateFile(SSLCACertificateFile); }
-
-
-/**
- * Disable SSL compression.
- */
-public boolean getSSLDisableCompression() { return
((AprEndpoint)getEndpoint()).getSSLDisableCompression(); }
-public void setSSLDisableCompression(boolean disable) {
((AprEndpoint)getEndpoint()).setSSLDisableCompression(disable); }
-
-/**
- * Disable TLS Session Tickets (RFC 4507).
- */
-public boolean getSSLDisableSessionTickets() { return
((AprEndpoint)getEndpoint()).getSSLDisableSessionTickets(); }
-public void setSSLDisableSessionTickets(boolean enable) {
((AprEndpoint)getEndpoint()).setSSLDisableSessionTickets(enable); }
-
-
// - JMX related
methods
@Override
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=1678165&r1=1678164&r2=1678165&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/n
svn commit: r1678169 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java SSLHostConfig.java jsse/JSSESocketFactory.java
Author: markt
Date: Thu May 7 11:24:05 2015
New Revision: 1678169
URL: http://svn.apache.org/r1678169
Log:
Retain the original configuration settings and use separate getters the
absolute value for all file/path attributes
Modified:
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/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1678169&r1=1678168&r2=1678169&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu May 7
11:24:05 2015
@@ -367,7 +367,7 @@ public class AprEndpoint extends Abstrac
if (isSSLEnabled()) {
for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
-if (sslHostConfig.getCertificateFile() == null) {
+if (sslHostConfig.getCertificateFileAbsolute() == null) {
// This is required
throw new
Exception(sm.getString("endpoint.apr.noSslCertFile"));
}
@@ -485,18 +485,19 @@ public class AprEndpoint extends Abstrac
// List the ciphers that the client is permitted to negotiate
SSLContext.setCipherSuite(ctx, sslHostConfig.getCiphers());
// Load Server key and certificate
-SSLContext.setCertificate(ctx,
sslHostConfig.getCertificateFile(),
-sslHostConfig.getCertificateKeyFile(),
+SSLContext.setCertificate(ctx,
sslHostConfig.getCertificateFileAbsolute(),
+sslHostConfig.getCertificateKeyFileAbsolute(),
sslHostConfig.getCertificateKeyPassword(),
SSL.SSL_AIDX_RSA);
// Set certificate chain file
SSLContext.setCertificateChainFile(
-ctx, sslHostConfig.getCertificateChainFile(), false);
+ctx, sslHostConfig.getCertificateChainFileAbsolute(),
false);
// Support Client Certificates
-SSLContext.setCACertificate(ctx,
sslHostConfig.getCaCertificateFile(),
-sslHostConfig.getCaCertificatePath());
+SSLContext.setCACertificate(ctx,
sslHostConfig.getCaCertificateFileAbsolute(),
+sslHostConfig.getCaCertificatePathAbsolute());
// Set revocation
-SSLContext.setCARevocation(ctx,
sslHostConfig.getCertificateRevocationListFile(),
-sslHostConfig.getCertificateRevocationListPath());
+SSLContext.setCARevocation(ctx,
+
sslHostConfig.getCertificateRevocationListFileAbsolute(),
+
sslHostConfig.getCertificateRevocationListPathAbsolute());
// Client certificate verification
switch (sslHostConfig.getCertificateVerification()) {
case NONE:
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=1678169&r1=1678168&r2=1678169&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Thu May 7
11:24:05 2015
@@ -52,6 +52,7 @@ public class SSLHostConfig {
// Common
private String certificateKeyPassword = null;
private String certificateRevocationListFile;
+private String certificateRevocationListFileAbsolute;
private CertificateVerification certificateVerification =
CertificateVerification.NONE;
private int certificateVerificationDepth = 10;
private String ciphers = "HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA";
@@ -61,6 +62,7 @@ public class SSLHostConfig {
private String certificateKeyAlias;
private String certificateKeystorePassword = "changeit";
private String certificateKeystoreFile =
System.getProperty("user.home")+"/.keystore";
+private String certificateKeystoreFileAbsolute =
adjustRelativePath(certificateKeystoreFile);
private String certificateKeystoreProvider =
System.getProperty("javax.net.ssl.keyStoreProvider");
private String certificateKeystoreType =
System.getProperty("javax.net.ssl.keyStoreType");
private String keyManagerAlgorithm =
KeyManagerFactory.getDefaultAlgorithm();
@@ -70,16 +72,23 @@ public class SSLHostConfig {
private String trustManagerClassName;
private String truststoreAlgorithm =
TrustManagerFactory.getDefaultAlgorithm();
private S
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1198 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] 1678155 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57896] New: Option to preserve original cookie header when unquoting cookie value
https://bz.apache.org/bugzilla/show_bug.cgi?id=57896
Bug ID: 57896
Summary: Option to preserve original cookie header when
unquoting cookie value
Product: Tomcat 6
Version: 6.0.43
Hardware: PC
Status: NEW
Severity: minor
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: knst.koli...@gmail.com
This issue was originally fixed by introducing a new configuration option in
Tomcat 8 in r1448679 (for 8.0.0), backported to Tomcat 7 in r1675821 (for
7.0.62). It has not been fixed in Tomcat 6 yet.
I am filing this into Bugzilla to better document the problem.
The problem is that method "unescapeDoubleQuotes" modifies bytes in the buffer
that it is processing
(The method is LegacyCookieProcessor.unescapeDoubleQuotes() in current Tomcat
8, ServerCookie.unescapeDoubleQuotes() in current Tomcat 7 and 6).
As such, the value of original "cookie" HTTP header is corrupted. It can be
noted by calling request.getHeader("cookie") or by logging the header value in
AccessLogValve.
Steps to reproduce with current Tomcat 6 (6.0.43), Firefox 37.0.2:
1. Configure an AccessLogValve to log incoming "cookie" and outgoing
"set-cookie" HTTP headers.
That is, uncomment AccessLogValve in Host element of server.xml and set the
following value for pattern attribute:
pattern="%h %l %u %t "%r" %s %b [Cookie received: %{cookie}i]
[Set-Cookie sent: %{set-cookie}o]"
2. Start Tomcat and open Servlets Examples -> Cookies page in examples web
application,
http://localhost:8080/examples/servlets/servlet/CookieExample
3. Fill the form to create a cookie and submit it:
Name: foo
Value: bar "baz"
4. Re-visit the Cookies example page, so that browser sends you the cookie that
was created.
5. Look into access log file.
The logs look like the following:
127.0.0.1 - - [07/May/2015:15:25:37 +0400] "GET
/examples/servlets/servlet/CookieExample HTTP/1.1" 200 637 [Cookie received: -]
[Set-Cookie sent: -]
127.0.0.1 - - [07/May/2015:15:28:24 +0400] "POST
/examples/servlets/servlet/CookieExample HTTP/1.1" 200 809 [Cookie received: -]
[Set-Cookie sent: foo="bar \"baz\""; Version=1]
127.0.0.1 - - [07/May/2015:15:28:42 +0400] "GET
/examples/servlets/servlet/CookieExample HTTP/1.1" 200 714 [Cookie received:
foo="bar "baz"\""] [Set-Cookie sent: -]
Actual value:
[Cookie received: foo="bar "baz"\""]
Expected value:
[Cookie received: foo="bar \"baz\""]
Notes:
==
1. This happens only with unquoting of '"' character. No other character are
unquoted by unescapeDoubleQuotes() method.
2. Current specification of cookies (RFC6265) defines that cookie values cannot
contain double quote and backslash characters. A well-behaving web application
should not create cookies whose values contain such characters.
cookie-value = *cookie-octet / ( DQUOTE *cookie-octet DQUOTE )
cookie-octet = %x21 / %x23-2B / %x2D-3A / %x3C-5B / %x5D-7E
; US-ASCII characters excluding CTLs,
; whitespace DQUOTE, comma, semicolon,
; and backslash
3. The fix introduced new system property,
org.apache.tomcat.util.http.ServerCookie.PRESERVE_COOKIE_HEADER
It defaults to 'false'. By default you have to opt-in for this fix by setting
that property to 'true'.
When running in "strict servlet compliance" mode, that setting defaults to
'true' and the fix is enabled.
The new Rfc6265CookieProcessor implementation of CookieProcessor that is
available as an opt-in feature in Tomcat 8 does not have this bug and is not
affected by that configuration option.
--
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: r1678174 - /tomcat/trunk/webapps/docs/config/systemprops.xml
Author: kkolinko Date: Thu May 7 12:16:33 2015 New Revision: 1678174 URL: http://svn.apache.org/r1678174 Log: For https://bz.apache.org/bugzilla/show_bug.cgi?id=57896 Document org.apache.tomcat.util.http.ServerCookie.PRESERVE_COOKIE_HEADER option that was introduced in r1448679 (in 8.0.0) Modified: tomcat/trunk/webapps/docs/config/systemprops.xml Modified: tomcat/trunk/webapps/docs/config/systemprops.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1678174&r1=1678173&r2=1678174&view=diff == --- tomcat/trunk/webapps/docs/config/systemprops.xml (original) +++ tomcat/trunk/webapps/docs/config/systemprops.xml Thu May 7 12:16:33 2015 @@ -290,6 +290,7 @@ org.apache.catalina.session.StandardSession.LAST_ACCESS_AT_START org.apache.tomcat.util.http.ServerCookie.ALWAYS_ADD_EXPIRES org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR + org.apache.tomcat.util.http.ServerCookie.PRESERVE_COOKIE_HEADER org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING The URIEncoding attribute of any HTTP connector or @@ -422,6 +423,19 @@ If org.apache.catalina.STRICT_SERVLET_COMPLIANCE is set to true, the default of this setting will be true, else the default value will be false. + + + + Deprecated. This will be removed in Tomcat 9. Specify the + preserveCookieHeader attribute on the + org.apache.tomcat.util.http.LegacyCookieProcessor + instead. + If this is true Tomcat will ensure that cookie + processing does not modify cookie header returned by + HttpServletRequest.getHeader(). + If org.apache.catalina.STRICT_SERVLET_COMPLIANCE is set to + true, the default of this setting will be true, + else the default value will be false. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "Cookies" by KonstantinKolinko
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "Cookies" page has been changed by KonstantinKolinko:
https://wiki.apache.org/tomcat/Cookies?action=diff&rev1=44&rev2=45
Comment:
Add link to BZ 57896
:: Invalid syntax will result in a user-data log entry and cookies being
dropped rather than throwing of an IAE. Application impact is that requests
with an invalid Cookie header will now be dispatched to the application.
"Dropping a cookie" means an invalid cookie will not appear in the list
returned by !HttpServletRequest#getCookies(). An application will still be able
to access the original Cookie header and may perform its own parsing.
P4 Ensure that the cookie header is always available for the application to
parse manually.::
- :: Stop modifying the header in-situ as part of the de-escaping process so
that an application can elect to perform its own parsing by calling
getHeader("Cookie"). Eliminate the need for the PRESERVE_COOKIE_HEADER property
that currently controls whether a copy of the header is made if modifications
are needed. Perform de-escaping during the copy needed to convert the
!MessageBytes to the String in Cookie#value, possibly during any conversation
process needed to handle UTF-8.
+ :: Stop modifying the header in-situ as part of the de-escaping process
([[https://issues.apache.org/bugzilla/show_bug.cgi?id=57896|Bug 57896]]) so
that an application can elect to perform its own parsing by calling
getHeader("Cookie"). Eliminate the need for the PRESERVE_COOKIE_HEADER property
that currently controls whether a copy of the header is made if modifications
are needed. Perform de-escaping during the copy needed to convert the
!MessageBytes to the String in Cookie#value, possibly during any conversation
process needed to handle UTF-8.
=== Impact of proposal on existing issues ===
||<:10%>'''Issue'''||Impact||
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1678178 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/systemprops.xml
Author: kkolinko Date: Thu May 7 12:32:46 2015 New Revision: 1678178 URL: http://svn.apache.org/r1678178 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57896 Document org.apache.tomcat.util.http.ServerCookie.PRESERVE_COOKIE_HEADER option that was introduced in r1448679 (in 8.0.0) Add this issue to changelog entry of Tomcat 8.0.0. Merged r1678174 from tomcat/trunk. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml tomcat/tc8.0.x/trunk/webapps/docs/config/systemprops.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 7 12:32:46 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162 +/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,164337
svn commit: r1678180 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/systemprops.xml
Author: kkolinko Date: Thu May 7 12:38:39 2015 New Revision: 1678180 URL: http://svn.apache.org/r1678180 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57896 Document org.apache.tomcat.util.http.ServerCookie.PRESERVE_COOKIE_HEADER option that was introduced in r1675821 Merged r1678178 from tomcat/tc8.0.x/trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 7 12:38:39 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553-1667555 ,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-
Re: svn commit: r1678169 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java SSLHostConfig.java jsse/JSSESocketFactory.java
2015-05-07 13:24 GMT+02:00 : > Author: markt > Date: Thu May 7 11:24:05 2015 > New Revision: 1678169 > > URL: http://svn.apache.org/r1678169 > Log: > Retain the original configuration settings and use separate getters the > absolute value for all file/path attributes > > Usually duplicating config is not a good idea, right ? For example if adjustRelativePath was static the calling code could use it dynamically when needed. Rémy
Re: Tomcat Grid write up
I wasn't aware of the mailing list server filter. Please find attached a text/plain version of the write up. -Vlad On Thu, 5/7/15, Konstantin Kolinko wrote: Subject: Re: Tomcat Grid write up To: "Tomcat Developers List" Date: Thursday, May 7, 2015, 5:49 AM 2015-05-07 6:42 GMT+03:00 Alarcón Vladimir : > I guess I got a little bit carried away when writing the architecture and description, but I guess it's better to be ambitious. We can decide later on what we actually want from this tool. > > Please find attached the write up. > Your attachment was removed by mailing list server. The users' list rules apply here as well, http://tomcat.apache.org/lists.html#tomcat-users -> 7. *.txt text/plain attachments may pass through the server, but zip/doc/image/binary are certainly dropped. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.orgApache Tomcat Grid == This write up is a draft that includes a set of ideas that could be useful when managing multiple Tomcat instances. Even if some of these ideas go beyond the effort we want to undertake, I decided to include them so they can be discussed and maybe included on the road map. This description is by no means comprehensive and/or finished but provides a base line to start bouncing ideas. Please feel free to update, fix, change, and reorganize this document in any manner you feel is useful. Introduction The Tomcat Grid manages one or more Tomcat instances from a centralized location. This manager application shows the status of each Tomcat instance, and provides a simple interface to trigger operations on them, individually or as a group. Architectural Overview -- The centralized location of the Tomcat Grid (the primary location) stores the grid configuration, probably as an XML file. For reliability purposes, secondary locations can be setup so the grid configuration is replicated after every change. The primary location runs a Tomcat Grid Manager, a web application that runs on a separate Tomcat instance. This manager application shows the state of the all Tomcat instances on the grid, and allows users to trigger operations on these Tomcat instances. In addition to the Web Grid Manager, a Command-line (CLI) Grid Manager application mimics the functionality of the web manager, with an equivalent (text-only) interface that shows the status of the Tomcat instances, and provides commands to trigger remote operations on them. The secondary locations run on dedicated Tomcat instances. They run a copy of the Grid Manager but they are shut down all the time unless they are explicitly started by an operator (when the primary one goes bad). No two managers should be active at the same time. If activated, the secondary locations can start producing changes to the local grid configuration, and these changes are replicated to all other managers (if/when possible). The example shown in the figure below assumes Machines #1 and #4 run a lighter web and/or back end applications, so they have enough resources bandwidth to run the extra Tomcat instance for the manager. In case the primary manager on Machine #1 goes down (or the whole Machine #1 goes down), there is a secondary manager (on Machine #4) that can be activated to take over the managing duties. ..Machine #2. : : : [Tomcat #2] : : ^ : : | [Tomcat #6] : : |^ : : || [Tomcat #9] : : ||^ : : ||| : +-->[Grid Agent #2] : | : : | . | | ..Machine #1. | ..Machine #3. : : | : : : [Primary Web Manager]-->| : [Tomcat #3] : : : | : ^ : : [Tomcat #1] : | : | [Tomcat #7] : :^ : | : |^ : :| [Tomcat #5] : | : || [Tomcat #10
svn commit: r1678183 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu May 7 12:50:40 2015 New Revision: 1678183 URL: http://svn.apache.org/r1678183 Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1678183&r1=1678182&r2=1678183&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 7 12:50:40 2015 @@ -69,6 +69,22 @@ PATCHES PROPOSED TO BACKPORT: +1: rjung, kkolinko, markt -1: +* Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57896 + Backport org.apache.tomcat.util.http.ServerCookie.PRESERVE_COOKIE_HEADER option + + Like in Tomcat 7, the fix is to be applied to the call to + Cookies.processCookieHeader(byte[], int, int) + + In Tomcat 6 there is also a call to Cookies.processCookieHeader(String) when + header value is already a String, but that call does not need this fix, as + String is immutable, and that method does not perform decoding of embedded '\"'. + It only strips surrounding '"'s in a value. + + http://svn.apache.org/r1675821 (fix) + http://svn.apache.org/r1678180 (documentation) + +1: kkolinko + -1: + PATCHES/ISSUES THAT ARE STALLED: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "Cookies" by KonstantinKolinko
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "Cookies" page has been changed by KonstantinKolinko:
https://wiki.apache.org/tomcat/Cookies?action=diff&rev1=45&rev2=46
Comment:
s/ issues.apache.org / bz.apache.org /
:: Invalid syntax will result in a user-data log entry and cookies being
dropped rather than throwing of an IAE. Application impact is that requests
with an invalid Cookie header will now be dispatched to the application.
"Dropping a cookie" means an invalid cookie will not appear in the list
returned by !HttpServletRequest#getCookies(). An application will still be able
to access the original Cookie header and may perform its own parsing.
P4 Ensure that the cookie header is always available for the application to
parse manually.::
- :: Stop modifying the header in-situ as part of the de-escaping process
([[https://issues.apache.org/bugzilla/show_bug.cgi?id=57896|Bug 57896]]) so
that an application can elect to perform its own parsing by calling
getHeader("Cookie"). Eliminate the need for the PRESERVE_COOKIE_HEADER property
that currently controls whether a copy of the header is made if modifications
are needed. Perform de-escaping during the copy needed to convert the
!MessageBytes to the String in Cookie#value, possibly during any conversation
process needed to handle UTF-8.
+ :: Stop modifying the header in-situ as part of the de-escaping process
([[https://bz.apache.org/bugzilla/show_bug.cgi?id=57896|Bug 57896]]) so that an
application can elect to perform its own parsing by calling
getHeader("Cookie"). Eliminate the need for the PRESERVE_COOKIE_HEADER property
that currently controls whether a copy of the header is made if modifications
are needed. Perform de-escaping during the copy needed to convert the
!MessageBytes to the String in Cookie#value, possibly during any conversation
process needed to handle UTF-8.
=== Impact of proposal on existing issues ===
||<:10%>'''Issue'''||Impact||
- ||[[https://issues.apache.org/bugzilla/show_bug.cgi?id=55917|Bug
55917]]||Parsing will no longer cause an IAE. 8-bit values will be interpreted
as a UTF-8 value and the cookie would be dropped if they are not a valid
encoding.||
+ ||[[https://bz.apache.org/bugzilla/show_bug.cgi?id=55917|Bug 55917]]||Parsing
will no longer cause an IAE. 8-bit values will be interpreted as a UTF-8 value
and the cookie would be dropped if they are not a valid encoding.||
- ||[[https://issues.apache.org/bugzilla/show_bug.cgi?id=55918|Bug 55918]]||The
cookie would be dropped rather than accepted.||
+ ||[[https://bz.apache.org/bugzilla/show_bug.cgi?id=55918|Bug 55918]]||The
cookie would be dropped rather than accepted.||
- ||[[https://issues.apache.org/bugzilla/show_bug.cgi?id=55920|Bug
55920]]||Valid values would be round tripped including quotes supplied by the
application. Attempts to set invalid values would result in a IAE from
addCookie. Invalid values sent by the browser would result in the cookie being
ignored.||
+ ||[[https://bz.apache.org/bugzilla/show_bug.cgi?id=55920|Bug 55920]]||Valid
values would be round tripped including quotes supplied by the application.
Attempts to set invalid values would result in a IAE from addCookie. Invalid
values sent by the browser would result in the cookie being ignored.||
- ||[[https://issues.apache.org/bugzilla/show_bug.cgi?id=55921|Bug
55921]]||Attempts to set a cookie containing raw JSON would results in an IAE
due to the DQUOTE characters. A cookie sent from the browser containing JSON
would be accepted although any semicolons in the data would result in early
termination (note, browsers other than Safari do not allow semicolons in values
anyway).||
+ ||[[https://bz.apache.org/bugzilla/show_bug.cgi?id=55921|Bug
55921]]||Attempts to set a cookie containing raw JSON would results in an IAE
due to the DQUOTE characters. A cookie sent from the browser containing JSON
would be accepted although any semicolons in the data would result in early
termination (note, browsers other than Safari do not allow semicolons in values
anyway).||
== Parsing the Cookie header by Tomcat ==
The various specifications define the following formats for the Cookie header
sent by the user-agent:
@@ -153, +153 @@
showing codepoint U+00E1 being converted to its UTF-8 equivalent 0xC3 0xA1.
This matches the behaviour defined by
[[http://www.w3.org/html/wg/drafts/html/master/single-page.html#cookie|HTML5.]]
||'''Issue'''||'''Current behaviour (8.0.0-RC10/7.0.50)'''||'''Proposed new
behaviour'''||'''Servlet + Netscape + RFC2109'''||'''Servlet + RFC 6265'''||
- ||0x80 to 0xFF in cookie value
([[https://issues.apache.org/bugzilla/show_bug.cgi?id=55917|Bug
55917]])||IAE||TBD||Netscape yes. RFC2109 requires quotes.||RFC 6265 never
allowed.||
+ ||0x80 to 0xFF in cookie value
([[https://bz.apache.org/bugzilla/show_bug.cgi?id=55917|Bug
55917]])||IAE||TBD||Netscap
svn propchange: r1675821 - svn:log
Author: kkolinko
Revision: 1675821
Modified property: svn:log
Modified: svn:log at Thu May 7 13:07:35 2015
--
--- svn:log (original)
+++ svn:log Thu May 7 13:07:35 2015
@@ -1,3 +1,4 @@
+Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57896
Provide option to preserve "cookie" request header values when parsing cookies.
This is backport of r1448679 from tomcat/trunk:
@@ -9,4 +10,4 @@ It can be tested by using "%{cookie}i" p
Notes:
- In Tomcat 8 this option is deprecated, as it was moved to
LegacyCookieProcessor in r1628730 and can now be configured per-context. It is
always "true" in new Rfc6265CookieProcessor.
- The default value depends on STRICT_SERVLET_COMPLIANCE.
-- Documentation is TODO
+- Documentation is TODO - fixed later by r1678180
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1678169 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java SSLHostConfig.java jsse/JSSESocketFactory.java
On 07/05/2015 13:47, Rémy Maucherat wrote: > 2015-05-07 13:24 GMT+02:00 : > >> Author: markt >> Date: Thu May 7 11:24:05 2015 >> New Revision: 1678169 >> >> URL: http://svn.apache.org/r1678169 >> Log: >> Retain the original configuration settings and use separate getters the >> absolute value for all file/path attributes >> > Usually duplicating config is not a good idea, right ? For example if > adjustRelativePath was static the calling code could use it dynamically > when needed. I was trying to avoid the callers having to worry about absolute vs. relative. If it wasn't for storeconfig (which will use the getters to save the config) I wouldn't have worried that the values changed between setters and getters. I think your static method idea is better than what I have at the moment. I'll try it out. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1448679 - svn:log
Author: kkolinko Revision: 1448679 Modified property: svn:log Modified: svn:log at Thu May 7 13:10:21 2015 -- --- svn:log (original) +++ svn:log Thu May 7 13:10:21 2015 @@ -1,3 +1,5 @@ String unescaping modifies the buffer used for the cookie, and will corrupt the original cookie header [visible when displaying them using getHeader]. Experiment with an option to preserve them. I don't think this should be the default, as it is almost never useful, and can be a bit wasteful. + +This is a fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=57896 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57896] Option to preserve original cookie header when unquoting cookie value
https://bz.apache.org/bugzilla/show_bug.cgi?id=57896 Konstantin Kolinko changed: What|Removed |Added OS||All --- Comment #1 from Konstantin Kolinko --- Documentation updated in Tomcat 9/8/7 (r1678174 / r1678178 / r1678180) and will be in 7.0.62, 8.0.23. Backport proposed for Tomcat 6. -- 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: r1678189 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java SSLHostConfig.java jsse/JSSESocketFactory.java
Author: markt
Date: Thu May 7 13:14:19 2015
New Revision: 1678189
URL: http://svn.apache.org/r1678189
Log:
Refactor as per Remy's suggestion
Modified:
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/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1678189&r1=1678188&r2=1678189&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu May 7
13:14:19 2015
@@ -367,7 +367,7 @@ public class AprEndpoint extends Abstrac
if (isSSLEnabled()) {
for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
-if (sslHostConfig.getCertificateFileAbsolute() == null) {
+if
(SSLHostConfig.adjustRelativePath(sslHostConfig.getCertificateFile()) == null) {
// This is required
throw new
Exception(sm.getString("endpoint.apr.noSslCertFile"));
}
@@ -485,19 +485,24 @@ public class AprEndpoint extends Abstrac
// List the ciphers that the client is permitted to negotiate
SSLContext.setCipherSuite(ctx, sslHostConfig.getCiphers());
// Load Server key and certificate
-SSLContext.setCertificate(ctx,
sslHostConfig.getCertificateFileAbsolute(),
-sslHostConfig.getCertificateKeyFileAbsolute(),
+SSLContext.setCertificate(ctx,
+
SSLHostConfig.adjustRelativePath(sslHostConfig.getCertificateFile()),
+
SSLHostConfig.adjustRelativePath(sslHostConfig.getCertificateKeyFile()),
sslHostConfig.getCertificateKeyPassword(),
SSL.SSL_AIDX_RSA);
// Set certificate chain file
-SSLContext.setCertificateChainFile(
-ctx, sslHostConfig.getCertificateChainFileAbsolute(),
false);
+SSLContext.setCertificateChainFile(ctx,
+
SSLHostConfig.adjustRelativePath(sslHostConfig.getCertificateChainFile()),
+false);
// Support Client Certificates
-SSLContext.setCACertificate(ctx,
sslHostConfig.getCaCertificateFileAbsolute(),
-sslHostConfig.getCaCertificatePathAbsolute());
+SSLContext.setCACertificate(ctx,
+
SSLHostConfig.adjustRelativePath(sslHostConfig.getCaCertificateFile()),
+
SSLHostConfig.adjustRelativePath(sslHostConfig.getCaCertificatePath()));
// Set revocation
SSLContext.setCARevocation(ctx,
-
sslHostConfig.getCertificateRevocationListFileAbsolute(),
-
sslHostConfig.getCertificateRevocationListPathAbsolute());
+SSLHostConfig.adjustRelativePath(
+
sslHostConfig.getCertificateRevocationListFile()),
+SSLHostConfig.adjustRelativePath(
+
sslHostConfig.getCertificateRevocationListPath()));
// Client certificate verification
switch (sslHostConfig.getCertificateVerification()) {
case NONE:
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=1678189&r1=1678188&r2=1678189&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Thu May 7
13:14:19 2015
@@ -52,7 +52,6 @@ public class SSLHostConfig {
// Common
private String certificateKeyPassword = null;
private String certificateRevocationListFile;
-private String certificateRevocationListFileAbsolute;
private CertificateVerification certificateVerification =
CertificateVerification.NONE;
private int certificateVerificationDepth = 10;
private String ciphers = "HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!kRSA";
@@ -62,7 +61,6 @@ public class SSLHostConfig {
private String certificateKeyAlias;
private String certificateKeystorePassword = "changeit";
private String certificateKeystoreFile =
System.getProperty("user.home")+"/.keystore";
-private String certificateKeystoreFileAbsolute =
adjustRelativePath(certificateKeystoreFile);
private String certificateKeystoreProvider =
System.getProperty("javax.net.ssl.keyStoreProvider");
pri
Re: svn commit: r1678169 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java SSLHostConfig.java jsse/JSSESocketFactory.java
2015-05-07 15:09 GMT+02:00 Mark Thomas : > On 07/05/2015 13:47, Rémy Maucherat wrote: > > 2015-05-07 13:24 GMT+02:00 : > > > >> Author: markt > >> Date: Thu May 7 11:24:05 2015 > >> New Revision: 1678169 > >> > >> URL: http://svn.apache.org/r1678169 > >> Log: > >> Retain the original configuration settings and use separate getters the > >> absolute value for all file/path attributes > >> > > Usually duplicating config is not a good idea, right ? For example if > > adjustRelativePath was static the calling code could use it dynamically > > when needed. > > I was trying to avoid the callers having to worry about absolute vs. > relative. If it wasn't for storeconfig (which will use the getters to > save the config) I wouldn't have worried that the values changed between > setters and getters. > I wrote down I needed to add SSHostConfig support to storeconfig already, although I'm waiting until it is stable. The extra fields can be ignored by storeconfig, so it's not a real problem [it then needs to happen for JMX as well], but in the end I don't think there's much difference between getPathAbsolute and toAbsolute(getPath). > > I think your static method idea is better than what I have at the > moment. I'll try it out. > > Ok, thanks. Rémy
svn commit: r1678190 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Thu May 7 13:15:40 2015 New Revision: 1678190 URL: http://svn.apache.org/r1678190 Log: Changelog for documentation update in r1678178 Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1678190&r1=1678189&r2=1678190&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu May 7 13:15:40 2015 @@ -87,6 +87,11 @@ to reflect the more relaxed approach to SRV.10.7.2 in Tomcat 8 onwards. (markt) + +57896: Document system property + org.apache.tomcat.util.http.ServerCookie.PRESERVE_COOKIE_HEADER +that was introduced in Tomcat 8.0.0. (kkolinko) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1678192 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Author: markt
Date: Thu May 7 13:22:30 2015
New Revision: 1678192
URL: http://svn.apache.org/r1678192
Log:
Missed trustManagerClassName
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
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=1678192&r1=1678191&r2=1678192&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
May 7 13:22:30 2015
@@ -476,6 +476,7 @@ public abstract class AbstractHttp11Prot
defaultSSLHostConfig.setCertificateKeyAlias(certificateKeyAlias);
}
+
public void setTruststoreAlgorithm(String truststoreAlgorithm){
registerDefaultSSLHostConfig();
defaultSSLHostConfig.setTruststoreAlgorithm(truststoreAlgorithm);
@@ -554,6 +555,12 @@ public abstract class AbstractHttp11Prot
}
+public void setTrustManagerClassName(String trustManagerClassName) {
+registerDefaultSSLHostConfig();
+defaultSSLHostConfig.setTrustManagerClassName(trustManagerClassName);
+}
+
+
// - Common
code
// Common configuration required for all new HTTP11 processors
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1678196 - /tomcat/trunk/webapps/docs/config/http.xml
Author: markt Date: Thu May 7 13:33:28 2015 New Revision: 1678196 URL: http://svn.apache.org/r1678196 Log: Back-pedal slightly. The odd SSL config attribute will still be required on the connector. 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=1678196&r1=1678195&r2=1678196&view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Thu May 7 13:33:28 2015 @@ -1011,7 +1011,7 @@ match the sslDefaultHost attribute of the Connector. - As of Tomcat 9, the SSL configuration attributes in the + As of Tomcat 9, the majority of the SSL configuration attributes in the Connector are deprecated. If specified, they will be used to configure a SSLHostConfig for the sslDefaultHost. Note that if an explicit @@ -1323,9 +1323,29 @@ + + + The following NIO and NIO2 SSL configuration attributes are not specific to + a virtual host and, therefore, must be configured on the connector. + + + + + The class name of the SSL implementation to use. If not specified, the + default of org.apache.tomcat.util.net.jsse.JSSEImplementation + will be used which wraps JVM's default JSSE provider. Note that the + JVM can be configured to use a different JSSE provider as the default. + + + + + + - The NIO and NIO2 connectors use the following attributes to configure SSL: + The following NIO and NIO2 SSL configuration attributes have been + depreacted in favour of the default + SSLHostConfig element. @@ -1407,13 +1427,6 @@ element. - - The class name of the SSL implementation to use. If not specified, the - default of org.apache.tomcat.util.net.jsse.JSSEImplementation - will be used which wraps JVM's default JSSE provider. Note that the - JVM can be configured to use a different JSSE provider as the default. - - This is an alias for the sslProtocol attribute of the default SSLHostConfig - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1678207 - in /tomcat/trunk/java/org/apache: coyote/http11/AbstractHttp11Protocol.java tomcat/util/net/AbstractEndpoint.java tomcat/util/net/AprEndpoint.java tomcat/util/net/SSLHostConfig.
Author: markt
Date: Thu May 7 13:53:48 2015
New Revision: 1678207
URL: http://svn.apache.org/r1678207
Log:
Ensure everything still works if a non-default name is used for the default SSL
virtual host
Modified:
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/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
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=1678207&r1=1678206&r2=1678207&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
May 7 13:53:48 2015
@@ -329,14 +329,16 @@ public abstract class AbstractHttp11Prot
// --- HTTPS specific
properties
-// Handled via an
SSLHostConfig
+// -- passed through to the
EndPoint
-private String defaultSSLHostConfigName =
SSLHostConfig.DEFAULT_SSL_HOST_NAME;
public String getDefaultSSLHostConfigName() {
-return defaultSSLHostConfigName;
+return getEndpoint().getDefaultSSLHostConfigName();
}
public void setDefaultSSLHostConfigName(String defaultSSLHostConfigName) {
-this.defaultSSLHostConfigName = defaultSSLHostConfigName;
+getEndpoint().setDefaultSSLHostConfigName(defaultSSLHostConfigName);
+if (defaultSSLHostConfig != null) {
+defaultSSLHostConfig.setHostName(defaultSSLHostConfigName);
+}
}
@@ -346,6 +348,9 @@ public abstract class AbstractHttp11Prot
}
+// --- HTTPS specific
properties
+// Handled via an
SSLHostConfig
+
private SSLHostConfig defaultSSLHostConfig = null;
private void registerDefaultSSLHostConfig() {
if (defaultSSLHostConfig == null) {
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=1678207&r1=1678206&r2=1678207&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu May
7 13:53:48 2015
@@ -213,6 +213,15 @@ public abstract class AbstractEndpoint sslHostConfigs = new
ConcurrentHashMap<>();
public void addSslHostConfig(SSLHostConfig sslHostConfig) {
String key = sslHostConfig.getHostName();
@@ -245,7 +254,7 @@ public abstract class AbstractEndpointhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1678207&r1=1678206&r2=1678207&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu May 7
13:53:48 2015
@@ -535,7 +535,7 @@ public class AprEndpoint extends Abstrac
}
sslHostConfig.setSslContext(Long.valueOf(ctx));
}
-SSLHostConfig defaultSSLHostConfig =
sslHostConfigs.get(SSLHostConfig.DEFAULT_SSL_HOST_NAME);
+SSLHostConfig defaultSSLHostConfig =
sslHostConfigs.get(getDefaultSSLHostConfigName());
Long defaultSSLContext = (Long)
defaultSSLHostConfig.getSslContext();
sslContext = defaultSSLContext.longValue();
SSLContext.registerDefault(defaultSSLContext, this);
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=1678207&r1=1678206&r2=1678207&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Thu May 7
13:53:48 2015
@@ -38,7 +38,7 @@ public class SSLHostConfig {
private static final Log log = LogFactory.getLog(SSLHostConfig.class);
private static final StringManager sm =
StringManager.getManager(SSLHostConfig.class);
-public static final String DEFAULT_SSL_HOST_NAME = "_default_";
+protected static final String DEFAULT_SSL_HOST_NAME = "_default_";
private Type configType = null;
private Map> configuredProperties = new HashMap<>();
--
svn commit: r1678210 - /tomcat/trunk/java/org/apache/tomcat/util/net/SSLContext.java
Author: remm
Date: Thu May 7 13:54:58 2015
New Revision: 1678210
URL: http://svn.apache.org/r1678210
Log:
This was at some point an abstract class, so cleanup.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLContext.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLContext.java?rev=1678210&r1=1678209&r2=1678210&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLContext.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLContext.java Thu May 7
13:54:58 2015
@@ -34,15 +34,15 @@ import javax.net.ssl.TrustManager;
*/
public interface SSLContext {
-public abstract void init(KeyManager[] kms, TrustManager[] tms,
+public void init(KeyManager[] kms, TrustManager[] tms,
SecureRandom sr) throws KeyManagementException;
-public abstract SSLSessionContext getServerSessionContext();
+public SSLSessionContext getServerSessionContext();
-public abstract SSLEngine createSSLEngine();
+public SSLEngine createSSLEngine();
-public abstract SSLServerSocketFactory getServerSocketFactory();
+public SSLServerSocketFactory getServerSocketFactory();
-public abstract SSLParameters getSupportedSSLParameters();
+public SSLParameters getSupportedSSLParameters();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1678214 - in /tomcat/trunk/java/org/apache: coyote/http11/AbstractHttp11JsseProtocol.java tomcat/util/net/AbstractEndpoint.java tomcat/util/net/AbstractJsseEndpoint.java
Author: markt
Date: Thu May 7 14:04:56 2015
New Revision: 1678214
URL: http://svn.apache.org/r1678214
Log:
Move the JSSE specific config to the AbstractJsseEndpoint
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.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=1678214&r1=1678213&r2=1678214&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
Thu May 7 14:04:56 2015
@@ -16,15 +16,23 @@
*/
package org.apache.coyote.http11;
-import org.apache.tomcat.util.net.AbstractEndpoint;
+import org.apache.tomcat.util.net.AbstractJsseEndpoint;
public abstract class AbstractHttp11JsseProtocol
extends AbstractHttp11Protocol {
-public AbstractHttp11JsseProtocol(AbstractEndpoint endpoint) {
+public AbstractHttp11JsseProtocol(AbstractJsseEndpoint endpoint) {
super(endpoint);
}
+
+@Override
+protected AbstractJsseEndpoint getEndpoint() {
+// Over-ridden to add cast
+return (AbstractJsseEndpoint) super.getEndpoint();
+}
+
+
public String getSslImplementationName() { return
getEndpoint().getSslImplementationName(); }
public void setSslImplementationName(String s) {
getEndpoint().setSslImplementationName(s); }
}
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=1678214&r1=1678213&r2=1678214&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu May
7 14:04:56 2015
@@ -964,14 +964,6 @@ public abstract class AbstractEndpoint> waitingRequests = Collections
.newSetFromMap(new ConcurrentHashMap,
Boolean>());
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1678214&r1=1678213&r2=1678214&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Thu
May 7 14:04:56 2015
@@ -29,8 +29,21 @@ import org.apache.tomcat.util.net.jsse.N
public abstract class AbstractJsseEndpoint extends AbstractEndpoint {
+private String sslImplementationName = null;
+
private SSLImplementation sslImplementation = null;
+
+public String getSslImplementationName() {
+return sslImplementationName;
+}
+
+
+public void setSslImplementationName(String s) {
+this.sslImplementationName = s;
+}
+
+
public SSLImplementation getSslImplementation() {
return sslImplementation;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1678210 - /tomcat/trunk/java/org/apache/tomcat/util/net/SSLContext.java
You can remove 'public' too.
On Thu, May 7, 2015 at 4:54 PM, wrote:
> Author: remm
> Date: Thu May 7 13:54:58 2015
> New Revision: 1678210
>
> URL: http://svn.apache.org/r1678210
> Log:
> This was at some point an abstract class, so cleanup.
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/net/SSLContext.java
>
> Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLContext.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLContext.java?rev=1678210&r1=1678209&r2=1678210&view=diff
>
> ==
> --- tomcat/trunk/java/org/apache/tomcat/util/net/SSLContext.java (original)
> +++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLContext.java Thu May
> 7 13:54:58 2015
> @@ -34,15 +34,15 @@ import javax.net.ssl.TrustManager;
> */
> public interface SSLContext {
>
> -public abstract void init(KeyManager[] kms, TrustManager[] tms,
> +public void init(KeyManager[] kms, TrustManager[] tms,
> SecureRandom sr) throws KeyManagementException;
>
> -public abstract SSLSessionContext getServerSessionContext();
> +public SSLSessionContext getServerSessionContext();
>
> -public abstract SSLEngine createSSLEngine();
> +public SSLEngine createSSLEngine();
>
> -public abstract SSLServerSocketFactory getServerSocketFactory();
> +public SSLServerSocketFactory getServerSocketFactory();
>
> -public abstract SSLParameters getSupportedSSLParameters();
> +public SSLParameters getSupportedSSLParameters();
>
> }
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
Re: svn commit: r1678210 - /tomcat/trunk/java/org/apache/tomcat/util/net/SSLContext.java
2015-05-07 16:14 GMT+02:00 Martin Grigorov : > You can remove 'public' too. > > Yes, it's useless but I usually leave that in [unlike "abstract"]. I'm not alone since all the interfaces of the package do the same thing. Rémy
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1200 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] 1678174 Blamelist: kkolinko,markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1678218 - in /tomcat/trunk: java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/ webapps/docs/config/
Author: markt
Date: Thu May 7 14:31:16 2015
New Revision: 1678218
URL: http://svn.apache.org/r1678218
Log:
Add a configurable limit to the size of client hello that Tomcat parses looking
for SNI data.
Fallback to the default if the limit is not enough
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.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=1678218&r1=1678217&r2=1678218&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
Thu May 7 14:31:16 2015
@@ -35,4 +35,10 @@ public abstract class AbstractHttp11Jsse
public String getSslImplementationName() { return
getEndpoint().getSslImplementationName(); }
public void setSslImplementationName(String s) {
getEndpoint().setSslImplementationName(s); }
+
+
+public int getSniParseLimit() { return getEndpoint().getSniParseLimit(); }
+public void setSniParseLimit(int sniParseLimit) {
+getEndpoint().setSniParseLimit(sniParseLimit);
+}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1678218&r1=1678217&r2=1678218&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Thu
May 7 14:31:16 2015
@@ -30,6 +30,7 @@ import org.apache.tomcat.util.net.jsse.N
public abstract class AbstractJsseEndpoint extends AbstractEndpoint {
private String sslImplementationName = null;
+private int sniParseLimit = 64 * 1024;
private SSLImplementation sslImplementation = null;
@@ -49,6 +50,16 @@ public abstract class AbstractJsseEndpoi
}
+public int getSniParseLimit() {
+return sniParseLimit;
+}
+
+
+public void setSniParseLimit(int sniParseLimit) {
+this.sniParseLimit = sniParseLimit;
+}
+
+
@Override
protected Type getSslConfigType() {
return SSLHostConfig.Type.JSSE;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1678218&r1=1678217&r2=1678218&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Thu
May 7 14:31:16 2015
@@ -99,6 +99,7 @@ channel.nio.ssl.closing=Channel is in cl
channel.nio.ssl.invalidBuffer=You can only read using the application read
buffer provided by the handler.
channel.nio.ssl.expandNetInBuffer=Expanding network input buffer to [{0}] bytes
channel.nio.ssl.expandNetOutBuffer=Expanding network output buffer to [{0}]
bytes
+channel.nio.ssl.sniDefault=Unable to buffer enough data to determine requested
SNI host name. Using default
channel.nio.ssl.sniHostName=The SNI host name extracted for this connection
was [{0}]
sniExtractor.clientHelloTooBig=The ClientHello was not presented in a single
TLS record so no SNI information could be extracted
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1678218&r1=1678217&r2=1678218&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Thu May
7 14:31:16 2015
@@ -299,13 +299,15 @@ public class SecureNio2Channel extends N
SNIExtractor extractor = new SNIExtractor(netInBuffer);
-while (extractor.getResult() == SNIResult.UNDERFLOW) {
+while (extractor.getResult() == SNIResult.UNDERFLOW &&
+netInBuffer.capacity() < endpoint.getSniParseLimit()) {
// extractor needed more data to process but netInBuffer was full
so
-// double the size of the buffer and read some more data.
+// expand the buffer and read some more data.
+
Re: [VOTE] Release Apache Tomcat 8.0.22
2015-05-03 12:32 GMT+02:00 Felix Schumacher < felix.schumac...@internetallee.de>: > The rest of the patch will not influence the jmeter test. > > Ping to get feedback on the fix, if possible. Rémy
Re: svn commit: r1678169 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java SSLHostConfig.java jsse/JSSESocketFactory.java
On 07/05/2015 14:14, Rémy Maucherat wrote: > 2015-05-07 15:09 GMT+02:00 Mark Thomas : > >> On 07/05/2015 13:47, Rémy Maucherat wrote: >>> 2015-05-07 13:24 GMT+02:00 : >>> Author: markt Date: Thu May 7 11:24:05 2015 New Revision: 1678169 URL: http://svn.apache.org/r1678169 Log: Retain the original configuration settings and use separate getters the absolute value for all file/path attributes >>> Usually duplicating config is not a good idea, right ? For example if >>> adjustRelativePath was static the calling code could use it dynamically >>> when needed. >> >> I was trying to avoid the callers having to worry about absolute vs. >> relative. If it wasn't for storeconfig (which will use the getters to >> save the config) I wouldn't have worried that the values changed between >> setters and getters. >> > > I wrote down I needed to add SSHostConfig support to storeconfig already, > although I'm waiting until it is stable. The extra fields can be ignored by > storeconfig, so it's not a real problem [it then needs to happen for JMX as > well], but in the end I don't think there's much difference between > getPathAbsolute and toAbsolute(getPath). I think I am done with the config changes although I'd give it a while to see what bugs get reported. I need to add SSLHostConfig to JMX. That is next on my list. I'm wondering about a 9.0.0 M1 (milestone 1) release to give folks a chance to play with the SNI support. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1678169 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java SSLHostConfig.java jsse/JSSESocketFactory.java
2015-05-07 17:34 GMT+03:00 Mark Thomas : > On 07/05/2015 14:14, Rémy Maucherat wrote: >> 2015-05-07 15:09 GMT+02:00 Mark Thomas : >> >>> On 07/05/2015 13:47, Rémy Maucherat wrote: 2015-05-07 13:24 GMT+02:00 : > Author: markt > Date: Thu May 7 11:24:05 2015 > New Revision: 1678169 > > URL: http://svn.apache.org/r1678169 > Log: > Retain the original configuration settings and use separate getters the > absolute value for all file/path attributes > Usually duplicating config is not a good idea, right ? For example if adjustRelativePath was static the calling code could use it dynamically when needed. >>> >>> I was trying to avoid the callers having to worry about absolute vs. >>> relative. If it wasn't for storeconfig (which will use the getters to >>> save the config) I wouldn't have worried that the values changed between >>> setters and getters. >>> >> >> I wrote down I needed to add SSHostConfig support to storeconfig already, >> although I'm waiting until it is stable. The extra fields can be ignored by >> storeconfig, so it's not a real problem [it then needs to happen for JMX as >> well], but in the end I don't think there's much difference between >> getPathAbsolute and toAbsolute(getPath). > > I think I am done with the config changes although I'd give it a while > to see what bugs get reported. > > I need to add SSLHostConfig to JMX. That is next on my list. Also 1) Documentation -> Configuration examples in SSL-HowTo 2) Sample commented-out configuration in server.xml > I'm wondering about a 9.0.0 M1 (milestone 1) release to give folks a > chance to play with the SNI support. A good idea. It will introduce download page, migration guide, and on-site documentation. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1678225 - in /tomcat/site/trunk: ./ docs/ xdocs/
Author: markt
Date: Thu May 7 14:49:18 2015
New Revision: 1678225
URL: http://svn.apache.org/r1678225
Log:
Update site (excluding docs) for 8.0.22 release
Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-80.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-8.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-80.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-8.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml
Modified: tomcat/site/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1678225&r1=1678224&r2=1678225&view=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Thu May 7 14:49:18 2015
@@ -38,7 +38,7 @@ tomcat.loc=http://www.apache.org/dist/to
# - Tomcat versions -
tomcat60=6.0.43
tomcat70=7.0.61
-tomcat80=8.0.21
+tomcat80=8.0.22
# - Download destination -
Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1678225&r1=1678224&r2=1678225&view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Thu May 7 14:49:18 2015
@@ -57,8 +57,8 @@
Latest Stable 8.0.x Release
-2015-03-26
-8.0.21
+2015-05-05
+8.0.22
Modified: tomcat/site/trunk/docs/download-80.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1678225&r1=1678224&r2=1678225&view=diff
==
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Thu May 7 14:49:18 2015
@@ -206,7 +206,7 @@
Quick Navigation
-[define v]8.0.21[end]
+[define v]8.0.22[end]
https://www.apache.org/dist/tomcat/tomcat-8/KEYS";>KEYS |
[v] |
Browse |
Modified: tomcat/site/trunk/docs/index.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1678225&r1=1678224&r2=1678225&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Thu May 7 14:49:18 2015
@@ -227,86 +227,101 @@ project logo are trademarks of the Apach
-
-2015-04-07 Tomcat 7.0.61 Released
+
+2015-05-05 Tomcat 8.0.22 Released
-The Apache Tomcat Project is proud to announce the release of version 7.0.61 of
-Apache Tomcat. This release contains a number of bug fixes
-and improvements compared to version 7.0.59. The notable changes
-since 7.0.59 include:
-
+The Apache Tomcat Project is proud to announce the release of version 8.0.22
+of Apache Tomcat. Apache Tomcat 8.0.22 includes a numerous fixes for issues
+identified in 8.0.21 as well as a number of other enhancements and changes. The
+notable changes since 8.0.21 include:
-Add support for Java 8 JSSE server-preferred TLS cipher suite ordering.
- This feature requires Java 8.
-
-Update to Tomcat Native Library version 1.1.33 to pick up the Windows
- binaries that are based on OpenSSL 1.0.1m and APR 1.5.1.
-
-Implement a new feature for AJP connectors - Tomcat Authorization. If
- enabled Tomcat, will take an authenticated user name from the AJP
protocol
- and use the appropriate Realm for the request to authorize (i.e. add
- roles) to that user.
-
-Update the Eclipse JDT compiler to version 4.4.2.
+Change the format of the Tomcat specific URLs for resources inside JARs
+ that are in turn packed in a WAR. The ^/ sequence has been
+ replaced by */ so that the resulting URLs are compliant with
+ RFC 2396 and do not trigger exceptions when converted to URIs. The old
+ format will continue to be accepted.
+
+Allow logging of the remote port in the access log using the format
+ pattern %{remote}p.
+
+When checking last modified times as part of the automatic deployment
+ process, account for the fact that File.lastModified() has a resolution
of
+ one second to ensure that if a file has been modified within the last
+ second, the latest version of the file is always used. Note that a
+ side-effect of this change is that files with modification times in the
+ future are treated as if they are unmodified.
+
+Align redeploy resource modification checking with reload modification
+ checking so that now, in both cases, a change in modification time r
[ANN] Apache Tomcat 8.0.22 available
The Apache Tomcat team announces the immediate availability of Apache
Tomcat 8.0.22.
Apache Tomcat 8 is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Unified Expression Language and Java
WebSocket technologies.
Apache Tomcat 8.0.22 includes numerous fixes for issues identified
in 8.0.21 as well as a number of other enhancements and changes. The
notable changes since 8.0.21 include:
- Change the format of the Tomcat specific URLs for resources inside
JARs that are in turn packed in a WAR. The ^/ sequence
has been replaced by */ so that the resulting URLs are compliant with
RFC 2396 and do not trigger exceptions when converted to URIs. The old
format will continue to be accepted.
- Allow logging of the remote port in the access log using the format
pattern %{remote}p.
- When checking last modified times as part of the automatic deployment
process, account for the fact that File.lastModified() has a
resolution of one second to ensure that if a file has been modified
within the last second, the latest version of the file is always
used. Note that a side-effect of this change is that files with
modification times in the future are treated as if they are
unmodified.
- Align redeploy resource modification checking with reload modification
checking so that now, in both cases, a change in modification time
rather than an increase in modification time is used to determine if
the resource has changed.
Note: There is a known issue with NIO2 and SSL/TLS in this and previous
releases that can result in dropped connections. It is not recommended
that NIO2 is used in production with SSL/TLS until this issue is
resolved (the fix is expected in 8.0.23).
Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/tomcat-8.0-doc/changelog.html
Downloads:
http://tomcat.apache.org/download-80.cgi
Migration guides from Apache Tomcat 5.5.x, 6.0.x and 7.0.x:
http://tomcat.apache.org/migration.html
Enjoy!
- The Apache Tomcat team
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1678226 - in /tomcat/site/trunk/docs/tomcat-8.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/
Author: markt Date: Thu May 7 14:57:47 2015 New Revision: 1678226 URL: http://svn.apache.org/r1678226 Log: Update docs for 8.0.22 release [This commit notification would consist of 64 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1678169 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java SSLHostConfig.java jsse/JSSESocketFactory.java
2015-05-07 16:34 GMT+02:00 Mark Thomas : > I'm wondering about a 9.0.0 M1 (milestone 1) release to give folks a > chance to play with the SNI support. > > Good idea, the main downside is that it wouldn't have most of the new features. Rémy
buildbot success in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/245 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] 1678178 Blamelist: kkolinko Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1678231 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_62: ./ build.properties.default
Author: violetagg Date: Thu May 7 16:00:51 2015 New Revision: 1678231 URL: http://svn.apache.org/r1678231 Log: Tag 7.0.62 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_62/ (props changed) - copied from r1678230, tomcat/tc7.0.x/trunk/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_62/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_62/ -- bugtraq:append = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_62/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_62/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Thu May 7 16:00:51 2015 @@ -0,0 +1,2 @@ +(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+) +(\d+) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_62/ -- bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_62/ -- bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_62/ -- --- svn:ignore (added) +++ svn:ignore Thu May 7 16:00:51 2015 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_62/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu May 7 16:00:51 2015 @@ -0,0 +1,2 @@ +/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553-1667555 ,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178 +/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1
[Bug 57799] MessageCreationException: Couldn't create SOAP message with Nio2 connector protocol
https://bz.apache.org/bugzilla/show_bug.cgi?id=57799 --- Comment #12 from Remy Maucherat --- Since there's no test case, it is worth retesting again [with trunk] since the previous fix caused a regression. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1201 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] 1678218 Blamelist: markt,remm Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a new failure on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/246 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] 1678190 Blamelist: kkolinko BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat Grid write up
On 07/05/2015 13:45, Alarcón Vladimir wrote: > I wasn't aware of the mailing list server filter. > > Please find attached a text/plain version of the write up. > > -Vlad Lots of good stuff here. Can you put it on the wiki we can gather feedback/comments in one place? If you don't have an account, create one and let us know the user ID so we can add you to the list of users permitted to edit. Management of multiple instances has always been a weak point for Tomcat. Progress in this direction would be great. Mark > > > On Thu, 5/7/15, Konstantin Kolinko wrote: > > Subject: Re: Tomcat Grid write up > To: "Tomcat Developers List" > Date: Thursday, May 7, 2015, 5:49 AM > > 2015-05-07 6:42 GMT+03:00 > Alarcón Vladimir : > > > I guess I got a little bit carried away when writing the > architecture and description, but I guess it's better to > be ambitious. We can decide later on what we actually want > from this tool. > > > > > Please find attached the write up. > > > > > Your attachment was removed by mailing list > server. > > The users' list > rules apply here as well, > http://tomcat.apache.org/lists.html#tomcat-users > -> 7. > > *.txt > text/plain attachments may pass through the server, but > zip/doc/image/binary are certainly dropped. > > Best regards, > Konstantin Kolinko > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r8880 [1/2] - in /dev/tomcat/tomcat-7/v7.0.62: ./ bin/ bin/embed/ bin/extras/ src/
Author: violetagg Date: Thu May 7 18:34:08 2015 New Revision: 8880 Log: Stage 7.0.62RC Added: dev/tomcat/tomcat-7/v7.0.62/ dev/tomcat/tomcat-7/v7.0.62/KEYS (with props) dev/tomcat/tomcat-7/v7.0.62/README.html (with props) dev/tomcat/tomcat-7/v7.0.62/RELEASE-NOTES dev/tomcat/tomcat-7/v7.0.62/bin/ dev/tomcat/tomcat-7/v7.0.62/bin/README.html (with props) dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-deployer.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-deployer.tar.gz.asc dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-deployer.tar.gz.md5 dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-deployer.tar.gz.sha1 dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-deployer.zip (with props) dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-deployer.zip.asc dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-deployer.zip.md5 dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-deployer.zip.sha1 dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-fulldocs.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-fulldocs.tar.gz.asc dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-fulldocs.tar.gz.md5 dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-fulldocs.tar.gz.sha1 dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-windows-i64.zip (with props) dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-windows-i64.zip.asc dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-windows-i64.zip.md5 dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-windows-i64.zip.sha1 dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-windows-x64.zip (with props) dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-windows-x64.zip.asc dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-windows-x64.zip.md5 dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-windows-x64.zip.sha1 dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-windows-x86.zip (with props) dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-windows-x86.zip.asc dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-windows-x86.zip.md5 dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62-windows-x86.zip.sha1 dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62.exe (with props) dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62.exe.asc dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62.exe.md5 dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62.exe.sha1 dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62.tar.gz.asc dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62.tar.gz.md5 dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62.tar.gz.sha1 dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62.zip (with props) dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62.zip.asc dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62.zip.md5 dev/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62.zip.sha1 dev/tomcat/tomcat-7/v7.0.62/bin/embed/ dev/tomcat/tomcat-7/v7.0.62/bin/embed/apache-tomcat-7.0.62-embed.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.62/bin/embed/apache-tomcat-7.0.62-embed.tar.gz.asc dev/tomcat/tomcat-7/v7.0.62/bin/embed/apache-tomcat-7.0.62-embed.tar.gz.md5 dev/tomcat/tomcat-7/v7.0.62/bin/embed/apache-tomcat-7.0.62-embed.tar.gz.sha1 dev/tomcat/tomcat-7/v7.0.62/bin/embed/apache-tomcat-7.0.62-embed.zip (with props) dev/tomcat/tomcat-7/v7.0.62/bin/embed/apache-tomcat-7.0.62-embed.zip.asc dev/tomcat/tomcat-7/v7.0.62/bin/embed/apache-tomcat-7.0.62-embed.zip.md5 dev/tomcat/tomcat-7/v7.0.62/bin/embed/apache-tomcat-7.0.62-embed.zip.sha1 dev/tomcat/tomcat-7/v7.0.62/bin/extras/ dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-jmx-remote.jar (with props) dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-jmx-remote.jar.asc dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-jmx-remote.jar.md5 dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-jmx-remote.jar.sha1 dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-ws.jar (with props) dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-ws.jar.asc dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-ws.jar.md5 dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-ws.jar.sha1 dev/tomcat/tomcat-7/v7.0.62/bin/extras/tomcat-juli-adapters.jar (with props) dev/tomcat/tomcat-7/v7.0.62/bin/extras/tomcat-juli-adapters.jar.asc dev/tomcat/tomcat-7/v7.0.62/bin/extras/tomcat-juli-adapters.jar.md5 dev/tomcat/tomcat-7/v7.0.62/bin/extras/tomcat-juli-adapters.jar.sha1 dev/tomcat/tomcat-7/v7.0.62/bin/extras/tomcat-juli.jar (with props) dev/tomcat/tomcat-7/v7.0.62/bin/extras/tomcat-juli.jar.asc dev/tomcat/tomcat-7/v7.0.62/bin/extras/tomcat-juli.jar.md5 dev/tomcat/tomcat-7/v7.0.62/bin/extras/tomcat-juli.jar.sha1
svn commit: r8880 [2/2] - in /dev/tomcat/tomcat-7/v7.0.62: ./ bin/ bin/embed/ bin/extras/ src/
Added: dev/tomcat/tomcat-7/v7.0.62/bin/embed/apache-tomcat-7.0.62-embed.zip.md5 == --- dev/tomcat/tomcat-7/v7.0.62/bin/embed/apache-tomcat-7.0.62-embed.zip.md5 (added) +++ dev/tomcat/tomcat-7/v7.0.62/bin/embed/apache-tomcat-7.0.62-embed.zip.md5 Thu May 7 18:34:08 2015 @@ -0,0 +1 @@ +1eed59f73fe94165e1f183b09e7790b5 *apache-tomcat-7.0.62-embed.zip \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.62/bin/embed/apache-tomcat-7.0.62-embed.zip.sha1 == --- dev/tomcat/tomcat-7/v7.0.62/bin/embed/apache-tomcat-7.0.62-embed.zip.sha1 (added) +++ dev/tomcat/tomcat-7/v7.0.62/bin/embed/apache-tomcat-7.0.62-embed.zip.sha1 Thu May 7 18:34:08 2015 @@ -0,0 +1 @@ +cd9b3398a120f3b58bb20a5352153af8dcba6d13 *apache-tomcat-7.0.62-embed.zip \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-jmx-remote.jar == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-jmx-remote.jar -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-jmx-remote.jar.asc == --- dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-jmx-remote.jar.asc (added) +++ dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-jmx-remote.jar.asc Thu May 7 18:34:08 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCgAGBQJVS54IAAoJECCLCrHWMBHHJLcQAI8XJYqUvMx71okEs1PEv2As +im5dkmcHn2ULMLNnZ+ZOir4jCYq1JDjEyk5DMPIqkEH7Ma3XLLsAc/lJHGHSCOTt +/VshACd7j3ZCuocapuFzuAuoIw1irVBDPYGMDo5x7ECZUSL0R/eIBnP7YArFMV51 +7/V9wVK3clwoFA4YESLkEy1hF7cG06AreCzWJsJ5ba58dHLf/jhSCjpbFkNnc/R8 +r29zwjw60OyWdUAPFucPY9Gh0OW2AU3b86VhbE2Tk38/j8Dg8kbjn8BIlh4zAK7z +qh2aukpc1Tihs7EsJT8c+c3yYc41tx8VR750RPVDVwGvUm40gwsFT4F23iFL5JtH +869RFyuB0DTaOxSCzWTzhXcaBzkEPceOD7xpYxAkJcXGLIRn/mfPqAv8i5wsGjmd +NY9RQpZNrlu6VdNhUIHTjcnolDRfSYrnceDTjElO6KCvtkK3zFmFJKdiTXjJ7T1D +YdQWlAkb2zfYvTBIV8ppI/BlmrliPv+e8RGJEvAvZxZD8Kd8N+p9HRDYlo6yw5tD +1mbFC8bO50Vg8GKE5A1g7USY6CEJnx9Cvh0O57Wu1bmAluP6iXyeo/aqCZvVlKqo +wEbuUyIZzpIWWVTtty9g2JSg35JTwQN9aw3fqoF80LlDmJGDakhX37QmuDfwcMdn +WAlZIhkoAaawfKaI4Nu5 +=XY/K +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-jmx-remote.jar.md5 == --- dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-jmx-remote.jar.md5 (added) +++ dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-jmx-remote.jar.md5 Thu May 7 18:34:08 2015 @@ -0,0 +1 @@ +815d2dbfbb1d7826ba875d85c7213d39 *catalina-jmx-remote.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-jmx-remote.jar.sha1 == --- dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-jmx-remote.jar.sha1 (added) +++ dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-jmx-remote.jar.sha1 Thu May 7 18:34:08 2015 @@ -0,0 +1 @@ +708a980ca6cc409b5e64163d3ad7bc0d849c3736 *catalina-jmx-remote.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-ws.jar == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-ws.jar -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-ws.jar.asc == --- dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-ws.jar.asc (added) +++ dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-ws.jar.asc Thu May 7 18:34:08 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCgAGBQJVS54HAAoJECCLCrHWMBHHZqMQALYQIw2YKhH84QHmxRlFEu6v +hjIL6Awsbjzm6E8SNs+rHuoCp+768yTmOrHvoBIMlNXY428ZgU/AmxSUQyqbMNM+ +x0YybHEcdUOgfQmBvJT5E5UrJdZNaeZtQpRriGiVHoCDWryRnJYdV6aosU3eD2j9 +WZmJksGA7ksYR1FA4/dHbD9EOHOuRewxL6sCZ/AmCo6sFSToaa+zl/hTKKrVWRTa +CNJaBPRYwSYNmvPz7o1qqV2UVe7+1phP+E0PMNiWpunFnQ8QF0PskhkQ2GLok4po +j6t1oL7wNktwPMBvkxEjwxoOG+itzbirQI5JM0gmDDQwH5LB2xzjhSdDHH7S6ksf +Mmqqwp3qvhmN0ytlJrlT8W1M1mXtPHK35NrqwrpDQme5XF+o8wbX8sfbz9PmyTPw +pFjbiNNXmFIKBKoCyY8Jgrj9t4SqAIuXUR8+5Cq/h++bUZQX1D2Ct1jW4HkB8Mcx +5zX0rf7NWPCq2Kyy8LB1s6KYOUJLLN+iXcng7jXLxxMPpgp67x8vEbW5K4tZBcie +04qRs6pIye7MTaSngE3IDcpRFh9SpBUPQowYCyX9G7fU0CIRu44+9+nY62fV6VAY +2vBR88cMQC+2zgqJijTibmXD5iyBCu9P5adZBoueOUe9VgxD1HTZLSvTF4xgh1vI +4p7YvDIhMRQvASqKMFY4 +=p+sR +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.62/bin/extras/catalina-ws.jar.md5 ===
[VOTE] Release Apache Tomcat 7.0.62
The proposed Apache Tomcat 7.0.62 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.62/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1043/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_62/ The proposed 7.0.62 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.62 Stable Regards, Violeta
Re: [VOTE] Release Apache Tomcat 8.0.22
Am 07.05.2015 um 16:32 schrieb Rémy Maucherat: 2015-05-03 12:32 GMT+02:00 Felix Schumacher < felix.schumac...@internetallee.de>: The rest of the patch will not influence the jmeter test. Ping to get feedback on the fix, if possible. Tested again on trunk and found no delays. Felix Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1678255 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
Author: violetagg Date: Thu May 7 18:47:04 2015 New Revision: 1678255 URL: http://svn.apache.org/r1678255 Log: Prep for next version Modified: tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1678255&r1=1678254&r2=1678255&view=diff == --- tomcat/tc7.0.x/trunk/build.properties.default (original) +++ tomcat/tc7.0.x/trunk/build.properties.default Thu May 7 18:47:04 2015 @@ -25,7 +25,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=62 +version.build=63 version.patch=0 version.suffix=-dev Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1678255&r1=1678254&r2=1678255&view=diff == --- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Thu May 7 18:47:04 2015 @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=7.0.62 +maven.asf.release.deploy.version=7.0.63 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1678255&r1=1678254&r2=1678255&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu May 7 18:47:04 2015 @@ -57,6 +57,8 @@ They eventually become mixed with the numbered issues. (I.e., numbered issues do not "pop up" wrt. others). --> + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 48498] 6.0.22RC: ArrayIndexOutOfBoundsException from Jasper when compilation error inside a CDATA block
https://bz.apache.org/bugzilla/show_bug.cgi?id=48498 Saurav Rawat changed: What|Removed |Added CC||rawatsau...@outlook.com -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57901] New: Blocker bug
https://bz.apache.org/bugzilla/show_bug.cgi?id=57901 Bug ID: 57901 Summary: Blocker bug Product: Tomcat 6 Version: 6.0.43 Hardware: PC Status: NEW Severity: blocker Priority: P2 Component: Examples Assignee: dev@tomcat.apache.org Reporter: rawatsau...@outlook.com fgragehgethb -- 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 57901] Blocker bug
https://bz.apache.org/bugzilla/show_bug.cgi?id=57901 Chuck Caldarale changed: What|Removed |Added OS||All Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #1 from Chuck Caldarale --- Bugzilla is not a playground. -- 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: Tomcat Grid write up
I just created my username for the Wiki. It's: theimpaler Please, let me know when I get the edir privileges. So then: 1. Under which page should I place this info? 2. Which page title is more suitable? "Tomcat Grid discussion"? 3. Since this doc is rather long: for the benefit of the discussion, do you think is better to include the whole doc in one page, or should I divide it so each phase goes into a separate wiki page? -Vlad On Thu, 5/7/15, Mark Thomas wrote: Subject: Re: Tomcat Grid write up To: "Tomcat Developers List" Date: Thursday, May 7, 2015, 2:02 PM On 07/05/2015 13:45, Alarcón Vladimir wrote: > I wasn't aware of the mailing list server filter. > > Please find attached a text/plain version of the write up. > > -Vlad Lots of good stuff here. Can you put it on the wiki we can gather feedback/comments in one place? If you don't have an account, create one and let us know the user ID so we can add you to the list of users permitted to edit. Management of multiple instances has always been a weak point for Tomcat. Progress in this direction would be great. Mark > > > On Thu, 5/7/15, Konstantin Kolinko wrote: > > Subject: Re: Tomcat Grid write up > To: "Tomcat Developers List" > Date: Thursday, May 7, 2015, 5:49 AM > > 2015-05-07 6:42 GMT+03:00 > Alarcón Vladimir : > > > I guess I got a little bit carried away when writing the > architecture and description, but I guess it's better to > be ambitious. We can decide later on what we actually want > from this tool. > > > > > Please find attached the write up. > > > > > Your attachment was removed by mailing list > server. > > The users' list > rules apply here as well, > http://tomcat.apache.org/lists.html#tomcat-users > -> 7. > > *.txt > text/plain attachments may pass through the server, but > zip/doc/image/binary are certainly dropped. > > Best regards, > Konstantin Kolinko > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (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-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : 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-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 38 mins 29 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150507-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-20150507.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150507-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20150507/bi n/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-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/g
Fwd: [Bug 56438] If jar scan does not find context config or TLD config, log a message
Hi Mark, Can you review my patch and let me know if any changes required? Thanks, Pravallika(VIN) -- Forwarded message -- From: Date: Thu, May 7, 2015 at 3:23 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 #13 from VIN --- Created attachment 32719 --> https://bz.apache.org/bugzilla/attachment.cgi?id=32719&action=edit Fix for adding debug log message for positive matches of tld-trunk This patch contains fix for Tomcat recent trunk: 1) Added debug log message when positive tld match was found 2) Added debug log messages for both positive and negative matches of tld at resource path scan(previously it has only for JAR scanning). Summary message is not added. 3) Added debug log messages for both positive and negative matches of tld at directory level scan like Web-Inf/classes. Summary message is not added. Please verify the fix and let me know. Thanks, Pravallika(VIN) -- 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
