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 2015-03-31 13:58:41 +02:00
parent 0636013d65 509d13531c
commit 6263972d1e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-client/src/main/java/org/eclipse/jetty/client/HttpRedirector.java
View File

@ -91,6 +91,7 @@ public class HttpRedirector
case 302:
case 303:
case 307:
case 308:
return true;
default:
return false;
@ -260,6 +261,7 @@ public class HttpRedirector
return redirect(request, response, listener, newURI, HttpMethod.GET.asString());
}
case 307:
case 308:
{
// Keep same method
return redirect(request, response, listener, newURI, request.getMethod());

2
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
View File

@ -78,6 +78,7 @@ public class UpgradeConnection extends AbstractConnection
@Override
public void succeeded()
{
LOG.debug("Upgrade Request Write Success");
// Writing the request header is complete.
super.succeeded();
// start the interest in fill
@ -87,6 +88,7 @@ public class UpgradeConnection extends AbstractConnection
@Override
public void failed(Throwable cause)
{
LOG.warn("Upgrade Request Write Failure", cause);
super.failed(cause);
// Fail the connect promise when a fundamental exception during connect occurs.
connectPromise.failed(cause);