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.3.x' into 'jetty-9.4.x'.

This commit is contained in:
Simone Bordet 2016-07-21 19:12:38 +02:00
parent 5e3269d3b6 088dc036b4
commit cceec33f54
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,7 +320,7 @@ public abstract class HTTP2Session extends ContainerLifeCycle implements ISessio
}
case SettingsFrame.MAX_HEADER_LIST_SIZE:
{
// Allow HTTP2SErverSessionListener to handle
// Handled by HTTP2ServerConnectionFactory.HTTPServerSessionListener.
break;
}
default:

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

@ -96,17 +96,17 @@ 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());
settings.put(SettingsFrame.MAX_HEADER_LIST_SIZE, getHttpConfiguration().getRequestHeaderSize());
return settings;
}
@Override
public void onSettings(Session session, SettingsFrame frame)
{
super.onSettings(session,frame);
HttpConfiguration httpConfig = getHttpConfiguration();
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);
if (mhls != null && mhls < httpConfig.getResponseHeaderSize())
httpConfig.setResponseHeaderSize(mhls);
}
@Override