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

Made push functionality honor configuration parameter sent via SETTINGS.

This commit is contained in:
Simone Bordet 2014-08-15 18:34:20 +02:00
parent 75912deb52
commit 728a7c3442
3 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,6 +81,7 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
private final HTTP2Flusher flusher;
private int maxLocalStreams;
private int maxRemoteStreams;
private boolean pushEnabled;
public HTTP2Session(Scheduler scheduler, EndPoint endPoint, Generator generator, Listener listener, FlowControl flowControl, int maxStreams, int initialStreamId)
{
@ -95,6 +96,7 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
this.streamIds.set(initialStreamId);
this.sendWindow.set(FlowControl.DEFAULT_WINDOW_SIZE);
this.recvWindow.set(FlowControl.DEFAULT_WINDOW_SIZE);
this.pushEnabled = true; // SPEC: by default, push is enabled.
}
public FlowControl getFlowControl()
@ -200,31 +202,44 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
// Iterate over all settings
for (Map.Entry<Integer, Integer> entry : frame.getSettings().entrySet())
{
int value=entry.getValue();
switch (entry.getKey())
int key = entry.getKey();
int value = entry.getValue();
switch (key)
{
case SettingsFrame.HEADER_TABLE_SIZE:
{
if (LOG.isDebugEnabled())
LOG.debug("Update HPACK header table size to {}", value);
generator.setHeaderTableSize(value);
break;
}
case SettingsFrame.ENABLE_PUSH:
{
// SPEC: check the value is sane.
if (value != 0 && value != 1)
{
onConnectionFailure(ErrorCodes.PROTOCOL_ERROR, "invalid_settings_enable_push");
return false;
}
pushEnabled = value == 1;
break;
}
case SettingsFrame.MAX_CONCURRENT_STREAMS:
{
maxLocalStreams = value;
if (LOG.isDebugEnabled())
LOG.debug("Update max local concurrent streams to {}", maxLocalStreams);
break;
}
case SettingsFrame.INITIAL_WINDOW_SIZE:
{
if (LOG.isDebugEnabled())
LOG.debug("Update initial window size to {}", value);
flowControl.updateInitialStreamWindow(this, value);
break;
}
case SettingsFrame.MAX_FRAME_SIZE:
{
if (LOG.isDebugEnabled())
LOG.debug("Update max frame size to {}", value);
// SPEC: check the max frame size is sane.
@ -234,16 +249,19 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
return false;
}
generator.setMaxFrameSize(value);
break;
}
case SettingsFrame.MAX_HEADER_LIST_SIZE:
{
// TODO implement
LOG.warn("NOT IMPLEMENTED max header list size to {}", value);
break;
}
default:
LOG.debug("Unknown setting {}:{}",entry.getKey(),value);
{
LOG.debug("Unknown setting {}:{}", key, value);
break;
}
}
}
notifySettings(this, frame);
@ -568,6 +586,12 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
flusher.window(stream, frame);
}
@Override
public boolean isPushEnabled()
{
return pushEnabled;
}
@Override
public void shutdown()
{

2
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/ISession.java
View File

@ -44,6 +44,8 @@ public interface ISession extends Session
public void onWindowUpdate(IStream stream, WindowUpdateFrame frame);
public boolean isPushEnabled();
public void shutdown();
public void disconnect();

7
jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpTransportOverHTTP2.java
View File

@ -100,6 +100,13 @@ public class HttpTransportOverHTTP2 implements HttpTransport
@Override
public void push(final MetaData.Request request)
{
if (!stream.getSession().isPushEnabled())
{
if (LOG.isDebugEnabled())
LOG.debug("HTTP/2 Push disabled for {}", request);
return;
}
stream.push(new PushPromiseFrame(stream.getId(), 0, request), new Promise<Stream>()
{
@Override