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 jetty-10.0.x 

Signed-off-by: gregw <gregw@webtide.com>
This commit is contained in:
gregw 2021-02-17 18:11:02 +01:00
parent ad6fc62bb5 ea3f3a5b93
commit 349b89d7e4
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-http/src/test/java/org/eclipse/jetty/http/HttpURITest.java
View File

@ -300,6 +300,9 @@ public class HttpURITest
uri = HttpURI.from("http://host/path/.info");
assertEquals("/path/.info", uri.getDecodedPath());
assertEquals("http://host:8080?query", uri.toString()); // Yes silly result!
uri.setQuery(null);
uri = HttpURI.from("http://host/path/./info");
assertEquals("/path/info", uri.getDecodedPath());

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

@ -421,7 +421,7 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http
if (isFillInterested())
{
LOG.warn("Pending read in onCompleted {} {}", this, getEndPoint());
abort(new IllegalStateException());
_channel.abort(new IOException("Pending read in onCompleted"));
}
else
{

16
jetty-server/src/test/java/org/eclipse/jetty/server/BlockingTest.java
View File

@ -63,11 +63,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class BlockingTest
{
private Server server;
ServerConnector connector;
private ServerConnector connector;
private ContextHandler context;
@BeforeEach
void setUp()
public void setUp()
{
server = new Server();
connector = new ServerConnector(server);
@ -81,7 +81,7 @@ public class BlockingTest
}
@AfterEach
void tearDown() throws Exception
public void tearDown() throws Exception
{
server.stop();
}
@ -148,7 +148,7 @@ public class BlockingTest
int port = connector.getLocalPort();
try (Socket socket = new Socket("localhost", port))
{
socket.setSoTimeout(1000000);
socket.setSoTimeout(10000);
OutputStream out = socket.getOutputStream();
out.write(request.toString().getBytes(StandardCharsets.ISO_8859_1));
@ -322,7 +322,7 @@ public class BlockingTest
int port = connector.getLocalPort();
try (Socket socket = new Socket("localhost", port))
{
socket.setSoTimeout(1000000);
socket.setSoTimeout(10000);
OutputStream out = socket.getOutputStream();
out.write(request.toString().getBytes(StandardCharsets.ISO_8859_1));
@ -407,7 +407,7 @@ public class BlockingTest
int port = connector.getLocalPort();
try (Socket socket = new Socket("localhost", port))
{
socket.setSoTimeout(1000000);
socket.setSoTimeout(10000);
OutputStream out = socket.getOutputStream();
out.write(request.toString().getBytes(StandardCharsets.ISO_8859_1));
@ -488,7 +488,7 @@ public class BlockingTest
int port = connector.getLocalPort();
try (Socket socket = new Socket("localhost", port))
{
socket.setSoTimeout(1000000);
socket.setSoTimeout(10000);
OutputStream out = socket.getOutputStream();
out.write(request.toString().getBytes(StandardCharsets.ISO_8859_1));
@ -560,7 +560,7 @@ public class BlockingTest
int port = connector.getLocalPort();
try (Socket socket = new Socket("localhost", port))
{
socket.setSoTimeout(1000000);
socket.setSoTimeout(10000);
OutputStream out = socket.getOutputStream();
out.write(request.toString().getBytes(StandardCharsets.ISO_8859_1));