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

Introduced configuration properties for ALPN/NPN advertised protocols. 

No more need to copy protonego-alpn.xml to a jetty.base to specify
which protocols are advertised and in which order.
Instead, simply specify:

alpn.protocols=h2-14,http/1.1
alpn.defaultProtocol=http/1.1

in start.ini (in the example above for http2).
This commit is contained in:
Simone Bordet 2014-08-12 17:11:41 +02:00
parent e147ce9528
commit 814c84a212
10 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-alpn/jetty-alpn-server/src/main/config/etc/protonego-alpn.xml
View File

@ -16,10 +16,10 @@
<Arg>
<New id="protonego" class="org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory">
<Arg type="String">
<Property name="protonego.protocols" default="http/1.1" />
<Property name="alpn.protocols" default="" />
</Arg>
<Set name="defaultProtocol">
<Property name="protonego.defaultProtocol" default="http/1.1" />
<Property name="alpn.defaultProtocol" />
</Set>
</New>
</Arg>

4
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod
View File

@ -31,3 +31,7 @@ lib/jetty-alpn-server-${jetty.version}.jar
lib/
lib/alpn/
[ini-template]
# alpn.protocols=h2-14,http/1.1
# alpn.defaultProtocol=http/1.1

4
jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.java
View File

@ -36,9 +36,9 @@ public class ALPNServerConnectionFactory extends NegotiatingServerConnectionFact
public ALPNServerConnectionFactory(String protocols)
{
this(protocols.split(","));
this(protocols.trim().split(",", 0));
}
public ALPNServerConnectionFactory(@Name("protocols") String... protocols)
{
super("alpn", protocols);

2
jetty-distribution/src/main/resources/modules/ssl-protonego.mod
View File

@ -1,5 +1,5 @@
#
# SSL Protocol Negotiatiation Module
# SSL Protocol Negotiation Module
#
[depend]

4
jetty-http2/http2-server/src/main/config/modules/http2.mod
View File

@ -14,8 +14,4 @@ etc/jetty-http2.xml
[ini-template]
## HTTP2 Configuration
# Advertised protocols
protonego.protocols=h2-14,http/1.1
protonego.defaultProtocol=http/1.1
# http2.maxConcurrentStreams=1024

4
jetty-npn/jetty-npn-server/src/main/config/etc/protonego-npn.xml
View File

@ -17,10 +17,10 @@
<Arg>
<New id="protonego" class="org.eclipse.jetty.npn.server.NPNServerConnectionFactory">
<Arg type="String">
<Property name="protonego.protocols" default="http/1.1" />
<Property name="npn.protocols" default="" />
</Arg>
<Set name="defaultProtocol">
<Property name="protonego.defaultProtocol" default="http/1.1" />
<Property name="npn.defaultProtocol" />
</Set>
</New>
</Arg>

4
jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn.mod
View File

@ -30,3 +30,7 @@ lib/jetty-npn-server-${jetty.version}.jar
[files]
lib/
lib/npn/
[ini-template]
# npn.protocols=spdy/3,http/1.1
# npn.defaultProtocol=http/1.1

2
jetty-npn/jetty-npn-server/src/main/java/org/eclipse/jetty/npn/server/NPNServerConnectionFactory.java
View File

@ -36,7 +36,7 @@ public class NPNServerConnectionFactory extends NegotiatingServerConnectionFacto
public NPNServerConnectionFactory(String protocols)
{
this(protocols.split(","));
this(protocols.trim().split(",", 0));
}
public NPNServerConnectionFactory(@Name("protocols") String... protocols)

20
jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnectionFactory.java
View File

@ -59,9 +59,16 @@ public abstract class NegotiatingServerConnectionFactory extends AbstractConnect
{
super(protocol);
this.protocols = new ArrayList<>();
// Trim the values, as they may come from XML configuration.
for (String p : protocols)
this.protocols.add(p.trim());
if (protocols != null)
{
// Trim the values, as they may come from XML configuration.
for (String p : protocols)
{
p = p.trim();
if (!p.isEmpty())
this.protocols.add(p.trim());
}
}
}
public String getDefaultProtocol()
@ -72,7 +79,8 @@ public abstract class NegotiatingServerConnectionFactory extends AbstractConnect
public void setDefaultProtocol(String defaultProtocol)
{
// Trim the value, as it may come from XML configuration.
this.defaultProtocol = defaultProtocol.trim();
String dft = defaultProtocol == null ? "" : defaultProtocol.trim();
this.defaultProtocol = dft.isEmpty() ? null : dft;
}
public List<String> getProtocols()
@ -91,7 +99,9 @@ public abstract class NegotiatingServerConnectionFactory extends AbstractConnect
while (i.hasNext())
{
String protocol = i.next();
if ("SSL".equalsIgnoreCase(protocol) || "alpn".equalsIgnoreCase("protocol"))
if ("ssl".equalsIgnoreCase(protocol) ||
"alpn".equalsIgnoreCase(protocol) ||
"npn".equalsIgnoreCase(protocol))
{
i.remove();
}

7
jetty-spdy/spdy-http-server/src/main/config/modules/spdy.mod
View File

@ -15,8 +15,5 @@ etc/jetty-spdy.xml
[ini-template]
## SPDY Configuration
# Advertised protocols
protonego.protocols=spdy/3,http/1.1
protonego.defaultProtocol=http/1.1
# spdy.initialWindowSize=65536
# Initial Window Size for SPDY
#spdy.initialWindowSize=65536