[Bug 57809] Don't store merged web.xml

2015-04-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57809

--- Comment #4 from Remy Maucherat  ---
I think this can be useful for debugging and monitoring (management interfaces
like this kind of stuff), but since this is a String it is probably not that
useful for apps.

testWebXml mentions it but doesn't actually test it.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



[GUMP@vmgump]: Project tomcat-tc8.0.x-validate (in module tomcat-8.0.x) failed

2015-04-14 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc8.0.x-validate has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-validate :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/index.html

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-validate.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 1 min 9 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 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.6-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-6.6-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150414.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.3.1-SNAPSHOT.j
 
ar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150414.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150414.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20150414.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-19.0-SNAPSHOT.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-8.0.x/build.xml

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

compile-prepare:

download-validate:

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

setproxy:

downloadfile:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-8.0.x/output/res/checkstyle
[checkstyle] Running Checkstyle 6.6-SNAPSHOT on 2936 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-8.0.x/webapps/docs/config/cluster-manager.xml:140:
 Line matches the illegal pattern '\s+$'.

BUILD FAILED
/srv/gump/public/workspace/tomcat-8.0.x/build.xml:537: Got 1 errors and 0 
warnings.

Total time: 1 minute 8 seconds
-

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

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

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

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



svn commit: r1673408 - 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/jsse/

2015-04-14 Thread markt
Author: markt
Date: Tue Apr 14 11:07:41 2015
New Revision: 1673408

URL: http://svn.apache.org/r1673408
Log:
Move SSLProtocols config to common property for JSSE and
APR/native

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/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/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/jsse/TesterBug50640SslImpl.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=1673408&r1=1673407&r2=1673408&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Tue 
Apr 14 11:07:41 2015
@@ -37,6 +37,7 @@ import org.apache.coyote.http11.upgrade.
 import org.apache.coyote.http11.upgrade.UpgradeProcessorExternal;
 import org.apache.coyote.http11.upgrade.UpgradeProcessorInternal;
 import org.apache.tomcat.util.net.AbstractEndpoint;
+import org.apache.tomcat.util.net.SSLHostConfig;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 
 public abstract class AbstractHttp11Protocol extends AbstractProtocol {
@@ -323,6 +324,29 @@ public abstract class AbstractHttp11Prot
 }
 
 
+// --- HTTPS specific 
properties
+//  Handled via an 
SSLHostConfig
+
+private SSLHostConfig defaultSSLHostConfig = null;
+private void registerDefaultSSLHostConfig() {
+if (defaultSSLHostConfig == null) {
+defaultSSLHostConfig = new SSLHostConfig();
+
defaultSSLHostConfig.setHostName(SSLHostConfig.DEFAULT_SSL_HOST_NAME);
+getEndpoint().addHostConfig(defaultSSLHostConfig);
+}
+}
+
+
+public void setSslEnabledProtocols(String enabledProtocols) {
+registerDefaultSSLHostConfig();
+defaultSSLHostConfig.setProtocols(enabledProtocols);
+}
+public void setSSLProtocol(String sslProtocol) {
+registerDefaultSSLHostConfig();
+defaultSSLHostConfig.setProtocols(sslProtocol);
+}
+
+
 // - 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=1673408&r1=1673407&r2=1673408&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Tue Apr 
14 11:07:41 2015
@@ -70,14 +70,8 @@ public class Http11AprProtocol extends A
 public boolean getDeferAccept() { return 
((AprEndpoint)getEndpoint()).getDeferAccept(); }
 public void setDeferAccept(boolean deferAccept) { 
((AprEndpoint)getEndpoint()).setDeferAccept(deferAccept); }
 
-//   SSL related properties 
-
-/**
- * SSL protocol.
- */
-public String getSSLProtocol() { return 
((AprEndpoint)getEndpoint()).getSSLProtocol(); }
-public void setSSLProtocol(String SSLProtocol) { 
((AprEndpoint)getEndpoint()).setSSLProtocol(SSLProtocol); }
 
+//   SSL related properties 
 
 /**
  * SSL password (if a cert is encrypted, and no password has been 
provided, a callback

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=1673408&r1=1673407&r2=1673408&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Tue Apr 
14 11:07:41 2015
@@ -25,6 +25,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.concurrent.ConcurrentHashMap;
@@ -214,6 +215,21 @@ public abstract class 

svn commit: r1673407 - in /tomcat/trunk/java/org/apache: coyote/http11/ tomcat/util/net/

2015-04-14 Thread markt
Author: markt
Date: Tue Apr 14 11:07:38 2015
New Revision: 1673407

URL: http://svn.apache.org/r1673407
Log:
Remove getCiphersUsed from endpoint since it will now vary by SSL host
config
Create a Map (currently only populated with a single default) for SNI
host names to SSLContexts.

Added:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java   (with 
props)
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

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=1673407&r1=1673406&r2=1673407&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java 
Tue Apr 14 11:07:38 2015
@@ -52,7 +52,6 @@ public abstract class AbstractHttp11Jsse
 
 public String getCiphers() { return getEndpoint().getCiphers();}
 public void setCiphers(String s) { getEndpoint().setCiphers(s);}
-public String[] getCiphersUsed() { return getEndpoint().getCiphersUsed();}
 
 public String getKeyAlias() { return getEndpoint().getKeyAlias();}
 public void setKeyAlias(String s ) { getEndpoint().setKeyAlias(s);}

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=1673407&r1=1673406&r2=1673407&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Tue Apr 
14 11:07:38 2015
@@ -92,7 +92,6 @@ public class Http11AprProtocol extends A
  */
 public String getSSLCipherSuite() { return 
((AprEndpoint)getEndpoint()).getSSLCipherSuite(); }
 public void setSSLCipherSuite(String SSLCipherSuite) { 
((AprEndpoint)getEndpoint()).setSSLCipherSuite(SSLCipherSuite); }
-public String[] getCiphersUsed() { return getEndpoint().getCiphersUsed();}
 
 /**
  * SSL honor cipher order.

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=1673407&r1=1673406&r2=1673407&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Tue Apr 
14 11:07:38 2015
@@ -963,10 +963,6 @@ public abstract class AbstractEndpointhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1673407&r1=1673406&r2=1673407&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Tue 
Apr 14 11:07:38 2015
@@ -16,6 +16,9 @@
  */
 package org.apache.tomcat.util.net;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
@@ -28,29 +31,20 @@ import org.apache.tomcat.util.net.jsse.N
 public abstract class AbstractJsseEndpoint extends AbstractEndpoint {
 
 private SSLImplementation sslImplementation = null;
+private Map sslContexts = new HashMap<>();
+
 public SSLImplementation getSslImplementation() {
 return sslImplementation;
 }
 
-private String[] enabledCiphers;
-@Override
-public String[] getCiphersUsed() {
-return enabledCiphers;
-}
-
-private String[] enabledProtocols;
-
-private SSLContext sslContext = null;
-public SSLContext getSSLContext() { return sslContext;}
-public void setSSLContext(SSLContext c) { sslContext = c;}
-
 
 protected void initialiseSsl() throws Exception {
 if (isSSLEnabled()) {
 sslImplementation = 
SSLImplementation.getInstance(getSslImplementationName());
-SSLUtil sslUtil = sslImplementation.getSSLUtil(this);
 
-sslContext = sslUtil.createSSLContext();
+// TODO: Create multiple SSLContexts based on SSLHostConfig(s)
+SSLUtil sslUtil = sslImplementation.getSSLUtil(this);
+SSLContext sslContext = sslUtil.createSSLContext();
 sslContext.init(wrap(sslUtil.get

Re: svn commit: r1673408 - 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/jsse/

2015-04-14 Thread Mark Thomas
On 14/04/2015 06:07, ma...@apache.org wrote:
> Author: markt
> Date: Tue Apr 14 11:07:41 2015
> New Revision: 1673408
> 
> URL: http://svn.apache.org/r1673408
> Log:
> Move SSLProtocols config to common property for JSSE and
> APR/native

My aim is to do this for all the SSL properties.

Where a property is only used by one implementation (e.g. sslProtocol),
it will be a NO-OP for the other implementation.

I suspect some of the mappings between JSSE and OpenSSL will be a little
trickier than this one was.

In an ideal world, I'd like the same configuration to work for either
connector. Of course, that assumes JKS keystores are not used.

The next steps I have in mind are:
- add the ability to create  elements under a 
- add the ability to create  elements under a 
- test SNI allows selection of SSLHostConfig
- expand SSLHostConfig to cover all the SSL attributes
- update the docs
- add SNI to APR/native

Mark

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



[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) failed

2015-04-14 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc8.0.x-test-nio2 has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 38 mins 58 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-20150414-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-20150414.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150414-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150414/bin
 /openssl -Dexecute.test.bio=false -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output

buildbot failure in ASF Buildbot on tomcat-trunk

2015-04-14 Thread buildbot
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/1134

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



Reg: Bug 56438

2015-04-14 Thread Pravallika Peddi
Hi Mark and Justin,
I have updated my comments on top of yours. Can you help check them and
confirm so that i can provide the patch?

Thanks,
Pravallika(VIN)


Re: svn commit: r1673408 - 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/jsse/

2015-04-14 Thread Rémy Maucherat
2015-04-14 13:18 GMT+02:00 Mark Thomas :

> On 14/04/2015 06:07, ma...@apache.org wrote:
> > Author: markt
> > Date: Tue Apr 14 11:07:41 2015
> > New Revision: 1673408
> >
> > URL: http://svn.apache.org/r1673408
> > Log:
> > Move SSLProtocols config to common property for JSSE and
> > APR/native
>
> My aim is to do this for all the SSL properties.
>
> Where a property is only used by one implementation (e.g. sslProtocol),
> it will be a NO-OP for the other implementation.
>
> I suspect some of the mappings between JSSE and OpenSSL will be a little
> trickier than this one was.
>
> In an ideal world, I'd like the same configuration to work for either
> connector. Of course, that assumes JKS keystores are not used.
>
> The next steps I have in mind are:
> - add the ability to create  elements under a 
>

Yes, ok, I suppose putting it on the Host element wouldn't work well for a
variety of reasons.


> - add the ability to create  elements under a 
> - test SNI allows selection of SSLHostConfig
> - expand SSLHostConfig to cover all the SSL attributes
> - update the docs
> - add SNI to APR/native
>
> Rémy


[Bug 57811] New: Typo in page https://wiki.apache.org/tomcat/HowTo/FasterStartUp

2015-04-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57811

Bug ID: 57811
   Summary: Typo in page
https://wiki.apache.org/tomcat/HowTo/FasterStartUp
   Product: Tomcat 8
   Version: trunk
  Hardware: All
OS: All
Status: NEW
  Severity: minor
  Priority: P2
 Component: Documentation
  Assignee: dev@tomcat.apache.org
  Reporter: rya...@mail.ru

 should be spelled 

-- 
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: buildbot failure in ASF Buildbot on tomcat-trunk

2015-04-14 Thread Mark Thomas
On 14/04/2015 07:31, build...@apache.org wrote:
> 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/1134
> 
> 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] 1673408
> Blamelist: markt
> 
> BUILD FAILED: failed compile_1

Just to confirm - this is my fault. It is a side-effect of the SSL
config work I started. I'll look into a fix.

Mark

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



[Bug 57811] Typo in page https://wiki.apache.org/tomcat/HowTo/FasterStartUp

2015-04-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57811

Ognjen Blagojevic  changed:

   What|Removed |Added

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

--- Comment #1 from Ognjen Blagojevic  ---
Fixed.

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



[Tomcat Wiki] Trivial Update of "HowTo/FasterStartUp" by OgnjenBlagojevic

2015-04-14 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "HowTo/FasterStartUp" page has been changed by OgnjenBlagojevic:
https://wiki.apache.org/tomcat/HowTo/FasterStartUp?action=diff&rev1=24&rev2=25

Comment:
Typo (JanScanFilter)

  
  In Tomcat 7 JAR files can be excluded from scanning by listing their names or 
name patterns in a 
[[http://tomcat.apache.org/tomcat-7.0-doc/config/systemprops.html#JAR_Scanning|system
 property]]. Those are usually configured in the `conf/catalina.properties` 
file.
  
- In Tomcat 8 there are several options available. You can use a 
[[http://tomcat.apache.org/tomcat-8.0-doc/config/systemprops.html#JAR_Scanning|system
 property]] or configure a `` 
[[http://tomcat.apache.org/tomcat-8.0-doc/config/jar-scan-filter.html| 
element]] in the 
[[http://tomcat.apache.org/tomcat-8.0-doc/config/context.html|context file]] of 
your web application.
+ In Tomcat 8 there are several options available. You can use a 
[[http://tomcat.apache.org/tomcat-8.0-doc/config/systemprops.html#JAR_Scanning|system
 property]] or configure a `` 
[[http://tomcat.apache.org/tomcat-8.0-doc/config/jar-scan-filter.html| 
element]] in the 
[[http://tomcat.apache.org/tomcat-8.0-doc/config/context.html|context file]] of 
your web application.
  
  == Entropy Source ==
  Tomcat 7+ heavily relies on !SecureRandom class to provide random values for 
its session ids and in other places. Depending on your JRE it can cause delays 
during startup if entropy source that is used to initialize !SecureRandom is 
short of entropy. You will see warning in the logs when this happens, e.g.:

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



[Bug 57812] New: Using -parameters during compiletime causes OutOfMemory Exception during deployment

2015-04-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57812

Bug ID: 57812
   Summary: Using -parameters during compiletime causes
OutOfMemory Exception during deployment
   Product: Tomcat 8
   Version: 8.0.9
  Hardware: PC
Status: NEW
  Severity: minor
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: muc...@yahoo.com

The javac -parameters switch adds meta information about method parameters
(e.g. name) to the bytecode. If I enable this for my project (e.g. in Eclipse
it is Java -> Compiler -> Store Information About Method Parameters) then
deployment will break with the following stacktrace:

Exception in thread "ContainerBackgroundProcessor[StandardEngine[Catalina]]"
java.lang.OutOfMemoryError: Java heap space
at
org.apache.tomcat.util.bcel.classfile.Utility.swallowUnknownAttribute(Utility.java:156)
at
org.apache.tomcat.util.bcel.classfile.Attribute.readAttribute(Attribute.java:102)
at
org.apache.tomcat.util.bcel.classfile.FieldOrMethod.(FieldOrMethod.java:76)
at
org.apache.tomcat.util.bcel.classfile.ClassParser.readMethods(ClassParser.java:226)
at
org.apache.tomcat.util.bcel.classfile.ClassParser.parse(ClassParser.java:101)
at
org.apache.catalina.startup.ContextConfig.processAnnotationsStream(ContextConfig.java:1987)
at
org.apache.catalina.startup.ContextConfig.processAnnotationsJar(ContextConfig.java:1940)
at
org.apache.catalina.startup.ContextConfig.processAnnotationsUrl(ContextConfig.java:1915)
at
org.apache.catalina.startup.ContextConfig.processAnnotations(ContextConfig.java:1876)
at
org.apache.catalina.startup.ContextConfig.webConfig(ContextConfig.java:1145)
at
org.apache.catalina.startup.ContextConfig.configureStart(ContextConfig.java:767)
at
org.apache.catalina.startup.ContextConfig.lifecycleEvent(ContextConfig.java:302)
at
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:117)
at
org.apache.catalina.util.LifecycleBase.fireLifecycleEvent(LifecycleBase.java:90)
at
org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5083)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150)
at
org.apache.catalina.core.StandardContext.reload(StandardContext.java:3780)
at
org.apache.catalina.loader.WebappLoader.backgroundProcess(WebappLoader.java:293)
at
org.apache.catalina.core.StandardContext.backgroundProcess(StandardContext.java:5539)
at
org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.processChildren(ContainerBase.java:1365)
at
org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.processChildren(ContainerBase.java:1369)
at
org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.processChildren(ContainerBase.java:1369)
at
org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1345)
at java.lang.Thread.run(Thread.java:745)

-- 
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 57811] Typo in page https://wiki.apache.org/tomcat/HowTo/FasterStartUp

2015-04-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57811

Mikhail Ryagin  changed:

   What|Removed |Added

 Status|RESOLVED|VERIFIED

-- 
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 57812] Using -parameters during compiletime causes OutOfMemory Exception during deployment

2015-04-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57812

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 OS||All
 Resolution|--- |INVALID

--- Comment #1 from Mark Thomas  ---
There is no demonstrable Tomcat bug here.

You need to allocate more heap.

If you need any further help, please follow-up on the users mailing list.

-- 
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 57811] Typo in page https://wiki.apache.org/tomcat/HowTo/FasterStartUp

2015-04-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57811

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|VERIFIED|CLOSED

-- 
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: r1673533 - /tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java

2015-04-14 Thread markt
Author: markt
Date: Tue Apr 14 19:26:22 2015
New Revision: 1673533

URL: http://svn.apache.org/r1673533
Log:
Fix broken test

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java

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=1673533&r1=1673532&r2=1673533&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Tue 
Apr 14 19:26:22 2015
@@ -42,6 +42,14 @@ 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, 
defaultSslHostConfig);
+}
+
 for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
 SSLUtil sslUtil = sslImplementation.getSSLUtil(this, 
sslHostConfig);
 SSLContext sslContext = sslUtil.createSSLContext();
@@ -122,16 +130,21 @@ public abstract class AbstractJsseEndpoi
 
 
 private SSLContextWrapper getSSLContextWrapper(String sniHostName) {
-// First choice - direct match
-SSLContextWrapper result = sslContexts.get(sniHostName);
-if (result != null) {
-return result;
-}
-// Second choice, wildcard match
-int indexOfDot = sniHostName.indexOf('.');
-if (indexOfDot > -1) {
-result = sslContexts.get("*" + sniHostName.substring(indexOfDot));
+SSLContextWrapper result = null;
+
+if (sniHostName != null) {
+// First choice - direct match
+result = sslContexts.get(sniHostName);
+if (result != null) {
+return result;
+}
+// Second choice, wildcard match
+int indexOfDot = sniHostName.indexOf('.');
+if (indexOfDot > -1) {
+result = sslContexts.get("*" + 
sniHostName.substring(indexOfDot));
+}
 }
+
 // Fall-back. Use the default
 if (result == null) {
 result = sslContexts.get(SSLHostConfig.DEFAULT_SSL_HOST_NAME);



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



svn commit: r1673552 - in /tomcat/trunk/java/org/apache: catalina/connector/ catalina/startup/ coyote/ coyote/ajp/ coyote/http11/ coyote/spdy/ tomcat/util/net/ tomcat/util/net/jsse/

2015-04-14 Thread markt
Author: markt
Date: Tue Apr 14 20:27:58 2015
New Revision: 1673552

URL: http://svn.apache.org/r1673552
Log:
Add plumbing to parse SSLHostConfig from server.xml

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProxyProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1673552&r1=1673551&r2=1673552&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Tue Apr 14 
20:27:58 2015
@@ -35,6 +35,7 @@ import org.apache.coyote.ProtocolHandler
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.IntrospectionUtils;
+import org.apache.tomcat.util.net.SSLHostConfig;
 import org.apache.tomcat.util.res.StringManager;
 
 
@@ -851,6 +852,10 @@ public class Connector extends Lifecycle
 return "Internal";
 }
 
+
+public void addSslHostConfig(SSLHostConfig sslHostConfig) {
+protocolHandler.addSslHostConfig(sslHostConfig);
+}
 // - Public Methods
 
 

Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1673552&r1=1673551&r2=1673552&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Tue Apr 14 
20:27:58 2015
@@ -336,6 +336,12 @@ public class Catalina {
 "addConnector",
 "org.apache.catalina.connector.Connector");
 
+digester.addObjectCreate("Server/Service/Connector/SSLHostConfig",
+ "org.apache.tomcat.util.net.SSLHostConfig");
+digester.addSetProperties("Server/Service/Connector/SSLHostConfig");
+digester.addSetNext("Server/Service/Connector/SSLHostConfig",
+"addSslHostConfig",
+"org.apache.tomcat.util.net.SSLHostConfig");
 
 digester.addObjectCreate("Server/Service/Connector/Listener",
  null, // MUST be specified in the element

Modified: tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java?rev=1673552&r1=1673551&r2=1673552&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java Tue Apr 14 
20:27:58 2015
@@ -19,6 +19,8 @@ package org.apache.coyote;
 
 import java.util.concurrent.Executor;
 
+import org.apache.tomcat.util.net.SSLHostConfig;
+
 
 /**
  * Abstract the protocol implementation, including threading, etc.
@@ -94,4 +96,7 @@ public interface ProtocolHandler {
  * Does this ProtocolHandler support sendfile?
  */
 public boolean isSendfileSupported();
+
+
+public void addSslHostConfig(SSLHostConfig sslHostConfig);
 }

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1673552&r1=1673551&r2=1673552&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Tue Apr 14 
20:27:58 2015
@@ -24,6 +24,7 @@ import org.apache.coyote.AbstractProtoco
 import org.apache.coyote.Processor;
 import org.apache.coyote.UpgradeProtocol;
 import org.apache.tomcat.util.net.AbstractEndpoint;
+import org.apache.tomcat.util.net.SSLHostConfig;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -126,6 +127,15 @@ public abstract class AbstractAjpProtoco
 }
 }
 
+
+// --

buildbot exception in ASF Buildbot on tomcat-trunk

2015-04-14 Thread buildbot
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/1136

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] 1673552
Blamelist: markt

BUILD FAILED: exception upload_2

Sincerely,
 -The Buildbot




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



buildbot success in ASF Buildbot on tomcat-trunk

2015-04-14 Thread buildbot
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/1135

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] 1673533
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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



svn commit: r1673555 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java

2015-04-14 Thread remm
Author: remm
Date: Tue Apr 14 20:58:24 2015
New Revision: 1673555

URL: http://svn.apache.org/r1673555
Log:
- Remove read/write pending flags since they don't really add anything, use a 
lot of finally and are still slightly incorrect without additional finally (or 
similar).
- Simplify, harmonize and cleanups.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java

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=1673555&r1=1673554&r2=1673555&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Tue Apr 
14 20:58:24 2015
@@ -65,8 +65,6 @@ public class SecureNio2Channel extends N
 
 protected boolean closed;
 protected boolean closing;
-protected volatile boolean readPending;
-protected volatile boolean writePending;
 
 private CompletionHandler> 
handshakeReadCompletionHandler;
 private CompletionHandler> 
handshakeWriteCompletionHandler;
@@ -123,15 +121,13 @@ public class SecureNio2Channel extends N
 handshakeComplete = false;
 closed = false;
 closing = false;
-readPending = false;
-writePending = false;
 }
 
 
 private class FutureFlush implements Future {
 private Future integer;
-protected FutureFlush(Future integer) {
-this.integer = integer;
+protected FutureFlush() {
+integer = sc.write(netOutBuffer);
 }
 @Override
 public boolean cancel(boolean mayInterruptIfRunning) {
@@ -148,23 +144,13 @@ public class SecureNio2Channel extends N
 @Override
 public Boolean get() throws InterruptedException,
 ExecutionException {
-try {
-int result = integer.get().intValue();
-return Boolean.valueOf(result >= 0);
-} finally {
-writePending = false;
-}
+return Boolean.valueOf(integer.get().intValue() >= 0);
 }
 @Override
 public Boolean get(long timeout, TimeUnit unit)
 throws InterruptedException, ExecutionException,
 TimeoutException {
-try {
-int result = integer.get(timeout, unit).intValue();
-return Boolean.valueOf(result >= 0);
-} finally {
-writePending = false;
-}
+return Boolean.valueOf(integer.get(timeout, unit).intValue() >= 0);
 }
 }
 
@@ -176,12 +162,7 @@ public class SecureNio2Channel extends N
  */
 @Override
 public Future flush() {
-if (writePending) {
-throw new WritePendingException();
-} else {
-writePending = true;
-}
-return new FutureFlush(sc.write(netOutBuffer));
+return new FutureFlush();
 }
 
 /**
@@ -558,7 +539,6 @@ public class SecureNio2Channel extends N
 }
 @Override
 public boolean cancel(boolean mayInterruptIfRunning) {
-readPending = false;
 return integer.cancel(mayInterruptIfRunning);
 }
 @Override
@@ -571,21 +551,13 @@ public class SecureNio2Channel extends N
 }
 @Override
 public Integer get() throws InterruptedException, ExecutionException {
-try {
-return unwrap(integer.get().intValue());
-} finally {
-readPending = false;
-}
+return unwrap(integer.get().intValue());
 }
 @Override
 public Integer get(long timeout, TimeUnit unit)
 throws InterruptedException, ExecutionException,
 TimeoutException {
-try {
-return unwrap(integer.get(timeout, unit).intValue());
-} finally {
-readPending = false;
-}
+return unwrap(integer.get(timeout, unit).intValue());
 }
 private Integer unwrap(int nRead) throws ExecutionException {
 //are we in the middle of closing or closed?
@@ -647,11 +619,6 @@ public class SecureNio2Channel extends N
 if (!handshakeComplete) {
 throw new 
IllegalStateException(sm.getString("channel.nio.ssl.incompleteHandshake"));
 }
-if (readPending) {
-throw new ReadPendingException();
-} else {
-readPending = true;
-}
 return new FutureRead(dst);
 }
 
@@ -665,13 +632,12 @@ public class SecureNio2Channel extends N
 //are we closing or closed?
 if (closing || closed) {
 t = new IOException(sm.getString("channel.nio.ssl.closing"));
-return;
+   

Getting the context's session-tracking URI parameter name

2015-04-14 Thread Christopher Schultz
All,

I need to get the context's session-tracking URI parameter name from
within a Valve, and it looks like this is the right (static) call:

o.a.c.util.SessionConfig.getSessionUriParamName(request.getContext());

=2E.. but a quick reading of the code in there seems to reveal a
copy/paste error:

Starting on line SessionConfig.java:49

public static String getSessionUriParamName(Context context) {

String result =3D getConfiguredSessionCookieName(context);

if (result =3D=3D null) {
result =3D DEFAULT_SESSION_PARAMETER_NAME;
}

return result;
}

At first, I would have imagined that there was some breakage in the
trunk due to some refactoring, but it appears that the code is the same
all the way back to Tomcat 7.

I haven't tested it (and will), but it looks like if a non-default
cookie name is used, that same name will be used for the URI parameter
as well.

Is that by mistake or by design?

Thanks,
-chris



signature.asc
Description: OpenPGP digital signature


buildbot success in ASF Buildbot on tomcat-trunk

2015-04-14 Thread buildbot
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/1137

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] 1673555
Blamelist: 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



Re: Getting the context's session-tracking URI parameter name

2015-04-14 Thread Konstantin Kolinko
2015-04-15 1:09 GMT+03:00 Christopher Schultz :
> All,
>
> I need to get the context's session-tracking URI parameter name from
> within a Valve, and it looks like this is the right (static) call:
>
> o.a.c.util.SessionConfig.getSessionUriParamName(request.getContext());
>
> =2E.. but a quick reading of the code in there seems to reveal a
> copy/paste error:
>
> Starting on line SessionConfig.java:49
>
> public static String getSessionUriParamName(Context context) {
>
> String result =3D getConfiguredSessionCookieName(context);
>
> if (result =3D=3D null) {
> result =3D DEFAULT_SESSION_PARAMETER_NAME;
> }
>
> return result;
> }
>
> At first, I would have imagined that there was some breakage in the
> trunk due to some refactoring, but it appears that the code is the same
> all the way back to Tomcat 7.
>
> I haven't tested it (and will), but it looks like if a non-default
> cookie name is used, that same name will be used for the URI parameter
> as well.
>
> Is that by mistake or by design?


By design.

http://svn.apache.org/viewvc?view=revision&revision=r944920
https://bz.apache.org/bugzilla/show_bug.cgi?id=49299

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: r1673617 - /tomcat/native/branches/1.1.x/native/src/ssl.c

2015-04-14 Thread billbarker
Author: billbarker
Date: Wed Apr 15 02:08:02 2015
New Revision: 1673617

URL: http://svn.apache.org/r1673617
Log:
More cleanup of thread ID handling for openssl master plus remove compile 
warning that doesn't make any difference. Still no change if compiling against 
any currently released version of openssl

Modified:
tomcat/native/branches/1.1.x/native/src/ssl.c

Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1673617&r1=1673616&r2=1673617&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Wed Apr 15 02:08:02 2015
@@ -53,11 +53,15 @@ struct CRYPTO_dynlock_value {
  * Handle the Temporary RSA Keys and DH Params
  */
 
+#if (OPENSSL_VERSION_NUMBER < 0x1010L) || defined(OPENSSL_USE_DEPRECATED)
 #define SSL_TMP_KEY_FREE(type, idx) \
 if (SSL_temp_keys[idx]) {   \
 type##_free((type *)SSL_temp_keys[idx]);\
 SSL_temp_keys[idx] = NULL;  \
 } else (void)(0)
+#else
+#define SSL_TMP_KEY_FREE(type, idx)SSL_temp_keys[idx] = NULL
+#endif
 
 #define SSL_TMP_KEYS_FREE(type) \
 SSL_TMP_KEY_FREE(type, SSL_TMP_KEY_##type##_512);   \
@@ -315,7 +319,11 @@ static apr_status_t ssl_init_cleanup(voi
 #if OPENSSL_VERSION_NUMBER >= 0x00907001
 CRYPTO_cleanup_all_ex_data();
 #endif
+#if (OPENSSL_VERSION_NUMBER < 0x1010L) || defined(OPENSSL_USE_DEPRECATED)
 ERR_remove_state(0);
+#else
+ERR_remove_thread_state(NULL);
+#endif
 
 /* Don't call ERR_free_strings here; ERR_load_*_strings only
  * actually load the error strings once per process due to static
@@ -367,7 +375,6 @@ static void ssl_thread_lock(int mode, in
 }
 }
 
-#if (OPENSSL_VERSION_NUMBER < 0x1010L) || defined(OPENSSL_USE_DEPRECATED)
 static unsigned long ssl_thread_id(void)
 {
 /* OpenSSL needs this to return an unsigned long.  On OS/390, the pthread
@@ -387,7 +394,6 @@ static unsigned long ssl_thread_id(void)
 return (unsigned long)(apr_os_thread_current());
 #endif
 }
-#endif
 
 static apr_status_t ssl_thread_cleanup(void *data)
 {



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



[Bug 57815] New: Successful build against old OpenSSL leads to runtime error when parsing SSLProtocol

2015-04-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57815

Bug ID: 57815
   Summary: Successful build against old OpenSSL leads to runtime
error when parsing SSLProtocol
   Product: Tomcat Native
   Version: 1.1.33
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Library
  Assignee: dev@tomcat.apache.org
  Reporter: cry...@yahoo.com

Tomcat Native builds against older versions of OpenSSL, but then throws a
runtime error when parsing SSLProtocol. In my case, building Tomcat Native
1.1.33 on CentOS 6.2 against openssl-1.0.0-20.el6.x86_64 leads to the following
exception when parsing SSLProtocol="TLSv1+TLSv1.1+TLSv1.2" in server.xml, even
on latest CentOS 6.6 when linking openssl-1.0.1e-30.el6.8.x86_64.


 java.lang.Exception: Unable to create SSLContext. Check that SSLEngine is
enabled in the AprLifecycleListener, the AprLifecycleListener has initialised
correctly and that a valid SSLProtocol has been specified
at org.apache.tomcat.util.net.AprEndpoint.bind(AprEndpoint.java:532)
at
org.apache.tomcat.util.net.AbstractEndpoint.init(AbstractEndpoint.java:730)
at org.apache.coyote.AbstractProtocol.init(AbstractProtocol.java:456)
at
org.apache.catalina.connector.Connector.initInternal(Connector.java:960)
at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:102)
at
org.apache.catalina.core.StandardService.initInternal(StandardService.java:567)
at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:102)
at
org.apache.catalina.core.StandardServer.initInternal(StandardServer.java:842)
at org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:102)
at org.apache.catalina.startup.Catalina.load(Catalina.java:576)
at org.apache.catalina.startup.Catalina.load(Catalina.java:599)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:497)
at org.apache.catalina.startup.Bootstrap.load(Bootstrap.java:310)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:484)
Caused by: java.lang.Exception: Invalid Server SSL Protocol
(error::lib(0):func(0):reason(0))
at org.apache.tomcat.jni.SSLContext.make(Native Method)
at org.apache.tomcat.util.net.AprEndpoint.bind(AprEndpoint.java:527)
... 16 more


I suspect this same circumstance was reported here:
https://mail-archives.apache.org/mod_mbox/tomcat-users/201412.mbox/%3ccapvtzefzzw9l73d0s4b7rgq8dtxzcjkv8oo9smdqox+awxf...@mail.gmail.com%3e

Tomcat Native should probably have either configure or compile checks for
OpenSSL version or for supported protocols, it should dynamically support these
protocols as it dynamically links OpenSSL, or it should have better runtime
error logging.

No such error or exception occurs if I build and run against OpenSSL 1.0.1m on
CentOS 6.2.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



[GUMP@vmgump]: Project tomcat-tc8.0.x-validate (in module tomcat-8.0.x) failed

2015-04-14 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc8.0.x-validate has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 2 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-validate :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/index.html

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-validate.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 54 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 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.6-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-6.6-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150415.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.3.1-SNAPSHOT.j
 
ar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150415.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150415.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20150415.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-19.0-SNAPSHOT.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-8.0.x/build.xml

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

compile-prepare:

download-validate:

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

setproxy:

downloadfile:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-8.0.x/output/res/checkstyle
[checkstyle] Running Checkstyle 6.6-SNAPSHOT on 2936 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-8.0.x/webapps/docs/config/cluster-manager.xml:140:
 Line matches the illegal pattern '\s+$'.

BUILD FAILED
/srv/gump/public/workspace/tomcat-8.0.x/build.xml:537: Got 1 errors and 0 
warnings.

Total time: 54 seconds
-

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

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

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

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



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

2015-04-14 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-validate has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

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

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 60 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 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.6-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-6.6-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150415.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.3.1-SNAPSHOT.j
 
ar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150415.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150415.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20150415.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-19.0-SNAPSHOT.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

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

compile-prepare:

download-validate:

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

setproxy:

downloadfile:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle
[checkstyle] Running Checkstyle 6.6-SNAPSHOT on 2916 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java:24:8:
 Unused import - java.nio.channels.ReadPendingException.

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:550: Got 1 errors and 0 
warnings.

Total time: 1 minute 0 seconds
-

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

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

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

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



[Bug 57815] Improve error message when OpenSSL does not support the requested highest SSLProtocol

2015-04-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57815

Christopher Schultz  changed:

   What|Removed |Added

Summary|Successful build against|Improve error message when
   |old OpenSSL leads to|OpenSSL does not support
   |runtime error when parsing  |the requested highest
   |SSLProtocol |SSLProtocol
   Severity|normal  |enhancement

--- Comment #1 from Christopher Schultz  ---
I'm inclined to simply improve the error message, though it's already telling
you what is wrong: you are requesting a protocol it can't support. (Here, you
are requesting TLS1.2 which wasn't supported in your 1.0.0 version of OpenSSL
and so support wasn't compiled-in to the native library; the fact that you are
running it on 1.0.1 is unfortunately not relevant).

When configuring OpenSSL, we must try to instantiate a server "method" object
that implements the highest-allowed protocol. If there isn't any protocol match
between what you chose for your highest-level protocol version (TLS1.2 in this
case) and what the current library-version can support, then we will throw this
error.

Of course, we are essentially reporting that the error is "0" (no error),
probably because you built against 1.0.0 (max TLSv1.1) and you are requesting
TLS1.2, which isn't available, so we fall-through and choose no server method.
The null-check for the created-context fails and we assume there was an OpenSSL
error and throw an exception.

The behavior should still be the same (throw an exception), but we should give
the proper reason: we couldn't support your requested protocol and so we chose
*nothing*, rather than OpenSSL actually failing to initialize a particular
protocol.

> Tomcat Native should probably have either configure or compile checks for
> OpenSSL version

We have these checks in both configure (checks for an acceptable OpenSSL
version) and the pre-processor (to conditionally-compile support for various
supported protocols, etc.).

> or for supported protocols, it should dynamically support these protocols
> as it dynamically links OpenSSL

This is not possible in C. While the library is dynamically loaded at runtime,
the actual linking step is performed along with the compiler. Native libraries
aren't as flexible as Java is when it comes to discovering available functions
in library code.

> or it should have better runtime error logging.

This seems like a reasonable request. Marking as "enhancement" since the
behavior won't change.

-- 
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: Getting the context's session-tracking URI parameter name

2015-04-14 Thread Christopher Schultz
Konstantin,

On 4/14/15 7:36 PM, Konstantin Kolinko wrote:
> 2015-04-15 1:09 GMT+03:00 Christopher Schultz :
>> All,
>>
>> I need to get the context's session-tracking URI parameter name from
>> within a Valve, and it looks like this is the right (static) call:
>>
>> o.a.c.util.SessionConfig.getSessionUriParamName(request.getContext());
>>
>> =2E.. but a quick reading of the code in there seems to reveal a
>> copy/paste error:
>>
>> Starting on line SessionConfig.java:49
>>
>> public static String getSessionUriParamName(Context context) {
>>
>> String result =3D getConfiguredSessionCookieName(context);
>>
>> if (result =3D=3D null) {
>> result =3D DEFAULT_SESSION_PARAMETER_NAME;
>> }
>>
>> return result;
>> }
>>
>> At first, I would have imagined that there was some breakage in the
>> trunk due to some refactoring, but it appears that the code is the same
>> all the way back to Tomcat 7.
>>
>> I haven't tested it (and will), but it looks like if a non-default
>> cookie name is used, that same name will be used for the URI parameter
>> as well.
>>
>> Is that by mistake or by design?
> 
> 
> By design.
> 
> http://svn.apache.org/viewvc?view=revision&revision=r944920
> https://bz.apache.org/bugzilla/show_bug.cgi?id=49299

Perfect; thanks for the reference.

-chris



signature.asc
Description: OpenPGP digital signature


[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed

2015-04-14 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc8.0.x-test-apr has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 3 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-apr :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 mins 34 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-20150415-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150415/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150415.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150415-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest
 
.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150415/bin/openssl
 -Dexecute.test.bio=false -Dexecute.test.apr=true 
-Dtest.excludePerformance=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x

[Bug 57809] Don't store merged web.xml

2015-04-14 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57809

--- Comment #5 from Philippe Marschall  ---
The flag to log the merged web.xml is still in there.

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