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

Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Greg Wilkins 2016-07-21 12:29:54 +10:00
parent 950c4d4b70 2db91a88cf
commit 6e4abb3339
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,9 +320,7 @@ public abstract class HTTP2Session extends ContainerLifeCycle implements ISessio
}
case SettingsFrame.MAX_HEADER_LIST_SIZE:
{
// TODO implement
if (LOG.isDebugEnabled())
LOG.debug("NOT IMPLEMENTED max header list size to {}", value);
// Allow HTTP2SErverSessionListener to handle
break;
}
default:

10
jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java
View File

@ -96,9 +96,19 @@ public class HTTP2ServerConnectionFactory extends AbstractHTTP2ServerConnectionF
int maxConcurrentStreams = getMaxConcurrentStreams();
if (maxConcurrentStreams >= 0)
settings.put(SettingsFrame.MAX_CONCURRENT_STREAMS, maxConcurrentStreams);
settings.put(SettingsFrame.MAX_HEADER_LIST_SIZE,getHttpConfiguration().getRequestHeaderSize());
return settings;
}
@Override
public void onSettings(Session session, SettingsFrame frame)
{
super.onSettings(session,frame);
Integer mhls = frame.getSettings().get(SettingsFrame.MAX_HEADER_LIST_SIZE);
if (mhls != null && mhls.intValue()<getHttpConfiguration().getResponseHeaderSize())
LOG.warn("MAX_HEADER_LIST_SIZE<{} for {}",getHttpConfiguration().getResponseHeaderSize(),session);
}
@Override
public Stream.Listener onNewStream(Stream stream, HeadersFrame frame)
{