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

Sending a SETTINGS frame after the preface, as required by the spec.

This commit is contained in:
Simone Bordet 2014-08-08 01:10:51 +02:00
parent 69927b935e
commit 466d8db8d8
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jetty-http2/http2-client/src/main/java/org/eclipse/jetty/http2/client/HTTP2ClientConnectionFactory.java
View File

@ -20,14 +20,17 @@ package org.eclipse.jetty.http2.client;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
import org.eclipse.jetty.http2.HTTP2Connection;
import org.eclipse.jetty.http2.HTTP2FlowControl;
import org.eclipse.jetty.http2.HTTP2Session;
import org.eclipse.jetty.http2.ISession;
import org.eclipse.jetty.http2.api.Session;
import org.eclipse.jetty.http2.frames.SettingsFrame;
import org.eclipse.jetty.http2.generator.Generator;
import org.eclipse.jetty.http2.parser.Parser;
import org.eclipse.jetty.http2.parser.PrefaceParser;
@ -67,6 +70,7 @@ public class HTTP2ClientConnectionFactory implements ClientConnectionFactory
private class HTTP2ClientConnection extends HTTP2Connection implements Callback
{
private final AtomicBoolean prefaceSent = new AtomicBoolean();
private final HTTP2Client client;
private final Promise<Session> promise;
@ -94,8 +98,18 @@ public class HTTP2ClientConnectionFactory implements ClientConnectionFactory
@Override
public void succeeded()
{
client.addSession(getSession());
promise.succeeded(getSession());
if (prefaceSent.compareAndSet(false, true))
{
// SPEC: after the preface bytes, a SETTINGS frame must be sent.
// TODO: configure settings.
HashMap<Integer, Integer> settings = new HashMap<>();
getSession().settings(new SettingsFrame(settings, false), this);
}
else
{
client.addSession(getSession());
promise.succeeded(getSession());
}
}
@Override