Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
This commit is contained in:
commit
4d1c7ed28d
|
@ -164,12 +164,19 @@ etc/jetty-http.xml
|
|||
# The SPDY and HTTP/2.0 connectors require NPN. The jar for
|
||||
# NPN cannot be downloaded from eclipse. So the --download
|
||||
# option is used to install the NPN jar if it does not already
|
||||
# exist
|
||||
# exist. Uncomment the lines appropriate to the version of the
|
||||
# jvm you are using.
|
||||
#
|
||||
#-----------------------------------------------------------
|
||||
# --exec
|
||||
#
|
||||
# Uncomment the following 2 lines if using jvm < 1.7.0_40
|
||||
# --download=http://repo1.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar:lib/npn/npn-boot-1.1.5.v20130313.jar
|
||||
# -Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar
|
||||
#
|
||||
# Uncomment the following 2 lines if using jvm >= 1.7.0_40
|
||||
# --download=http://repo1.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.6.v20130911/npn-boot-1.1.6.v20130911.jar:lib/npn/npn-boot-1.1.6.v20130911.jar
|
||||
# -Xbootclasspath/p:lib/npn/npn-boot-1.1.6.v20130911.jar
|
||||
|
||||
|
||||
#===========================================================
|
||||
|
|
Loading…
Reference in New Issue