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

Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640

This commit is contained in:
Jan Bartel 2017-09-21 16:09:10 +10:00
parent 2f5f01a160 a6f02c26a8
commit 4bc2883412
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
View File

@ -73,6 +73,7 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler;
import org.eclipse.jetty.util.thread.Scheduler;
import org.eclipse.jetty.util.thread.ThreadPool;
/**
* <p>{@link HttpClient} provides an efficient, asynchronous, non-blocking implementation
@ -204,9 +205,12 @@ public class HttpClient extends ContainerLifeCycle
executor = threadPool;
}
addBean(executor);
if (byteBufferPool == null)
byteBufferPool = new MappedByteBufferPool();
byteBufferPool = new MappedByteBufferPool(2048,
executor instanceof ThreadPool.SizedThreadPool
? ((ThreadPool.SizedThreadPool)executor).getMaxThreads()/2
: Runtime.getRuntime().availableProcessors()*2);
addBean(byteBufferPool);
if (scheduler == null)

2
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
View File

@ -2257,7 +2257,7 @@ public class Request implements HttpServletRequest
event.setDispatchContext(getServletContext());
String uri = ((HttpServletRequest)servletRequest).getRequestURI();
if (uri.startsWith(_contextPath))
if (_contextPath!=null && uri.startsWith(_contextPath))
uri = uri.substring(_contextPath.length());
else
// TODO probably need to strip encoded context from requestURI, but will do this for now:

12
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
View File

@ -384,9 +384,15 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture
os.flush();
// Read the response.
String response = readResponse(client);
Assert.assertThat(response, Matchers.containsString("HTTP/1.1 431 "));
try
{
String response = readResponse(client);
Assert.assertThat(response, Matchers.containsString("HTTP/1.1 431 "));
}
catch(Exception e)
{
// TODO evaluate why we sometimes get an early close on this test
}
}
}