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

Draft 14 9.2.2 protection

This commit is contained in:
Greg Wilkins 2015-05-13 10:26:45 +10:00
parent fef355db86
commit 356600716d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,12 +64,12 @@ public class HTTP2ServerConnectionFactory extends AbstractHTTP2ServerConnectionF
@Override
public boolean isAcceptable(String protocol, String tlsProtocol, String tlsCipher)
{
// TODO remove this draft protection
if ("h2-14".equals(protocol))
return true;
// TODO remove this draft 14 protection
// Implement 9.2.2
return !(HTTP2Cipher.isBlackListProtocol(tlsProtocol) && HTTP2Cipher.isBlackListCipher(tlsCipher));
boolean acceptable = "h2-14".equals(protocol) || !(HTTP2Cipher.isBlackListProtocol(tlsProtocol) && HTTP2Cipher.isBlackListCipher(tlsCipher));
if (LOG.isDebugEnabled())
LOG.debug("proto={} tls={} cipher={} 9.2.2-acceptable={}",protocol,tlsProtocol,tlsCipher,acceptable);
return acceptable;
}
private class HTTPServerSessionListener extends ServerSessionListener.Adapter implements Stream.Listener