diff options
| author | Simone Bordet | 2014-08-12 15:11:41 +0000 |
|---|---|---|
| committer | Simone Bordet | 2014-08-12 16:54:33 +0000 |
| commit | 814c84a21200220fe2e0d38140c362d2d7f1fea4 (patch) | |
| tree | 7158775ba4a83332a913732c9f93621925413721 /jetty-alpn/jetty-alpn-server/src/main/config | |
| parent | e147ce9528d4856eb3cd8b85639d2044fefdca9e (diff) | |
| download | org.eclipse.jetty.project-814c84a21200220fe2e0d38140c362d2d7f1fea4.tar.gz org.eclipse.jetty.project-814c84a21200220fe2e0d38140c362d2d7f1fea4.tar.xz org.eclipse.jetty.project-814c84a21200220fe2e0d38140c362d2d7f1fea4.zip | |
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).
Diffstat (limited to 'jetty-alpn/jetty-alpn-server/src/main/config')
| -rw-r--r-- | jetty-alpn/jetty-alpn-server/src/main/config/etc/protonego-alpn.xml | 4 | ||||
| -rw-r--r-- | jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/etc/protonego-alpn.xml b/jetty-alpn/jetty-alpn-server/src/main/config/etc/protonego-alpn.xml index e3a15f29f0..6fb836fb53 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/etc/protonego-alpn.xml +++ b/jetty-alpn/jetty-alpn-server/src/main/config/etc/protonego-alpn.xml @@ -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> diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod index ca51179c26..cabaeba942 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod @@ -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 + |