Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged branch 'jetty-9.2.x' into 'master'.

This commit is contained in:
Simone Bordet 2014-10-16 18:05:12 +02:00
parent aad1f9d058 aea5070e51
commit 6268421dd0
32 changed files with 138 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-alpn/jetty-alpn-client/src/main/java/org/eclipse/jetty/alpn/client/ALPNClientConnection.java
View File

@ -44,12 +44,6 @@ public class ALPNClientConnection extends NegotiatingClientConnection implements
ALPN.put(sslEngine, this);
}
@Override
public boolean supports()
{
return true;
}
@Override
public void unsupported()
{

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_40.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_45.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_51.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_55.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_60.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_65.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_67.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

8
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_71.mod Normal file
View File

@ -0,0 +1,8 @@
[name]
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.1.v20141016/alpn-boot-7.1.1.v20141016.jar|lib/alpn/alpn-boot-7.1.1.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.1.v20141016.jar

8
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_72.mod Normal file
View File

@ -0,0 +1,8 @@
[name]
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.1.v20141016/alpn-boot-7.1.1.v20141016.jar|lib/alpn/alpn-boot-7.1.1.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.1.v20141016.jar

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.0.0.v20140317/alpn-boot-8.0.0.v20140317.jar|lib/alpn/alpn-boot-8.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.0.v20141016/alpn-boot-8.1.0.v20141016.jar|lib/alpn/alpn-boot-8.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-8.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.0.v20141016.jar

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_05.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.0.0.v20140317/alpn-boot-8.0.0.v20140317.jar|lib/alpn/alpn-boot-8.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.0.v20141016/alpn-boot-8.1.0.v20141016.jar|lib/alpn/alpn-boot-8.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-8.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.0.v20141016.jar

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_11.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.0.0.v20140317/alpn-boot-8.0.0.v20140317.jar|lib/alpn/alpn-boot-8.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.0.v20141016/alpn-boot-8.1.0.v20141016.jar|lib/alpn/alpn-boot-8.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-8.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.0.v20141016.jar

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_20.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.0.0.v20140317/alpn-boot-8.0.0.v20140317.jar|lib/alpn/alpn-boot-8.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.0.v20141016/alpn-boot-8.1.0.v20141016.jar|lib/alpn/alpn-boot-8.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-8.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.0.v20141016.jar

8
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_25.mod Normal file
View File

@ -0,0 +1,8 @@
[name]
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.1.v20141016/alpn-boot-8.1.1.v20141016.jar|lib/alpn/alpn-boot-8.1.1.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.1.v20141016.jar

6
jetty-client/src/test/java/org/eclipse/jetty/client/HttpResponseConcurrentAbortTest.java
View File

@ -33,8 +33,6 @@ import org.eclipse.jetty.client.api.Result;
import org.eclipse.jetty.http.HttpField;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.junit.Assert;
import org.junit.Test;
@ -148,8 +146,6 @@ public class HttpResponseConcurrentAbortTest extends AbstractHttpClientServerTes
private void abort(final Response response)
{
Logger logger = Log.getLogger(getClass());
new Thread("abort")
{
@Override
@ -164,13 +160,11 @@ public class HttpResponseConcurrentAbortTest extends AbstractHttpClientServerTes
// The failure callback must be executed asynchronously.
boolean latched = failureLatch.await(4, TimeUnit.SECONDS);
success.set(latched);
logger.info("SIMON - STEP 1");
// The complete callback must not be executed
// until we return from this callback.
latched = completeLatch.await(1, TimeUnit.SECONDS);
success.set(!latched);
logger.info("SIMON - STEP 2");
callbackLatch.countDown();
}

8
jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_71.mod Normal file
View File

@ -0,0 +1,8 @@
[name]
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.9.v20141016/npn-boot-1.1.9.v20141016.jar|lib/npn/npn-boot-1.1.9.v20141016.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.9.v20141016.jar

8
jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn-1.7.0_72.mod Normal file
View File

@ -0,0 +1,8 @@
[name]
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.9.v20141016/npn-boot-1.1.9.v20141016.jar|lib/npn/npn-boot-1.1.9.v20141016.jar
[exec]
-Xbootclasspath/p:lib/npn/npn-boot-1.1.9.v20141016.jar

18
jetty-spdy/spdy-alpn-tests/src/test/java/org/eclipse/jetty/spdy/server/ALPNNegotiationTest.java
View File

@ -54,12 +54,6 @@ public class ALPNNegotiationTest extends AbstractALPNTest
ALPN.put(client, new ALPN.ClientProvider()
{
@Override
public boolean supports()
{
return true;
}
@Override
public void unsupported()
{
@ -113,12 +107,6 @@ public class ALPNNegotiationTest extends AbstractALPNTest
ALPN.put(client, new ALPN.ClientProvider()
{
@Override
public boolean supports()
{
return true;
}
@Override
public void unsupported()
{
@ -172,12 +160,6 @@ public class ALPNNegotiationTest extends AbstractALPNTest
ALPN.put(client, new ALPN.ClientProvider()
{
@Override
public boolean supports()
{
return false;
}
@Override
public void unsupported()
{

17
jetty-spdy/spdy-alpn-tests/src/test/java/org/eclipse/jetty/spdy/server/ALPNSynReplyTest.java
View File

@ -22,6 +22,7 @@ package org.eclipse.jetty.spdy.server;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.nio.channels.SocketChannel;
import java.util.Arrays;
import java.util.List;
import javax.net.ssl.SSLEngine;
@ -43,12 +44,6 @@ public class ALPNSynReplyTest extends AbstractALPNTest
sslEngine.setUseClientMode(true);
ALPN.put(sslEngine, new ALPN.ClientProvider()
{
@Override
public boolean supports()
{
return true;
}
@Override
public void unsupported()
{
@ -57,7 +52,7 @@ public class ALPNSynReplyTest extends AbstractALPNTest
@Override
public List<String> protocols()
{
return null;
return Arrays.asList("test");
}
@Override
@ -108,12 +103,6 @@ public class ALPNSynReplyTest extends AbstractALPNTest
sslEngine.setUseClientMode(true);
ALPN.put(sslEngine, new ALPN.ClientProvider()
{
@Override
public boolean supports()
{
return true;
}
@Override
public void unsupported()
{
@ -122,7 +111,7 @@ public class ALPNSynReplyTest extends AbstractALPNTest
@Override
public List<String> protocols()
{
return null;
return Arrays.asList("test");
}
@Override

2
jetty-start/src/test/resources/assert-home-with-spdy.txt
View File

@ -62,7 +62,7 @@ JVM|-Xms1024m
JVM|-Xmx1024m
# Downloads
DOWNLOAD|http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar
DOWNLOAD|http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore
# Files

4
jetty-start/src/test/resources/usecases/assert-enable-spdy.txt
View File

@ -37,11 +37,11 @@ PROP|spdy.port=8443
PROP|spdy.timeout=30000
# The Downloads
DOWNLOAD|http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar
DOWNLOAD|http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore
# The Bootlib
BOOTLIB|-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
BOOTLIB|-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar
# The Files
FILE|lib/

4
jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_40.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

4
jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_45.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

4
jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_51.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

4
jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_55.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

4
jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_60.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.1.0.v20141016/alpn-boot-7.1.0.v20141016.jar|lib/alpn/alpn-boot-7.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar

4
jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.0.0.v20140317/alpn-boot-8.0.0.v20140317.jar|lib/alpn/alpn-boot-8.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.0.v20141016/alpn-boot-8.1.0.v20141016.jar|lib/alpn/alpn-boot-8.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-8.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.0.v20141016.jar

4
jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0_05.mod
View File

@ -2,7 +2,7 @@
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.0.0.v20140317/alpn-boot-8.0.0.v20140317.jar|lib/alpn/alpn-boot-8.0.0.v20140317.jar
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.0.v20141016/alpn-boot-8.1.0.v20141016.jar|lib/alpn/alpn-boot-8.1.0.v20141016.jar
[exec]
-Xbootclasspath/p:lib/alpn/alpn-boot-8.0.0.v20140317.jar
-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.0.v20141016.jar

6
jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java
View File

@ -92,7 +92,7 @@ public class SharedBlockingCallback
{
while (_blocker._state != IDLE)
{
if (idle>0)
if (idle>0 && (idle < Long.MAX_VALUE/2))
{
// Wait a little bit longer than the blocker might block
if (!_idle.await(idle*2,TimeUnit.MILLISECONDS))
@ -194,7 +194,7 @@ public class SharedBlockingCallback
{
while (_state == null)
{
if (idle>0)
if (idle>0 && (idle < Long.MAX_VALUE/2))
{
// Wait a little bit longer than expected callback idle timeout
if (!_complete.await(idle+idle/2,TimeUnit.MILLISECONDS))
@ -282,7 +282,7 @@ public class SharedBlockingCallback
}
}
private class BlockerTimeoutException extends TimeoutException
private static class BlockerTimeoutException extends TimeoutException
{
}
}

3
jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java
View File

@ -224,6 +224,7 @@ public class SslContextFactory extends AbstractLifeCycle
public SslContextFactory(boolean trustAll)
{
setTrustAll(trustAll);
addExcludeProtocols("SSL", "SSLv2", "SSLv3");
setExcludeCipherSuites(
"SSL_RSA_WITH_DES_CBC_SHA",
"SSL_DHE_RSA_WITH_DES_CBC_SHA",
@ -232,7 +233,7 @@ public class SslContextFactory extends AbstractLifeCycle
"SSL_RSA_EXPORT_WITH_DES40_CBC_SHA",
"SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA",
"SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA");
}
}
/**
* Construct an instance of SslContextFactory

64
pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-parent</artifactId>
<version>22</version>
<version>23</version>
</parent>
<artifactId>jetty-project</artifactId>
<version>9.3.0-SNAPSHOT</version>
@ -17,7 +17,7 @@
<slf4j-version>1.6.6</slf4j-version>
<jetty-test-policy-version>1.2</jetty-test-policy-version>
<npn.api.version>1.1.1.v20141010</npn.api.version>
<alpn.api.version>1.0.0</alpn.api.version>
<alpn.api.version>1.1.0.v20141014</alpn.api.version>
<!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
<npn.version>undefined</npn.version>
<alpn.version>undefined</alpn.version>
@ -897,7 +897,7 @@
</activation>
<properties>
<npn.version>1.1.6.v20130911</npn.version>
<alpn.version>7.0.0.v20140317</alpn.version>
<alpn.version>7.1.0.v20141016</alpn.version>
</properties>
</profile>
<profile>
@ -910,7 +910,7 @@
</activation>
<properties>
<npn.version>1.1.6.v20130911</npn.version>
<alpn.version>7.0.0.v20140317</alpn.version>
<alpn.version>7.1.0.v20141016</alpn.version>
</properties>
</profile>
<profile>
@ -923,7 +923,7 @@
</activation>
<properties>
<npn.version>1.1.6.v20130911</npn.version>
<alpn.version>7.0.0.v20140317</alpn.version>
<alpn.version>7.1.0.v20141016</alpn.version>
</properties>
</profile>
<profile>
@ -936,7 +936,7 @@
</activation>
<properties>
<npn.version>1.1.8.v20141013</npn.version>
<alpn.version>7.0.0.v20140317</alpn.version>
<alpn.version>7.1.0.v20141016</alpn.version>
</properties>
</profile>
<profile>
@ -949,7 +949,7 @@
</activation>
<properties>
<npn.version>1.1.8.v20141013</npn.version>
<alpn.version>7.0.0.v20140317</alpn.version>
<alpn.version>7.1.0.v20141016</alpn.version>
</properties>
</profile>
<profile>
@ -962,7 +962,7 @@
</activation>
<properties>
<npn.version>1.1.8.v20141013</npn.version>
<alpn.version>7.0.0.v20140317</alpn.version>
<alpn.version>7.1.0.v20141016</alpn.version>
</properties>
</profile>
<profile>
@ -975,7 +975,33 @@
</activation>
<properties>
<npn.version>1.1.8.v20141013</npn.version>
<alpn.version>7.0.0.v20140317</alpn.version>
<alpn.version>7.1.0.v20141016</alpn.version>
</properties>
</profile>
<profile>
<id>7u71</id>
<activation>
<property>
<name>java.version</name>
<value>1.7.0_71</value>
</property>
</activation>
<properties>
<npn.version>1.1.9.v20141016</npn.version>
<alpn.version>7.1.1.v20141016</alpn.version>
</properties>
</profile>
<profile>
<id>7u72</id>
<activation>
<property>
<name>java.version</name>
<value>1.7.0_72</value>
</property>
</activation>
<properties>
<npn.version>1.1.9.v20141016</npn.version>
<alpn.version>7.1.1.v20141016</alpn.version>
</properties>
</profile>
<profile>
@ -987,7 +1013,7 @@
</property>
</activation>
<properties>
<alpn.version>8.0.0.v20140317</alpn.version>
<alpn.version>8.1.0.v20141016</alpn.version>
</properties>
</profile>
<profile>
@ -999,7 +1025,7 @@
</property>
</activation>
<properties>
<alpn.version>8.0.0.v20140317</alpn.version>
<alpn.version>8.1.0.v20141016</alpn.version>
</properties>
</profile>
<profile>
@ -1011,7 +1037,7 @@
</property>
</activation>
<properties>
<alpn.version>8.0.0.v20140317</alpn.version>
<alpn.version>8.1.0.v20141016</alpn.version>
</properties>
</profile>
<profile>
@ -1023,7 +1049,19 @@
</property>
</activation>
<properties>
<alpn.version>8.0.0.v20140317</alpn.version>
<alpn.version>8.1.0.v20141016</alpn.version>
</properties>
</profile>
<profile>
<id>8u25</id>
<activation>
<property>
<name>java.version</name>
<value>1.8.0_25</value>
</property>
</activation>
<properties>
<alpn.version>8.1.1.v20141016</alpn.version>
</properties>
</profile>
</profiles>