svn commit: r1713220 - /tomcat/native/trunk/native/src/sslcontext.c
Author: jfclere
Date: Sun Nov 8 10:34:31 2015
New Revision: 1713220
URL: http://svn.apache.org/viewvc?rev=1713220&view=rev
Log:
Allow to use raw (well keystore) certificates and keys.
Modified:
tomcat/native/trunk/native/src/sslcontext.c
Modified: tomcat/native/trunk/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1713220&r1=1713219&r2=1713220&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Sun Nov 8 10:34:31 2015
@@ -974,6 +974,120 @@ cleanup:
return rv;
}
+TCN_IMPLEMENT_CALL(jboolean, SSLContext, setCertificateRaw)(TCN_STDARGS, jlong
ctx,
+ jbyteArray javaCert,
jbyteArray javaKey, jint idx)
+{
+#ifdef HAVE_ECC
+#if defined(SSL_CTX_set_ecdh_auto)
+EC_KEY *eckey = NULL;
+#endif
+#endif
+jsize lengthOfCert;
+unsigned char* cert;
+X509 * certs;
+EVP_PKEY * evp;
+const unsigned char *tmp;
+BIO * bio;
+
+tcn_ssl_ctxt_t *c = J2P(ctx, tcn_ssl_ctxt_t *);
+jboolean rv = JNI_TRUE;
+char err[256];
+
+/* we get the key contents into a byte array */
+jbyte* bufferPtr = (*e)->GetByteArrayElements(e, javaKey, NULL);
+jsize lengthOfKey = (*e)->GetArrayLength(e, javaKey);
+unsigned char* key = malloc(lengthOfKey);
+memcpy(key, bufferPtr, lengthOfKey);
+(*e)->ReleaseByteArrayElements(e, javaKey, bufferPtr, 0);
+
+bufferPtr = (*e)->GetByteArrayElements(e, javaCert, NULL);
+lengthOfCert = (*e)->GetArrayLength(e, javaCert);
+cert = malloc(lengthOfCert);
+memcpy(cert, bufferPtr, lengthOfCert);
+(*e)->ReleaseByteArrayElements(e, javaCert, bufferPtr, 0);
+
+UNREFERENCED(o);
+TCN_ASSERT(ctx != 0);
+
+if (idx < 0 || idx >= SSL_AIDX_MAX) {
+tcn_Throw(e, "Invalid key type");
+rv = JNI_FALSE;
+goto cleanup;
+}
+
+tmp = (const unsigned char *)cert;
+certs = d2i_X509(NULL, &tmp, lengthOfCert);
+if (certs == NULL) {
+ERR_error_string(ERR_get_error(), err);
+tcn_Throw(e, "Error reading certificat (%s)", err);
+rv = JNI_FALSE;
+goto cleanup;
+}
+if(c->certs[idx] != NULL) {
+free(c->certs[idx]);
+}
+c->certs[idx] = certs;
+
+bio = BIO_new(BIO_s_mem());
+BIO_write(bio, key, lengthOfKey);
+
+evp = PEM_read_bio_PrivateKey(bio, NULL, 0, NULL);
+if (evp == NULL) {
+BIO_free(bio);
+ERR_error_string(ERR_get_error(), err);
+tcn_Throw(e, "Error reading private key (%s)", err);
+rv = JNI_FALSE;
+goto cleanup;
+}
+BIO_free(bio);
+if(c->keys[idx] != NULL) {
+free(c->keys[idx]);
+}
+c->keys[idx] = evp;
+
+if (SSL_CTX_use_certificate(c->ctx, c->certs[idx]) <= 0) {
+ERR_error_string(ERR_get_error(), err);
+tcn_Throw(e, "Error setting certificate (%s)", err);
+rv = JNI_FALSE;
+goto cleanup;
+}
+if (SSL_CTX_use_PrivateKey(c->ctx, c->keys[idx]) <= 0) {
+ERR_error_string(ERR_get_error(), err);
+tcn_Throw(e, "Error setting private key (%s)", err);
+rv = JNI_FALSE;
+goto cleanup;
+}
+if (SSL_CTX_check_private_key(c->ctx) <= 0) {
+ERR_error_string(ERR_get_error(), err);
+tcn_Throw(e, "Private key does not match the certificate public key
(%s)",
+ err);
+rv = JNI_FALSE;
+goto cleanup;
+}
+
+/*
+ * TODO Try to read DH parameters from somewhere...
+ */
+
+#ifdef HAVE_ECC
+/*
+ * TODO try to read the ECDH curve name from somewhere...
+ */
+#if defined(SSL_CTX_set_ecdh_auto)
+SSL_CTX_set_ecdh_auto(c->ctx, 1);
+#else
+eckey = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
+SSL_CTX_set_tmp_ecdh(c->ctx, eckey);
+EC_KEY_free(eckey);
+#endif
+#endif
+SSL_CTX_set_tmp_dh_callback(c->ctx, SSL_callback_tmp_DH);
+cleanup:
+free(key);
+free(cert);
+return rv;
+}
+
static int ssl_array_index(apr_array_header_t *array,
const char *s)
{
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713221 - /tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
Author: jfclere
Date: Sun Nov 8 10:49:53 2015
New Revision: 1713221
URL: http://svn.apache.org/viewvc?rev=1713221&view=rev
Log:
Add the java of the native setCertificateRaw.
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java?rev=1713221&r1=1713220&r2=1713221&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java Sun Nov 8 10:49:53
2015
@@ -509,4 +509,15 @@ public final class SSLContext {
* @return {@code true} if success, {@code false} otherwise.
*/
public static native boolean setSessionIdContext(long ctx, byte[] sidCtx);
+
+/**
+ * Set CertificateRaw
+ *
+ * Use keystore a certificate and key to fill the BIOP
+ * @param ctx Server or Client context to use.
+ * @param cert Byte array with the certificate in DER encoding.
+ * @param key Byte array with the Private Key file in PEM format.
+ * @param idx Certificate index SSL_AIDX_RSA or SSL_AIDX_DSA.
+ */
+ public static native boolean setCertificateRaw(long ctx, byte[] cert,
byte[] key, int sslAidxRsa);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.2.2
I forgot (but that is not critical): - lots of javadocs warnings: org/apache/tomcat/jni/Address.java org/apache/tomcat/jni/Buffer.java org/apache/tomcat/jni/Directory.java org/apache/tomcat/jni/File.java org/apache/tomcat/jni/Global.java org/apache/tomcat/jni/Local.java org/apache/tomcat/jni/Lock.java org/apache/tomcat/jni/Mmap.java org/apache/tomcat/jni/Multicast.java org/apache/tomcat/jni/OS.java org/apache/tomcat/jni/Poll.java org/apache/tomcat/jni/Pool.java org/apache/tomcat/jni/Proc.java org/apache/tomcat/jni/Procattr.java most of them of type "no @return". Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713237 - /tomcat/native/trunk/TODO.txt
Author: rjung Date: Sun Nov 8 15:31:03 2015 New Revision: 1713237 URL: http://svn.apache.org/viewvc?rev=1713237&view=rev Log: Remove completed TODO item. Modified: tomcat/native/trunk/TODO.txt Modified: tomcat/native/trunk/TODO.txt URL: http://svn.apache.org/viewvc/tomcat/native/trunk/TODO.txt?rev=1713237&r1=1713236&r2=1713237&view=diff == --- tomcat/native/trunk/TODO.txt (original) +++ tomcat/native/trunk/TODO.txt Sun Nov 8 15:31:03 2015 @@ -84,11 +84,3 @@ http://git.savannah.gnu.org/gitweb/?p=co - Document build - Use consistent naming (1.1.22 used ...win32-ocsp..., 1.1.24 used ...ocsp-win32...) - - -Trunk -- - -Change release layout when releasing trunk: don't insert -the additional "jni" directory, instead keep layout in sync -between svn and source distribution. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713238 - in /tomcat/native/branches/1.1.x: ./ TODO.txt
Author: rjung Date: Sun Nov 8 15:34:07 2015 New Revision: 1713238 URL: http://svn.apache.org/viewvc?rev=1713238&view=rev Log: Remove TODO item completed for trunk and not relevant for the 1.1.x branch. Backport of r1713237 from trunk. Modified: tomcat/native/branches/1.1.x/ (props changed) tomcat/native/branches/1.1.x/TODO.txt Propchange: tomcat/native/branches/1.1.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Nov 8 15:34:07 2015 @@ -1,3 +1,3 @@ -/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1532601,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681306,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591,1711609,1711651 +/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1532601,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681306,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591,1711609,1711651,1713237 /tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769 /tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083 Modified: tomcat/native/branches/1.1.x/TODO.txt URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/TODO.txt?rev=1713238&r1=1713237&r2=1713238&view=diff == --- tomcat/native/branches/1.1.x/TODO.txt (original) +++ tomcat/native/branches/1.1.x/TODO.txt Sun Nov 8 15:34:07 2015 @@ -84,11 +84,3 @@ http://git.savannah.gnu.org/gitweb/?p=co - Document build - Use consistent naming (1.1.22 used ...win32-ocsp..., 1.1.24 used ...ocsp-win32...) - - -Trunk -- - -Change release layout when releasing trunk: don't insert -the additional "jni" directory, instead keep layout in sync -between svn and source distribution. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58481] JAX WS Request fails with "Premature end of file"
https://bz.apache.org/bugzilla/show_bug.cgi?id=58481 --- Comment #2 from Rainer Jung --- Can you please reproduce either with mod_jk and JkLogLevel trace8 or with mod_proxy_ajp and LogLevel trace8 and provide those logs? -- 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 58244] two way SSL loses client certificate after a few requests
https://bz.apache.org/bugzilla/show_bug.cgi?id=58244 --- Comment #7 from Rainer Jung --- Wy is there an expectation, that a client certificate is present when an ssl session is resumed? Isn't the client cert only needed during the initial handshake? I wouldn't expect it to be persistet on the server side and by available for followup requests as long as the ssl session is resumed and no new full handshake happens. -- 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: r1713248 - in /tomcat/trunk/java/org/apache: coyote/ajp/AjpNioProtocol.java coyote/http11/Http11NioProtocol.java tomcat/util/net/NioEndpoint.java
Author: markt
Date: Sun Nov 8 16:52:41 2015
New Revision: 1713248
URL: http://svn.apache.org/viewvc?rev=1713248&view=rev
Log:
No need for NioEndpoint.Handler.release() since if there is no
attachment there can't be an associated Processor to release
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1713248&r1=1713247&r2=1713248&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Sun Nov 8
16:52:41 2015
@@ -16,10 +16,6 @@
*/
package org.apache.coyote.ajp;
-import java.nio.channels.SocketChannel;
-import java.util.Iterator;
-
-import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.NioChannel;
@@ -69,31 +65,5 @@ public class AjpNioProtocol extends Abst
protected Log getLog() {
return log;
}
-
-/**
- * Expected to be used by the Poller to release resources on socket
- * close, errors etc.
- */
-@Override
-public void release(SocketChannel socket) {
-if (log.isDebugEnabled())
-log.debug(sm.getString("ajpnioprotocol.releaseStart", socket));
-boolean released = false;
-Iterator> it =
connections.entrySet().iterator();
-while (it.hasNext()) {
-java.util.Map.Entry entry = it.next();
-if (entry.getKey().getIOChannel()==socket) {
-it.remove();
-Processor result = entry.getValue();
-result.recycle();
-unregister(result);
-released = true;
-break;
-}
-}
-if (log.isDebugEnabled())
-log.debug(sm.getString("ajpnioprotocol.releaseEnd",
-socket, Boolean.valueOf(released)));
-}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1713248&r1=1713247&r2=1713248&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Sun Nov
8 16:52:41 2015
@@ -16,10 +16,6 @@
*/
package org.apache.coyote.http11;
-import java.nio.channels.SocketChannel;
-import java.util.Iterator;
-
-import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.NioChannel;
@@ -105,31 +101,5 @@ public class Http11NioProtocol extends A
protected Log getLog() {
return log;
}
-
-
-/**
- * Expected to be used by the Poller to release resources on socket
- * close, errors etc.
- */
-@Override
-public void release(SocketChannel socket) {
-if (log.isDebugEnabled())
-log.debug("Iterating through our connections to release a
socket channel:"+socket);
-boolean released = false;
-Iterator> it =
connections.entrySet().iterator();
-while (it.hasNext()) {
-java.util.Map.Entry entry = it.next();
-if (entry.getKey().getIOChannel()==socket) {
-it.remove();
-Processor result = entry.getValue();
-result.recycle();
-unregister(result);
-released = true;
-break;
-}
-}
-if (log.isDebugEnabled())
-log.debug("Done iterating through our connections to release a
socket channel:"+socket +" released:"+released);
-}
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1713248&r1=1713247&r2=1713248&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Sun Nov 8
16:52:41 2015
@@ -771,8 +771,11 @@ public class NioEndpoint extends Abstrac
try {
if ( key == null ) return null;//nothing to do
ka = (Nio
svn commit: r1713249 - in /tomcat/trunk/java/org/apache: coyote/AbstractProtocol.java coyote/ajp/AjpNio2Protocol.java coyote/http11/Http11Nio2Protocol.java tomcat/util/net/AbstractEndpoint.java tomcat
Author: markt
Date: Sun Nov 8 16:52:47 2015
New Revision: 1713249
URL: http://svn.apache.org/viewvc?rev=1713249&view=rev
Log:
Refactor closing of open NIO2 sockets so endpoint specific handlers are
no longer required.
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1713249&r1=1713248&r2=1713249&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Sun Nov 8
16:52:47 2015
@@ -882,6 +882,12 @@ public abstract class AbstractProtocol getOpenSockets() {
+return connections.keySet();
+}
+
+
/**
* Expected to be used by the handler once the processor is no longer
* required.
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java?rev=1713249&r1=1713248&r2=1713249&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Sun Nov 8
16:52:47 2015
@@ -67,13 +67,5 @@ public class AjpNio2Protocol extends Abs
protected Log getLog() {
return log;
}
-
-
-@Override
-public void closeAll() {
-for (Nio2Channel channel : connections.keySet()) {
-((Nio2Endpoint)
getProtocol().getEndpoint()).closeSocket(channel.getSocket());
-}
-}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1713249&r1=1713248&r2=1713249&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Sun Nov
8 16:52:47 2015
@@ -69,12 +69,5 @@ public class Http11Nio2Protocol extends
protected Log getLog() {
return log;
}
-
-@Override
-public void closeAll() {
-for (Nio2Channel channel : connections.keySet()) {
-((Nio2Endpoint)
getProtocol().getEndpoint()).closeSocket(channel.getSocket());
-}
-}
}
}
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=1713249&r1=1713248&r2=1713249&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Sun Nov
8 16:52:47 2015
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
@@ -82,6 +83,14 @@ public abstract class AbstractEndpoint getOpenSockets();
+
+/**
* Release any resources associated with the given SocketWrapper.
*
* @param socketWrapper The socketWrapper to release resources for
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1713249&r1=1713248&r2=1713249&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Sun Nov 8
16:52:47 2015
@@ -254,7 +254,9 @@ public class Nio2Endpoint extends Abstra
public void run() {
// Then close all active connections if any remain
try {
-handler.closeAll();
+for (Nio2Channel channel : handler.getOpenSockets()) {
+closeSocket(channel.getSocket());
+}
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
} finally {
@@ -1596
svn commit: r1713261 - /tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Author: markt
Date: Sun Nov 8 16:53:47 2015
New Revision: 1713261
URL: http://svn.apache.org/viewvc?rev=1713261&view=rev
Log:
Make ConnectionHandler fields private
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1713261&r1=1713260&r2=1713261&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Sun Nov 8
16:53:47 2015
@@ -660,11 +660,10 @@ public abstract class AbstractProtocol implements
AbstractEndpoint.Handler {
private final AbstractProtocol proto;
-
-protected final RequestGroupInfo global = new RequestGroupInfo();
-protected final AtomicLong registerCount = new AtomicLong(0);
-protected final ConcurrentHashMap connections = new
ConcurrentHashMap<>();
-protected final RecycledProcessors recycledProcessors = new
RecycledProcessors(this);
+private final RequestGroupInfo global = new RequestGroupInfo();
+private final AtomicLong registerCount = new AtomicLong(0);
+private final ConcurrentHashMap connections = new
ConcurrentHashMap<>();
+private final RecycledProcessors recycledProcessors = new
RecycledProcessors(this);
public ConnectionHandler(AbstractProtocol proto) {
this.proto = proto;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713256 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/AbstractHttp11Protocol.java
Author: markt
Date: Sun Nov 8 16:53:26 2015
New Revision: 1713256
URL: http://svn.apache.org/viewvc?rev=1713256&view=rev
Log:
Refactor to a single ConnectionHandler implementation
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1713256&r1=1713255&r2=1713256&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Sun Nov 8
16:53:26 2015
@@ -657,9 +657,11 @@ public abstract class AbstractProtocol
+protected static class ConnectionHandler
implements AbstractEndpoint.Handler {
+private final AbstractProtocol proto;
+
protected final RequestGroupInfo global = new RequestGroupInfo();
protected final AtomicLong registerCount = new AtomicLong(0);
@@ -669,7 +671,13 @@ public abstract class AbstractProtocol recycledProcessors =
new RecycledProcessors<>(this);
-protected abstract AbstractProtocol getProtocol();
+public ConnectionHandler(AbstractProtocol proto) {
+this.proto = proto;
+}
+
+protected AbstractProtocol getProtocol() {
+return proto;
+}
protected Log getLog() {
return getProtocol().getLog();
@@ -1010,10 +1018,10 @@ public abstract class AbstractProtocol
extends SynchronizedStack {
-private final transient AbstractConnectionHandler handler;
+private final transient ConnectionHandler handler;
protected final AtomicInteger size = new AtomicInteger(0);
-public RecycledProcessors(AbstractConnectionHandler handler) {
+public RecycledProcessors(ConnectionHandler handler) {
this.handler = handler;
}
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=1713256&r1=1713255&r2=1713256&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Sun Nov 8
16:53:26 2015
@@ -48,7 +48,7 @@ public abstract class AbstractAjpProtoco
setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
// AJP does not use Send File
getEndpoint().setUseSendfile(false);
-AjpConnectionHandler cHandler = new AjpConnectionHandler<>(this);
+ConnectionHandler cHandler = new
ConnectionHandler<>(this);
setHandler(cHandler);
getEndpoint().setHandler(cHandler);
}
@@ -175,20 +175,4 @@ public abstract class AbstractAjpProtoco
// TODO should fail - throw IOE
return null;
}
-
-
-protected static class AjpConnectionHandler
-extends AbstractConnectionHandler {
-
-private final AbstractAjpProtocol proto;
-
-public AjpConnectionHandler(AbstractAjpProtocol proto) {
-this.proto = proto;
-}
-
-@Override
-protected AbstractAjpProtocol getProtocol() {
-return proto;
-}
-}
}
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=1713256&r1=1713255&r2=1713256&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Sun
Nov 8 16:53:26 2015
@@ -52,7 +52,7 @@ public abstract class AbstractHttp11Prot
public AbstractHttp11Protocol(AbstractEndpoint endpoint) {
super(endpoint);
setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
-Http11ConnectionHandler cHandler = new
Http11ConnectionHandler<>(this);
+ConnectionHandler cHandler = new
ConnectionHandler<>(this);
setHandler(cHandler);
getEndpoint().setHandler(cHandler);
}
@@ -650,22 +650,4 @@ public abstract class AbstractHttp11Prot
return new UpgradeProcessorExternal(socket, leftoverInput,
upgradeToken);
}
}
-
-
-protected static class Http11ConnectionHandler
-extends AbstractConnectionHandler {
-
-private final AbstractHttp11Protocol proto;
-
-
-protected Http11ConnectionHandler(AbstractHttp11Protocol proto) {
-this.proto = proto;
-}
-
-
-@Ov
svn commit: r1713251 - in /tomcat/trunk/java/org/apache: coyote/http11/ tomcat/util/net/
Author: markt
Date: Sun Nov 8 16:53:00 2015
New Revision: 1713251
URL: http://svn.apache.org/viewvc?rev=1713251&view=rev
Log:
Pull up handler field to AbstractEndpoint
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.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/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
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=1713251&r1=1713250&r2=1713251&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Sun Nov
8 16:53:00 2015
@@ -37,7 +37,7 @@ public class Http11AprProtocol extends A
super(new AprEndpoint());
Http11ConnectionHandler cHandler = new
Http11ConnectionHandler<>(this);
setHandler(cHandler);
-((AprEndpoint) getEndpoint()).setHandler(cHandler);
+getEndpoint().setHandler(cHandler);
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1713251&r1=1713250&r2=1713251&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Sun Nov
8 16:53:00 2015
@@ -34,7 +34,7 @@ public class Http11Nio2Protocol extends
super(new Nio2Endpoint());
Http11ConnectionHandler cHandler = new
Http11ConnectionHandler<>(this);
setHandler(cHandler);
-((Nio2Endpoint) getEndpoint()).setHandler(cHandler);
+getEndpoint().setHandler(cHandler);
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1713251&r1=1713250&r2=1713251&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Sun Nov
8 16:53:00 2015
@@ -39,7 +39,7 @@ public class Http11NioProtocol extends A
super(new NioEndpoint());
Http11ConnectionHandler cHandler = new
Http11ConnectionHandler<>(this);
setHandler(cHandler);
-((NioEndpoint) getEndpoint()).setHandler(cHandler);
+getEndpoint().setHandler(cHandler);
}
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=1713251&r1=1713250&r2=1713251&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Sun Nov
8 16:53:00 2015
@@ -533,6 +533,15 @@ public abstract class AbstractEndpoint 0);
}
+
+/**
+ * Handling of accepted sockets.
+ */
+private Handler handler = null;
+public void setHandler(Handler handler ) { this.handler = handler; }
+public Handler getHandler() { return handler; }
+
+
/**
* Attributes provide a way for configuration to be passed to
sub-components
* without the {@link org.apache.coyote.ProtocolHandler} being aware of the
@@ -849,9 +858,6 @@ public abstract class AbstractEndpoint getHandler();
-
protected abstract Log getLog();
protected LimitLatch initializeConnectionLatch() {
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=1713251&r1=1713250&r2=1713251&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Sun Nov 8
16:53:00 2015
@@ -134,15 +134,6 @@ public class AprEndpoint extends Abstrac
/**
- * Handling of accepted sockets.
- */
-protected Handler handler = null;
-public void setHandler(Handler handler ) { this.handler = handler; }
-@Override
-public Handler getHandler() { return handler; }
-
-
-/**
* Poll interval
svn commit: r1713259 - /tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Author: markt
Date: Sun Nov 8 16:53:39 2015
New Revision: 1713259
URL: http://svn.apache.org/viewvc?rev=1713259&view=rev
Log:
RecycledProcessors does not need to use genercis
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1713259&r1=1713258&r2=1713259&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Sun Nov 8
16:53:39 2015
@@ -667,8 +667,7 @@ public abstract class AbstractProtocol connections =
new ConcurrentHashMap<>();
-protected final RecycledProcessors recycledProcessors =
-new RecycledProcessors<>(this);
+protected final RecycledProcessors recycledProcessors = new
RecycledProcessors(this);
public ConnectionHandler(AbstractProtocol proto) {
this.proto = proto;
@@ -1014,12 +1013,12 @@ public abstract class AbstractProtocol extends
SynchronizedStack {
+protected static class RecycledProcessors extends
SynchronizedStack {
-private final transient ConnectionHandler handler;
+private final transient ConnectionHandler handler;
protected final AtomicInteger size = new AtomicInteger(0);
-public RecycledProcessors(ConnectionHandler handler) {
+public RecycledProcessors(ConnectionHandler handler) {
this.handler = handler;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713250 - in /tomcat/trunk/java/org/apache: coyote/ajp/ coyote/http11/ tomcat/util/net/
Author: markt
Date: Sun Nov 8 16:52:54 2015
New Revision: 1713250
URL: http://svn.apache.org/viewvc?rev=1713250&view=rev
Log:
Remove endpoint specific Handler interfaces since they are no longer
required.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
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=1713250&r1=1713249&r2=1713250&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Sun Nov 8
16:52:54 2015
@@ -21,6 +21,7 @@ import java.nio.ByteBuffer;
import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.UpgradeProtocol;
import org.apache.coyote.UpgradeToken;
+import org.apache.juli.logging.Log;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -161,12 +162,12 @@ public abstract class AbstractAjpProtoco
processor.setClientCertProvider(getClientCertProvider());
}
-protected abstract static class AbstractAjpConnectionHandler
+protected static class AjpConnectionHandler
extends AbstractConnectionHandler {
private final AbstractAjpProtocol proto;
-public AbstractAjpConnectionHandler(AbstractAjpProtocol proto) {
+public AjpConnectionHandler(AbstractAjpProtocol proto) {
this.proto = proto;
}
@@ -191,5 +192,10 @@ public abstract class AbstractAjpProtoco
// TODO should fail - throw IOE
return null;
}
+
+@Override
+protected Log getLog() {
+return proto.getLog();
+}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1713250&r1=1713249&r2=1713250&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Sun Nov 8
16:52:54 2015
@@ -44,7 +44,7 @@ public class AjpAprProtocol extends Abst
public AjpAprProtocol() {
super(new AprEndpoint());
-AjpConnectionHandler cHandler = new AjpConnectionHandler(this);
+AjpConnectionHandler cHandler = new AjpConnectionHandler<>(this);
setHandler(cHandler);
((AprEndpoint) getEndpoint()).setHandler(cHandler);
}
@@ -62,20 +62,4 @@ public class AjpAprProtocol extends Abst
protected String getNamePrefix() {
return ("ajp-apr");
}
-
-
-// -- AjpConnectionHandler Inner Class
-
-protected static class AjpConnectionHandler
-extends AbstractAjpConnectionHandler {
-
-public AjpConnectionHandler(AjpAprProtocol proto) {
-super(proto);
-}
-
-@Override
-protected Log getLog() {
-return log;
-}
-}
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java?rev=1713250&r1=1713249&r2=1713250&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Sun Nov 8
16:52:54 2015
@@ -20,7 +20,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.Nio2Channel;
import org.apache.tomcat.util.net.Nio2Endpoint;
-import org.apache.tomcat.util.net.Nio2Endpoint.Handler;
/**
@@ -38,7 +37,7 @@ public class AjpNio2Protocol extends Abs
public AjpNio2Protocol() {
super(new Nio2Endpoint());
-AjpConnectionHandler cHandler = new AjpConnectionHandler(this);
+AjpConnectionHandler cHandler = new
AjpConnectionHandler<>(this);
setHandler(cHandler);
((Nio2Endpoint) getEndpoint()).setHandler(cHandler);
}
@@ -50,22
svn commit: r1713257 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/AbstractHttp11Protocol.java
Author: markt
Date: Sun Nov 8 16:53:31 2015
New Revision: 1713257
URL: http://svn.apache.org/viewvc?rev=1713257&view=rev
Log:
ConnectionHandler is independent of ProcessorType
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1713257&r1=1713256&r2=1713257&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Sun Nov 8
16:53:31 2015
@@ -657,7 +657,7 @@ public abstract class AbstractProtocol
+protected static class ConnectionHandler
implements AbstractEndpoint.Handler {
private final AbstractProtocol proto;
@@ -668,7 +668,7 @@ public abstract class AbstractProtocol connections =
new ConcurrentHashMap<>();
-protected final RecycledProcessors recycledProcessors =
+protected final RecycledProcessors recycledProcessors =
new RecycledProcessors<>(this);
public ConnectionHandler(AbstractProtocol proto) {
@@ -1015,13 +1015,12 @@ public abstract class AbstractProtocol
-extends SynchronizedStack {
+protected static class RecycledProcessors extends
SynchronizedStack {
-private final transient ConnectionHandler handler;
+private final transient ConnectionHandler handler;
protected final AtomicInteger size = new AtomicInteger(0);
-public RecycledProcessors(ConnectionHandler handler) {
+public RecycledProcessors(ConnectionHandler handler) {
this.handler = handler;
}
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=1713257&r1=1713256&r2=1713257&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Sun Nov 8
16:53:31 2015
@@ -48,7 +48,7 @@ public abstract class AbstractAjpProtoco
setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
// AJP does not use Send File
getEndpoint().setUseSendfile(false);
-ConnectionHandler cHandler = new
ConnectionHandler<>(this);
+ConnectionHandler cHandler = new ConnectionHandler<>(this);
setHandler(cHandler);
getEndpoint().setHandler(cHandler);
}
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=1713257&r1=1713256&r2=1713257&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Sun
Nov 8 16:53:31 2015
@@ -52,7 +52,7 @@ public abstract class AbstractHttp11Prot
public AbstractHttp11Protocol(AbstractEndpoint endpoint) {
super(endpoint);
setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
-ConnectionHandler cHandler = new
ConnectionHandler<>(this);
+ConnectionHandler cHandler = new ConnectionHandler<>(this);
setHandler(cHandler);
getEndpoint().setHandler(cHandler);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713260 - /tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Author: markt
Date: Sun Nov 8 16:53:43 2015
New Revision: 1713260
URL: http://svn.apache.org/viewvc?rev=1713260&view=rev
Log:
Format
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1713260&r1=1713259&r2=1713260&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Sun Nov 8
16:53:43 2015
@@ -663,10 +663,7 @@ public abstract class AbstractProtocol connections =
-new ConcurrentHashMap<>();
-
+protected final ConcurrentHashMap connections = new
ConcurrentHashMap<>();
protected final RecycledProcessors recycledProcessors = new
RecycledProcessors(this);
public ConnectionHandler(AbstractProtocol proto) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713253 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/AbstractHttp11Protocol.java
Author: markt
Date: Sun Nov 8 16:53:11 2015
New Revision: 1713253
URL: http://svn.apache.org/viewvc?rev=1713253&view=rev
Log:
Pull up getLog()
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1713253&r1=1713252&r2=1713253&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Sun Nov 8
16:53:11 2015
@@ -646,8 +646,6 @@ public abstract class AbstractProtocol
implements AbstractEndpoint.Handler {
-protected abstract Log getLog();
-
protected final RequestGroupInfo global = new RequestGroupInfo();
protected final AtomicLong registerCount = new AtomicLong(0);
@@ -657,9 +655,11 @@ public abstract class AbstractProtocol recycledProcessors =
new RecycledProcessors<>(this);
-
protected abstract AbstractProtocol getProtocol();
+protected Log getLog() {
+return getProtocol().getLog();
+}
@Override
public Object getGlobal() {
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=1713253&r1=1713252&r2=1713253&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Sun Nov 8
16:53:11 2015
@@ -21,7 +21,6 @@ import java.nio.ByteBuffer;
import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.UpgradeProtocol;
import org.apache.coyote.UpgradeToken;
-import org.apache.juli.logging.Log;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -195,10 +194,5 @@ public abstract class AbstractAjpProtoco
// TODO should fail - throw IOE
return null;
}
-
-@Override
-protected Log getLog() {
-return proto.getLog();
-}
}
}
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=1713253&r1=1713252&r2=1713253&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Sun
Nov 8 16:53:11 2015
@@ -38,7 +38,6 @@ import org.apache.coyote.UpgradeToken;
import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler;
import org.apache.coyote.http11.upgrade.UpgradeProcessorExternal;
import org.apache.coyote.http11.upgrade.UpgradeProcessorInternal;
-import org.apache.juli.logging.Log;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -676,11 +675,5 @@ public abstract class AbstractHttp11Prot
return new UpgradeProcessorExternal(socket, leftoverInput,
upgradeToken);
}
}
-
-
-@Override
-protected Log getLog() {
-return proto.getLog();
-}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713252 - in /tomcat/trunk/java/org/apache/coyote: ajp/ http11/
Author: markt
Date: Sun Nov 8 16:53:06 2015
New Revision: 1713252
URL: http://svn.apache.org/viewvc?rev=1713252&view=rev
Log:
Pull up creation of Handler
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
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=1713252&r1=1713251&r2=1713252&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Sun Nov 8
16:53:06 2015
@@ -48,6 +48,9 @@ public abstract class AbstractAjpProtoco
setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
// AJP does not use Send File
getEndpoint().setUseSendfile(false);
+AjpConnectionHandler cHandler = new AjpConnectionHandler<>(this);
+setHandler(cHandler);
+getEndpoint().setHandler(cHandler);
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1713252&r1=1713251&r2=1713252&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Sun Nov 8
16:53:06 2015
@@ -44,9 +44,6 @@ public class AjpAprProtocol extends Abst
public AjpAprProtocol() {
super(new AprEndpoint());
-AjpConnectionHandler cHandler = new AjpConnectionHandler<>(this);
-setHandler(cHandler);
-((AprEndpoint) getEndpoint()).setHandler(cHandler);
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java?rev=1713252&r1=1713251&r2=1713252&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Sun Nov 8
16:53:06 2015
@@ -37,9 +37,6 @@ public class AjpNio2Protocol extends Abs
public AjpNio2Protocol() {
super(new Nio2Endpoint());
-AjpConnectionHandler cHandler = new
AjpConnectionHandler<>(this);
-setHandler(cHandler);
-((Nio2Endpoint) getEndpoint()).setHandler(cHandler);
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1713252&r1=1713251&r2=1713252&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Sun Nov 8
16:53:06 2015
@@ -36,9 +36,6 @@ public class AjpNioProtocol extends Abst
public AjpNioProtocol() {
super(new NioEndpoint());
-AjpConnectionHandler cHandler = new
AjpConnectionHandler<>(this);
-setHandler(cHandler);
-((NioEndpoint) getEndpoint()).setHandler(cHandler);
}
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=1713252&r1=1713251&r2=1713252&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Sun
Nov 8 16:53:06 2015
@@ -53,6 +53,9 @@ public abstract class AbstractHttp11Prot
public AbstractHttp11Protocol(AbstractEndpoint endpoint) {
super(endpoint);
setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
+Http11ConnectionHandler cHandler = new
Http11ConnectionHandler<>(this);
+setHandler(cHandler);
+getEndpoint().setHandler(cHandler);
}
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=1713252&r1=1713251&r2=1713252&view=diff
=
svn commit: r1713258 - /tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Author: markt
Date: Sun Nov 8 16:53:35 2015
New Revision: 1713258
URL: http://svn.apache.org/viewvc?rev=1713258&view=rev
Log:
Formatting
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1713258&r1=1713257&r2=1713258&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Sun Nov 8
16:53:35 2015
@@ -657,8 +657,7 @@ public abstract class AbstractProtocol
-implements AbstractEndpoint.Handler {
+protected static class ConnectionHandler implements
AbstractEndpoint.Handler {
private final AbstractProtocol proto;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713255 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/AbstractHttp11Protocol.java
Author: markt
Date: Sun Nov 8 16:53:21 2015
New Revision: 1713255
URL: http://svn.apache.org/viewvc?rev=1713255&view=rev
Log:
Move UpgradeProcessor creation from the ConnectionHandler to the
Protocol
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1713255&r1=1713254&r2=1713255&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Sun Nov 8
16:53:21 2015
@@ -428,6 +428,11 @@ public abstract class AbstractProtocol socket, ByteBuffer leftoverInput,
+UpgradeToken upgradeToken) throws IOException;
+
+
// - JMX related
methods
protected String domain;
@@ -756,7 +761,7 @@ public abstract class AbstractProtocol socket, ByteBuffer leftoverInput,
-UpgradeToken upgradeToken) throws IOException;
-
-
protected void register(Processor processor) {
if (getProtocol().getDomain() != null) {
synchronized (this) {
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=1713255&r1=1713254&r2=1713255&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Sun Nov 8
16:53:21 2015
@@ -169,6 +169,14 @@ public abstract class AbstractAjpProtoco
}
+@Override
+protected Processor createUpgradeProcessor(SocketWrapperBase socket,
+ByteBuffer leftoverInput, UpgradeToken upgradeToken) {
+// TODO should fail - throw IOE
+return null;
+}
+
+
protected static class AjpConnectionHandler
extends AbstractConnectionHandler {
@@ -182,13 +190,5 @@ public abstract class AbstractAjpProtoco
protected AbstractAjpProtocol getProtocol() {
return proto;
}
-
-
-@Override
-protected AjpProcessor createUpgradeProcessor(SocketWrapperBase
socket,
-ByteBuffer leftoverInput, UpgradeToken upgradeToken) {
-// TODO should fail - throw IOE
-return null;
-}
}
}
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=1713255&r1=1713254&r2=1713255&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Sun
Nov 8 16:53:21 2015
@@ -638,6 +638,20 @@ public abstract class AbstractHttp11Prot
}
+@Override
+protected Processor createUpgradeProcessor(
+SocketWrapperBase socket, ByteBuffer leftoverInput,
+UpgradeToken upgradeToken)
+throws IOException {
+HttpUpgradeHandler httpUpgradeHandler =
upgradeToken.getHttpUpgradeHandler();
+if (httpUpgradeHandler instanceof InternalHttpUpgradeHandler) {
+return new UpgradeProcessorInternal(socket, leftoverInput,
upgradeToken);
+} else {
+return new UpgradeProcessorExternal(socket, leftoverInput,
upgradeToken);
+}
+}
+
+
protected static class Http11ConnectionHandler
extends AbstractConnectionHandler {
@@ -653,19 +667,5 @@ public abstract class AbstractHttp11Prot
protected AbstractHttp11Protocol getProtocol() {
return proto;
}
-
-
-@Override
-protected Processor createUpgradeProcessor(
-SocketWrapperBase socket, ByteBuffer leftoverInput,
-UpgradeToken upgradeToken)
-throws IOException {
-HttpUpgradeHandler httpUpgradeHandler =
upgradeToken.getHttpUpgradeHandler();
-if (httpUpgradeHandler instanceof InternalHttpUpgradeHandler) {
-return new UpgradeProcessorInternal(socket, leftoverInput,
upgradeToken);
-} else {
-return new UpgradeProcessorExternal(socket, leftoverInput,
upgradeToken);
-}
-}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713254 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/AbstractHttp11Protocol.java
Author: markt
Date: Sun Nov 8 16:53:16 2015
New Revision: 1713254
URL: http://svn.apache.org/viewvc?rev=1713254&view=rev
Log:
Move Processor creation from the ConnectionHandler to the Protocol
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1713254&r1=1713253&r2=1713254&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Sun Nov 8
16:53:16 2015
@@ -419,6 +419,15 @@ public abstract class AbstractProtocol socket, Processor
processor) {
if (!processor.isAsync()) {
@@ -930,7 +938,7 @@ public abstract class AbstractProtocolhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1713254&r1=1713253&r2=1713254&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Sun Nov 8
16:53:16 2015
@@ -19,6 +19,7 @@ package org.apache.coyote.ajp;
import java.nio.ByteBuffer;
import org.apache.coyote.AbstractProtocol;
+import org.apache.coyote.Processor;
import org.apache.coyote.UpgradeProtocol;
import org.apache.coyote.UpgradeToken;
import org.apache.tomcat.util.net.AbstractEndpoint;
@@ -155,15 +156,19 @@ public abstract class AbstractAjpProtoco
}
-protected void configureProcessor(AjpProcessor processor) {
+@Override
+protected Processor createProcessor() {
+AjpProcessor processor = new AjpProcessor(getPacketSize(),
getEndpoint());
processor.setAdapter(getAdapter());
processor.setTomcatAuthentication(getTomcatAuthentication());
processor.setTomcatAuthorization(getTomcatAuthorization());
processor.setRequiredSecret(requiredSecret);
processor.setKeepAliveTimeout(getKeepAliveTimeout());
processor.setClientCertProvider(getClientCertProvider());
+return processor;
}
+
protected static class AjpConnectionHandler
extends AbstractConnectionHandler {
@@ -179,15 +184,6 @@ public abstract class AbstractAjpProtoco
}
-@Override
-protected AjpProcessor createProcessor() {
-AjpProcessor processor = new AjpProcessor(proto.getPacketSize(),
proto.getEndpoint());
-proto.configureProcessor(processor);
-register(processor);
-return processor;
-}
-
-
@Override
protected AjpProcessor createUpgradeProcessor(SocketWrapperBase
socket,
ByteBuffer leftoverInput, UpgradeToken upgradeToken) {
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=1713254&r1=1713253&r2=1713254&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Sun
Nov 8 16:53:16 2015
@@ -618,8 +618,11 @@ public abstract class AbstractHttp11Prot
// - Common
code
-// Common configuration required for all new HTTP11 processors
-protected void configureProcessor(Http11Processor processor) {
+@Override
+protected Processor createProcessor() {
+Http11Processor processor = new
Http11Processor(getMaxHttpHeaderSize(), getEndpoint(),
+getMaxTrailerSize(), allowedTrailerHeaders,
getMaxExtensionSize(),
+getMaxSwallowSize(), httpUpgradeProtocols);
processor.setAdapter(getAdapter());
processor.setMaxKeepAliveRequests(getMaxKeepAliveRequests());
processor.setConnectionUploadTimeout(getConnectionUploadTimeout());
@@ -631,6 +634,7 @@ public abstract class AbstractHttp11Prot
processor.setRestrictedUserAgents(getRestrictedUserAgents());
processor.setMaxSavePostSize(getMaxSavePostSize());
processor.setServer(getServer());
+return processor;
}
@@ -651,18 +655,6 @@ public abstract class AbstractHttp11Prot
}
-@Override
-public Http11Processor createProcessor() {
-Http11Processor processor = new Http11Processor(
-proto.getMaxHttpHeaderSize(), proto.getEndpoint(),
proto.getMaxTrailerSize(),
-proto.allowedTrailerHeaders, prot
[Bug 58244] two way SSL loses client certificate after a few requests
https://bz.apache.org/bugzilla/show_bug.cgi?id=58244 --- Comment #8 from Petr Brouzda --- (In reply to Rainer Jung from comment #7) Two reasons: 1) It makes client certificate UNUSABLE for authentication if client cert information are not present on subsequent HTTP requests. SSL session can be started OUTSIDE of my application - for example when there are more than one apps on the server. So client works with application A... and then he send request to application B. It is single SSL session for his browser, so application B won't receive client certificate info? Bad behaviour, I think. 2) This behaviour is specific for Tomcat with APR. In any other environment I know (Tomcat with standard JSSE, IBM WebSphere) it works correctly - client certificate information are present for every request, regardless of SSL sessions. So application that works correctly with Tomcat/JSSE and with IBM WebSphere will fail on Tomcat/APR. -- 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: r1713262 - /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java
Author: markt
Date: Sun Nov 8 17:11:34 2015
New Revision: 1713262
URL: http://svn.apache.org/viewvc?rev=1713262&view=rev
Log:
Mark unused constant as unused and deprecate it.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java?rev=1713262&r1=1713261&r2=1713262&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java
Sun Nov 8 17:11:34 2015
@@ -34,6 +34,10 @@ public class Constants {
// Executor configuration
public static final String EXECUTOR_CORE_SIZE_INIT_PARAM =
"org.apache.tomcat.websocket.executorCoreSize";
+/**
+ * @deprecated No longer used and will be removed in Tomcat 9.0.x
+ */
+@Deprecated
public static final String EXECUTOR_MAX_SIZE_INIT_PARAM =
"org.apache.tomcat.websocket.executorMaxSize";
public static final String EXECUTOR_KEEPALIVETIME_SECONDS_INIT_PARAM =
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1713193 - /tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
On 07/11/2015 23:00, Konstantin Kolinko wrote:
> 2015-11-08 1:38 GMT+03:00 :
>> Author: markt
>> Date: Sat Nov 7 22:38:18 2015
>> New Revision: 1713193
>>
>> URL: http://svn.apache.org/viewvc?rev=1713193&view=rev
>> Log:
>> Remove unused constant.
>> Reported by UC Detector
>>
>> Modified:
>> tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
>>
>> Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java?rev=1713193&r1=1713192&r2=1713193&view=diff
>> ==
>> --- tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java
>> (original)
>> +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/Constants.java Sat
>> Nov 7 22:38:18 2015
>> @@ -31,8 +31,6 @@ public class Constants {
>> // Executor configuration
>> public static final String EXECUTOR_CORE_SIZE_INIT_PARAM =
>> "org.apache.tomcat.websocket.executorCoreSize";
>> -public static final String EXECUTOR_MAX_SIZE_INIT_PARAM =
>> -"org.apache.tomcat.websocket.executorMaxSize";
>> public static final String EXECUTOR_KEEPALIVETIME_SECONDS_INIT_PARAM =
>> "org.apache.tomcat.websocket.executorKeepAliveTimeSeconds";
>
>
> Deprecate in 8.0.x ?
Done. Tx.
Mark
> For a reference:
> This parameter was removed (hard-coded as Integer.MAX_VALUE) as the
> fix for BZ 56577.
> https://bz.apache.org/bugzilla/show_bug.cgi?id=56577
> http://svn.apache.org/r1600743
>
> Documentation is OK, this parameter is not mentioned there.:
> web-socket-howto.xml was updated by BZ 56577 fix/
>
> 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
svn commit: r1713264 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/server/Constants.java
Author: markt Date: Sun Nov 8 17:12:40 2015 New Revision: 1713264 URL: http://svn.apache.org/viewvc?rev=1713264&view=rev Log: Mark unused constant as unused and deprecate it. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/Constants.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Nov 8 17:12:40 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702 748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712899,1712903,1712906,1712975,1713185 +/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702 748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712899,1712903,1712906,1712975,1713185,1713262 /
svn commit: r1713277 - in /tomcat/trunk/java/org/apache/tomcat/util/net: SSLHostConfigCertificate.java openssl/CipherSuiteConverter.java openssl/OpenSSLContext.java openssl/OpenSSLKeyManager.java
Author: jfclere
Date: Sun Nov 8 18:03:26 2015
New Revision: 1713277
URL: http://svn.apache.org/viewvc?rev=1713277&view=rev
Log:
Allow to use java keystore with the openssl engine.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLKeyManager.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java?rev=1713277&r1=1713276&r2=1713277&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Sun Nov 8 18:03:26 2015
@@ -28,7 +28,7 @@ public class SSLHostConfigCertificate {
public static final Type DEFAULT_TYPE = Type.UNDEFINED;
static final String DEFAULT_KEYSTORE_PROVIDER =
-System.getProperty("javax.net.ssl.keyStoreProvider");
+System.getProperty("javax.net.ssl.keyStoreProvider", "SunX509");
static final String DEFAULT_KEYSTORE_TYPE =
System.getProperty("javax.net.ssl.keyStoreType", "JKS");
@@ -43,7 +43,7 @@ public class SSLHostConfigCertificate {
private String certificateKeyPassword = null;
// JSSE
-private String certificateKeyAlias;
+private String certificateKeyAlias = "tomcat";
private String certificateKeystorePassword = "changeit";
private String certificateKeystoreFile =
System.getProperty("user.home")+"/.keystore";
private String certificateKeystoreProvider = DEFAULT_KEYSTORE_PROVIDER;
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java?rev=1713277&r1=1713276&r2=1713277&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
Sun Nov 8 18:03:26 2015
@@ -182,9 +182,11 @@ public final class CipherSuiteConverter
p2j.put("TLS", "TLS_" + javaCipherSuiteSuffix);
o2j.put(openSslCipherSuite, p2j);
+/* TODO the log looks broken...
if (logger.isDebugEnabled()) {
logger.debug(sm.getString("converter.mapping", javaCipherSuite,
openSslCipherSuite));
}
+*/
return openSslCipherSuite;
}
@@ -313,10 +315,12 @@ public final class CipherSuiteConverter
j2o.putIfAbsent(javaCipherSuiteTls, openSslCipherSuite);
j2o.putIfAbsent(javaCipherSuiteSsl, openSslCipherSuite);
+/* TODO the log looks broken...
if (logger.isDebugEnabled()) {
logger.debug(sm.getString("converter.mapping", javaCipherSuiteTls,
openSslCipherSuite));
logger.debug(sm.getString("converter.mapping", javaCipherSuiteSsl,
openSslCipherSuite));
}
+*/
return p2j;
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1713277&r1=1713276&r2=1713277&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Sun Nov 8 18:03:26 2015
@@ -17,17 +17,28 @@
package org.apache.tomcat.util.net.openssl;
import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
import java.security.SecureRandom;
+import java.security.UnrecoverableKeyException;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.PKCS8EncodedKeySpec;
import java.util.ArrayList;
+import java.util.Base64;
import java.util.List;
+import java.util.Set;
import java.util.StringTokenizer;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
@@ -38,12 +49,14 @@ import javax.crypto.SecretKe
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/592 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] 1713277 Blamelist: jfclere 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: r1713285 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/session/ java/org/apache/catalina/util/ test/org/apache/catalina/util/
Author: markt
Date: Sun Nov 8 20:05:27 2015
New Revision: 1713285
URL: http://svn.apache.org/viewvc?rev=1713285&view=rev
Log:
Add the ability to validate client provided session IDs and implement basic
validation for the Standard session ID generator.
Added:
tomcat/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/SessionIdGenerator.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
tomcat/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java
Modified: tomcat/trunk/java/org/apache/catalina/SessionIdGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/SessionIdGenerator.java?rev=1713285&r1=1713284&r2=1713285&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/SessionIdGenerator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/SessionIdGenerator.java Sun Nov 8
20:05:27 2015
@@ -56,4 +56,17 @@ public interface SessionIdGenerator {
*/
public String generateSessionId(String route);
+/**
+ * Determine, based on implementation specific rules which may be as strict
+ * or as relaxed as the implementor wishes, if the provided session ID is
+ * valid. This may be used when generating sessions with user provided
+ * session IDs to ensure that they are suitable or if a new ID needs to be
+ * generated.
+ *
+ * @param sessionId The proposed session ID to test
+ *
+ * @return {@code true} if the proposed session ID is acceptable, otherwise
+ * {@code false}
+ */
+public boolean validateSessionId(String sessionId);
}
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1713285&r1=1713284&r2=1713285&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Sun Nov 8
20:05:27 2015
@@ -627,7 +627,7 @@ public abstract class ManagerBase extend
session.setCreationTime(System.currentTimeMillis());
session.setMaxInactiveInterval(this.maxInactiveInterval);
String id = sessionId;
-if (id == null) {
+if (id == null || !sessionIdGenerator.validateSessionId(id)) {
id = generateSessionId();
}
session.setId(id);
Modified: tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java?rev=1713285&r1=1713284&r2=1713285&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java Sun
Nov 8 20:05:27 2015
@@ -273,6 +273,18 @@ public abstract class SessionIdGenerator
}
+/**
+ * {@inheritDoc}
+ *
+ * The base implementation performs no validation and treats all proposed
+ * session IDs as valid.
+ */
+@Override
+public boolean validateSessionId(String sessionId) {
+return true;
+}
+
+
@Override
protected void initInternal() throws LifecycleException {
// NO-OP
Modified:
tomcat/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java?rev=1713285&r1=1713284&r2=1713285&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java
Sun Nov 8 20:05:27 2015
@@ -16,6 +16,8 @@
*/
package org.apache.catalina.util;
+import org.apache.tomcat.util.buf.HexUtils;
+
public class StandardSessionIdGenerator extends SessionIdGeneratorBase {
@Override
@@ -61,4 +63,39 @@ public class StandardSessionIdGenerator
return buffer.toString();
}
+/**
+ * {@inheritDoc}
+ *
+ * This implementation performs the following checks:
+ *
+ * The characters up to the first period (if any) are valid hex
+ * digits
+ * There are at least enough hex digits to represent the specified
+ * session ID length
+ * Anything after the first period is not validated since that is
+ * assumed to be a JVM route and we can't easily determine valid
+ * values
+ *
+ */
+@Override
+public boolean validateSessionId(String sessio
svn commit: r1713286 - in /tomcat/trunk/java/org/apache/tomcat: jni/SSLContext.java util/net/openssl/OpenSSLContext.java
Author: markt
Date: Sun Nov 8 20:08:47 2015
New Revision: 1713286
URL: http://svn.apache.org/viewvc?rev=1713286&view=rev
Log:
Checkstyle fixes
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java?rev=1713286&r1=1713285&r2=1713286&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java Sun Nov 8 20:08:47
2015
@@ -509,7 +509,7 @@ public final class SSLContext {
* @return {@code true} if success, {@code false} otherwise.
*/
public static native boolean setSessionIdContext(long ctx, byte[] sidCtx);
-
+
/**
* Set CertificateRaw
*
@@ -517,7 +517,7 @@ public final class SSLContext {
* @param ctx Server or Client context to use.
* @param cert Byte array with the certificate in DER encoding.
* @param key Byte array with the Private Key file in PEM format.
- * @param idx Certificate index SSL_AIDX_RSA or SSL_AIDX_DSA.
+ * @param sslAidxRsa Certificate index SSL_AIDX_RSA or SSL_AIDX_DSA.
*/
- public static native boolean setCertificateRaw(long ctx, byte[] cert,
byte[] key, int sslAidxRsa);
+public static native boolean setCertificateRaw(long ctx, byte[] cert,
byte[] key, int sslAidxRsa);
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1713286&r1=1713285&r2=1713286&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Sun Nov 8 20:08:47 2015
@@ -18,10 +18,7 @@ package org.apache.tomcat.util.net.opens
import java.io.IOException;
import java.io.InputStream;
-import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.KeyStore;
@@ -38,7 +35,6 @@ import java.security.spec.PKCS8EncodedKe
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
-import java.util.Set;
import java.util.StringTokenizer;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
@@ -114,9 +110,9 @@ public class OpenSSLContext implements o
= AtomicIntegerFieldUpdater.newUpdater(OpenSSLContext.class,
"aprPoolDestroyed");
static final CertificateFactory X509_CERT_FACTORY;
- private static final String BEGIN_KEY = "-BEGIN RSA PRIVATE
KEY-\n";
+private static final String BEGIN_KEY = "-BEGIN RSA PRIVATE
KEY-\n";
- private static final Object END_KEY = "\n-END RSA PRIVATE KEY-";
+private static final Object END_KEY = "\n-END RSA PRIVATE KEY-";
private boolean initialized = false;
static {
@@ -330,14 +326,14 @@ public class OpenSSLContext implements o
SSLContext.setCipherSuite(ctx, ciphers);
// Load Server key and certificate
if (certificate.getCertificateFile() != null) {
-
- SSLContext.setCertificate(ctx,
+
+SSLContext.setCertificate(ctx,
SSLHostConfig.adjustRelativePath(certificate.getCertificateFile()),
SSLHostConfig.adjustRelativePath(certificate.getCertificateKeyFile()),
certificate.getCertificateKeyPassword(),
SSL.SSL_AIDX_RSA);
-
+
// Support Client Certificates
-
+
SSLContext.setCACertificate(ctx,
SSLHostConfig.adjustRelativePath(sslHostConfig.getCaCertificateFile()),
SSLHostConfig.adjustRelativePath(sslHostConfig.getCaCertificatePath()));
@@ -354,10 +350,10 @@ public class OpenSSLContext implements o
X509Certificate certificate =
keyManager.getCertificateChain(alias)[0];
PrivateKey key = keyManager.getPrivateKey(alias);
StringBuilder sb = new StringBuilder(BEGIN_KEY);
-sb.append(Base64.getMimeEncoder(64, new byte[]
{'\n'}).encodeToString(key.getEncoded()));
+sb.append(Base64.getMimeEncoder(64, new byte[]
{'\n'}).encodeToString(key.getEncoded()));
sb.append(END_KEY);
SSLContext.setCertificateRaw(ctx, certificate.getEncoded(),
sb.toString().getBytes(StandardCharsets.US_ASCII), SSL.SSL_AIDX
svn commit: r1713287 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/session/ java/org/apache/catalina/util/ test/org/apache/catalina/util/ webapps/docs/
Author: markt Date: Sun Nov 8 20:10:32 2015 New Revision: 1713287 URL: http://svn.apache.org/viewvc?rev=1713287&view=rev Log: Add the ability to validate client provided session IDs and implement basic validation for the Standard session ID generator. Added: tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java - copied unchanged from r1713285, tomcat/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/SessionIdGenerator.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Nov 8 20:10:32 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657 609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1 37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,168
svn commit: r1713289 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/session/ java/org/apache/catalina/util/ test/org/apache/catalina/util/ webapps/docs/
Author: markt Date: Sun Nov 8 20:11:38 2015 New Revision: 1713289 URL: http://svn.apache.org/viewvc?rev=1713289&view=rev Log: Add the ability to validate client provided session IDs and implement basic validation for the Standard session ID generator. Added: tomcat/tc7.0.x/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java - copied unchanged from r1713287, tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/SessionIdGenerator.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/StandardSessionIdGenerator.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Nov 8 20:11:38 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702 748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712899,1712903,1712906,1712975,1713185,1713262 -/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,
svn commit: r1713292 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Author: markt Date: Sun Nov 8 20:38:13 2015 New Revision: 1713292 URL: http://svn.apache.org/viewvc?rev=1713292&view=rev Log: Fix refactoring copy/paste error Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1713292&r1=1713291&r2=1713292&view=diff == --- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Sun Nov 8 20:38:13 2015 @@ -72,7 +72,7 @@ public class Http11Processor extends Abs /** * The string manager for this package. */ -private static final StringManager sm = StringManager.getManager(Http11AprProtocol.class); +private static final StringManager sm = StringManager.getManager(Http11Processor.class); private final UserDataHelper userDataHelper; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1713285 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/session/ java/org/apache/catalina/util/ test/org/apache/catalina/util/
On Sun, Nov 8, 2015 at 9:05 PM, wrote:
> public void testValidateWithJvmRouteWithPerid() {
>
I'd fix it myself with my new superpowers but I'm not sure whether there is
a typo in Period above or it is just my non-native English.
Re: svn commit: r1713285 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/session/ java/org/apache/catalina/util/ test/org/apache/catalina/util/
On 8 November 2015 22:03:39 GMT+00:00, Martin Grigorov
wrote:
>On Sun, Nov 8, 2015 at 9:05 PM, wrote:
>
>> public void testValidateWithJvmRouteWithPerid() {
>>
>
>I'd fix it myself with my new superpowers but I'm not sure whether
>there is
>a typo in Period above or it is just my non-native English.
It's a typo. Go for it.
Mark
Re: [VOTE] Release Apache Tomcat Native 1.2.2
+1 to release.
Tested on Mac OSX(EI Captitan) and RHEL 6.2 64-bits, results are as follows:
* tcnative 1.2.2 build successful with APR 1.5.2 and openssl 1.0.2d 9 Jul 2015
* ant test success
* ant run-echo success
* tomcat 9 (r1712528): all APR test cases pass
* tomcat 8 (r1712899): all APR test cases pass except the following:
Failed test: TEST-org.apache.coyote.ajp.TestAbstractAjpProcessor.APR.txt
This is due to r1712529 and is not related to tcnative.
* tomcat 7 (r1712904): all APR test cases passes
Suggestion:
There is one typo observed in native/BUILDING:
- For MAC OS X you must manually add a link
cd ${tcnative installdir}
ln -d libtcnative-1.dylib libtcnative-1.jnilib ==> should be ln -s
libtcnative-1.dylib libtcnative-1.jnilib
Best Regards,
Huxing
--
From:Mark Thomas
Time:2015 Nov 5 (Thu) 04:15
To:Tomcat Developers List
Subject:[VOTE] Release Apache Tomcat Native 1.2.2
OK. Here we go again :)
Thanks to everyone who has helped test 1.2.x so far. I'm hopeful that
this one will be good enough for the 9.0.0 RCs and - fingers crossed -
to replace 1.1.x as well.
Version 1.2.2 includes the following changes:
- Forward port some OpenSSL I/O changes from 1.1.x that fixed a
number of unit tests failures
The proposed release artefacts can be found at [1],
and the build was done using tag [2].
The Apache Tomcat Native 1.2.2 is
[ ] Stable, go ahead and release
[ ] Broken because of ...
Thanks,
Mark
[1]
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.2/
[2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_2
-
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-tc8.0.x-test-apr (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs -WARNING- No directory [/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: 39 mins 2 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151109-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20151109/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151109.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151109-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-20151109/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-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/tomca
[GUMP@vmgump]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 58 mins 40 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151109-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151109.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151109-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.openssl.path=/srv/gump/public/workspace/openssl-ma ster/dest-20151109/bin/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/g
[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 21 runs. The current state of this project is 'Failed', with reason 'Build Timed Out'. 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 timed out -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 -WARNING- No directory [/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: 1 hour 2 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151109-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151109.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151109-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-20151109/bin/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspa
