diff options
| author | Greg Wilkins | 2014-09-04 07:43:18 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2014-09-04 07:43:18 +0000 |
| commit | 5b97d652e1704a0b425085adf6e3f77103434986 (patch) | |
| tree | eda4c3fba45e66b60bfe3b09cadac9af014a9b72 /jetty-alpn/jetty-alpn-server/src/main/config | |
| parent | 5be1fb62703a915ca816d328438f164fb6d9fc9d (diff) | |
| parent | 8d332b0962e183679906738f6634f30ef0a84254 (diff) | |
| download | org.eclipse.jetty.project-5b97d652e1704a0b425085adf6e3f77103434986.tar.gz org.eclipse.jetty.project-5b97d652e1704a0b425085adf6e3f77103434986.tar.xz org.eclipse.jetty.project-5b97d652e1704a0b425085adf6e3f77103434986.zip | |
Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn.mod
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java
Diffstat (limited to 'jetty-alpn/jetty-alpn-server/src/main/config')
| -rw-r--r-- | jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod | 6 |
1 files changed, 6 insertions, 0 deletions
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 cabaeba942..4e6440fd17 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 @@ -35,3 +35,9 @@ lib/alpn/ # alpn.protocols=h2-14,http/1.1 # alpn.defaultProtocol=http/1.1 +[license] +ALPN is a hosted at github under the GPL v2 with ClassPath Exception. +ALPM replaces/modified OpenJDK classes in the java.sun.security.ssl package. +http://github.com/jetty-project/jetty-alpn +http://openjdk.java.net/legal/gplv2+ce.html + |