Skip to content

Commit 82a3e88

Browse files
committed
Upgrade Jetty 9.4.5.v20170502
1 parent 2482009 commit 82a3e88

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

client/src/test/java/org/asynchttpclient/AuthTimeoutTest.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
package org.asynchttpclient;
1414

1515
import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH;
16-
import static java.nio.charset.StandardCharsets.UTF_8;
1716
import static org.asynchttpclient.Dsl.*;
1817
import static org.asynchttpclient.test.TestUtils.*;
1918

@@ -72,17 +71,15 @@ private class IncompleteResponseHandler extends AbstractHandler {
7271

7372
public void handle(String s, Request r, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
7473
// NOTE: handler sends less bytes than are given in Content-Length, which should lead to timeout
75-
74+
response.setStatus(200);
7675
OutputStream out = response.getOutputStream();
77-
if (request.getHeader("X-Content") != null) {
78-
String content = request.getHeader("X-Content");
79-
response.setHeader(CONTENT_LENGTH.toString(), String.valueOf(content.getBytes(UTF_8).length));
80-
out.write(content.substring(1).getBytes(UTF_8));
81-
} else {
82-
response.setStatus(200);
83-
}
76+
response.setIntHeader(CONTENT_LENGTH.toString(), 1000);
77+
out.write(0);
8478
out.flush();
85-
out.close();
79+
try {
80+
Thread.sleep(LONG_FUTURE_TIMEOUT + 100);
81+
} catch (InterruptedException e) {
82+
}
8683
}
8784
}
8885

@@ -172,7 +169,7 @@ protected Future<Response> execute(AsyncHttpClient client, boolean basic, boolea
172169
}
173170
}
174171

175-
return client.prepareGet(url).setRealm(realm.setUsePreemptiveAuth(preemptive).build()).setHeader("X-Content", "Test").execute();
172+
return client.prepareGet(url).setRealm(realm.setUsePreemptiveAuth(preemptive).build()).execute();
176173
}
177174

178175
@Override

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@
384384
<slf4j.version>1.7.25</slf4j.version>
385385
<logback.version>1.2.3</logback.version>
386386
<testng.version>6.9.10</testng.version>
387-
<jetty.version>9.3.19.v20170502</jetty.version>
387+
<jetty.version>9.4.5.v20170502</jetty.version>
388388
<tomcat.version>6.0.45</tomcat.version>
389389
<commons-io.version>2.4</commons-io.version>
390390
<commons-fileupload.version>1.3</commons-fileupload.version>

0 commit comments

Comments
 (0)