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.3.x' into 'jetty-9.4.x'.

This commit is contained in:
Simone Bordet 2016-07-14 12:44:15 +02:00
parent 05260b63c9 2387d973ec
commit d976b4d36a
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/IdleTimeoutTest.java
View File

@ -542,6 +542,7 @@ public class IdleTimeoutTest extends AbstractTest
@Test
public void testBufferedReadsResetStreamIdleTimeout() throws Exception
{
int bufferSize = 8192;
long delay = 1000;
start(new HttpServlet()
{
@ -549,7 +550,7 @@ public class IdleTimeoutTest extends AbstractTest
protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
ServletInputStream input = request.getInputStream();
byte[] buffer = new byte[8192];
byte[] buffer = new byte[bufferSize];
while (true)
{
int read = input.read(buffer);
@ -580,12 +581,13 @@ public class IdleTimeoutTest extends AbstractTest
// Send data larger than the flow control window.
// The client will send bytes up to the flow control window immediately
// and they will be buffered by the server, which will read them slowly.
// Server reads should reset the idle timeout.
ByteBuffer data = ByteBuffer.allocate(FlowControlStrategy.DEFAULT_WINDOW_SIZE + 1);
// and they will be buffered by the server; the Servlet will consume them slowly.
// Servlet reads should reset the idle timeout.
int contentLength = FlowControlStrategy.DEFAULT_WINDOW_SIZE + 1;
ByteBuffer data = ByteBuffer.allocate(contentLength);
stream.data(new DataFrame(stream.getId(), data, true), Callback.NOOP);
Assert.assertTrue(latch.await(5, TimeUnit.SECONDS));
Assert.assertTrue(latch.await(2 * (contentLength / bufferSize + 1) * delay, TimeUnit.MILLISECONDS));
}
private void sleep(long value)

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

@ -398,15 +398,16 @@ public class SslContextFactory extends AbstractLifeCycle
}
// select the protocols and ciphers
SSLEngine sslEngine=context.createSSLEngine();
selectCipherSuites(sslEngine.getEnabledCipherSuites(),sslEngine.getSupportedCipherSuites());
selectProtocols(sslEngine.getEnabledProtocols(),sslEngine.getSupportedProtocols());
SSLParameters enabled=context.getDefaultSSLParameters();
SSLParameters supported=context.getSupportedSSLParameters();
selectCipherSuites(enabled.getCipherSuites(),supported.getCipherSuites());
selectProtocols(enabled.getProtocols(),supported.getProtocols());
_factory = new Factory(keyStore,trustStore,context);
if (LOG.isDebugEnabled())
{
LOG.debug("Selected Protocols {} of {}",Arrays.asList(_selectedProtocols),Arrays.asList(sslEngine.getSupportedProtocols()));
LOG.debug("Selected Ciphers {} of {}",Arrays.asList(_selectedCipherSuites),Arrays.asList(sslEngine.getSupportedCipherSuites()));
LOG.debug("Selected Protocols {} of {}",Arrays.asList(_selectedProtocols),Arrays.asList(supported.getProtocols()));
LOG.debug("Selected Ciphers {} of {}",Arrays.asList(_selectedCipherSuites),Arrays.asList(supported.getCipherSuites()));
}
}