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

Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk

This commit is contained in:
Greg Wilkins 2017-03-30 13:48:09 +11:00
parent 69003d3dd9 1a0b2dfdb5
commit 11ba4bc849
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
View File

@ -30,6 +30,7 @@ doc=application/msword
dtd=application/xml-dtd
dvi=application/x-dvi
dxr=application/x-director
eot=application/vnd.ms-fontobject
eps=application/postscript
etx=text/x-setext
exe=application/octet-stream
@ -171,6 +172,8 @@ wml=text/vnd.wap.wml
wmlc=application/vnd.wap.wmlc
wmls=text/vnd.wap.wmlscript
wmlsc=application/vnd.wap.wmlscriptc
woff=application/font-woff
woff2=font/woff2
wrl=model/vrml
wtls-ca-certificate=application/vnd.wap.wtls-ca-certificate
xbm=image/x-xbitmap

9
jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnection.java
View File

@ -241,7 +241,7 @@ public class HTTP2ServerConnection extends HTTP2Connection implements Connection
{
HttpTransportOverHTTP2 transport = new HttpTransportOverHTTP2(connector, this);
transport.setStream(stream);
channel = new ServerHttpChannelOverHTTP2(connector, httpConfig, getEndPoint(), transport);
channel = newServerHttpChannelOverHTTP2(connector, httpConfig, transport);
if (LOG.isDebugEnabled())
LOG.debug("Creating channel {} for {}", channel, this);
}
@ -249,6 +249,11 @@ public class HTTP2ServerConnection extends HTTP2Connection implements Connection
return channel;
}
protected ServerHttpChannelOverHTTP2 newServerHttpChannelOverHTTP2(Connector connector, HttpConfiguration httpConfig, HttpTransportOverHTTP2 transport)
{
return new ServerHttpChannelOverHTTP2(connector, httpConfig, getEndPoint(), transport);
}
private void offerChannel(HttpChannelOverHTTP2 channel)
{
synchronized (this)
@ -299,7 +304,7 @@ public class HTTP2ServerConnection extends HTTP2Connection implements Connection
return true;
}
private class ServerHttpChannelOverHTTP2 extends HttpChannelOverHTTP2 implements Closeable
protected class ServerHttpChannelOverHTTP2 extends HttpChannelOverHTTP2 implements Closeable
{
public ServerHttpChannelOverHTTP2(Connector connector, HttpConfiguration configuration, EndPoint endPoint, HttpTransportOverHTTP2 transport)
{