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

Fixed infinite loop when receiving a SETTINGS frame.

This commit is contained in:
Simone Bordet 2014-06-17 18:51:09 +02:00
parent 2b494fde0e
commit 82a2dfd03a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/FlowControlTest.java
View File

@ -103,7 +103,7 @@ public class FlowControlTest extends AbstractTest
} }
}); });
// Two SETTINGS frames, the initial one and the one we send. // Two SETTINGS frames, the initial one and the one we send from the server.
final CountDownLatch settingsLatch = new CountDownLatch(2); final CountDownLatch settingsLatch = new CountDownLatch(2);
Session client = newClient(new Session.Listener.Adapter() Session client = newClient(new Session.Listener.Adapter()
{ {

4
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java
View File

@ -163,6 +163,10 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("Received {}", frame); LOG.debug("Received {}", frame);
if (frame.isReply())
return false;
Map<Integer, Integer> settings = frame.getSettings(); Map<Integer, Integer> settings = frame.getSettings();
if (settings.containsKey(SettingsFrame.MAX_CONCURRENT_STREAMS)) if (settings.containsKey(SettingsFrame.MAX_CONCURRENT_STREAMS))
{ {