diff options
Diffstat (limited to 'jetty-server/src/main/config')
5 files changed, 38 insertions, 4 deletions
diff --git a/jetty-server/src/main/config/etc/jetty-http.xml b/jetty-server/src/main/config/etc/jetty-http.xml index 0cbc5a0871..ebeed5d1fc 100644 --- a/jetty-server/src/main/config/etc/jetty-http.xml +++ b/jetty-server/src/main/config/etc/jetty-http.xml @@ -26,10 +26,6 @@ <Arg name="selectors" type="int"><Property name="jetty.http.selectors" deprecated="http.selectors" default="-1"/></Arg> <Arg name="factories"> <Array type="org.eclipse.jetty.server.ConnectionFactory"> - <!-- uncomment to support proxy protocol - <Item> - <New class="org.eclipse.jetty.server.ProxyConnectionFactory"/> - </Item>--> <Item> <New class="org.eclipse.jetty.server.HttpConnectionFactory"> <Arg name="config"><Ref refid="httpConfig" /></Arg> diff --git a/jetty-server/src/main/config/etc/jetty-proxy-protocol-ssl.xml b/jetty-server/src/main/config/etc/jetty-proxy-protocol-ssl.xml new file mode 100644 index 0000000000..91452f2738 --- /dev/null +++ b/jetty-server/src/main/config/etc/jetty-proxy-protocol-ssl.xml @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> + +<Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector"> + <Call name="addFirstConnectionFactory"> + <Arg> + <New class="org.eclipse.jetty.server.ProxyConnectionFactory"/> + </Arg> + </Call> +</Configure> diff --git a/jetty-server/src/main/config/etc/jetty-proxy-protocol.xml b/jetty-server/src/main/config/etc/jetty-proxy-protocol.xml new file mode 100644 index 0000000000..5169c4fddd --- /dev/null +++ b/jetty-server/src/main/config/etc/jetty-proxy-protocol.xml @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> + +<Configure id="httpConnector" class="org.eclipse.jetty.server.ServerConnector"> + <Call name="addFirstConnectionFactory"> + <Arg> + <New class="org.eclipse.jetty.server.ProxyConnectionFactory"/> + </Arg> + </Call> +</Configure> diff --git a/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod b/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod new file mode 100644 index 0000000000..764d24b847 --- /dev/null +++ b/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod @@ -0,0 +1,9 @@ +# +# PROXY Protocol Module - SSL +# + +[depend] +ssl + +[xml] +etc/jetty-proxy-protocol-ssl.xml diff --git a/jetty-server/src/main/config/modules/proxy-protocol.mod b/jetty-server/src/main/config/modules/proxy-protocol.mod new file mode 100644 index 0000000000..9df2700f4e --- /dev/null +++ b/jetty-server/src/main/config/modules/proxy-protocol.mod @@ -0,0 +1,9 @@ +# +# PROXY Protocol Module - HTTP +# + +[depend] +http + +[xml] +etc/jetty-proxy-protocol.xml |