From: Luca Toscano Date: Fri, 30 Dec 2016 19:20:32 +0000 (+0000) Subject: Documentation rebuild for mod_remoteip X-Git-Tag: 2.5.0-alpha~843 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77c6576f566da7f859eea6da29bc9848ae516de6;p=thirdparty%2Fapache%2Fhttpd.git Documentation rebuild for mod_remoteip git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776628 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_remoteip.html.en b/docs/manual/mod/mod_remoteip.html.en index 7da43c00900..255ee5105ae 100644 --- a/docs/manual/mod/mod_remoteip.html.en +++ b/docs/manual/mod/mod_remoteip.html.en @@ -49,8 +49,8 @@ via the request headers.

Additionally, this module implements the server side of HAProxy's - Proxy Protocol when - using the RemoteIPProxyProtocolEnable + PROXY Protocol when + using the RemoteIPProxyProtocol directive.

Once replaced as instructed, this overridden useragent IP address is @@ -229,26 +229,26 @@ RemoteIPProxiesHeader X-Forwarded-By

top

RemoteIPProxyProtocol Directive

- - + +
Description:Enable, optionally enable or disable the proxy protocol handling
Syntax:ProxyProtocol On|Optional|Off
Description:Enable, optionally enable or disable the PROXY protocol handling
Syntax:RemoteIPProxyProtocol On|Optional|Off
Context:server config, virtual host
Status:Base
Module:mod_remoteip
-

The RemoteIPProxyProtocolEnable enables or - disables the reading and handling of the proxy protocol connection header. +

The RemoteIPProxyProtocol enables or + disables the reading and handling of the PROXY protocol connection header. If enabled with the On flag, the upstream client must send the header every time it opens a connection or the connection will be aborted. If enabled with the Optional flag, the upstream client may send the header.

While this directive may be specified in any virtual host, it is - important to understand that because the proxy protocol is connection + important to understand that because the PROXY protocol is connection based and protocol agnostic, the enabling and disabling is actually based on ip-address and port. This means that if you have multiple name-based virtual hosts for the same host and port, and you enable it any one of them, then it is enabled for all them (with that host and port). It also - means that if you attempt to enable the proxy protocol in one and disable + means that if you attempt to enable the PROXY protocol in one and disable in the other, that won't work; in such a case the last one wins and a notice will be logged indicating which setting was being overridden.

@@ -263,26 +263,26 @@ RemoteIPProxiesHeader X-Forwarded-By 
Listen 80
 <VirtualHost *:80>
     ServerName www.example.com
-    RemoteIPProxyProtocolEnable Optional
+    RemoteIPProxyProtocol Optional
 
     #Requests to this virtual host may optionally not have
-    # a proxy protocol header provided
+    # a PROXY protocol header provided
 </VirtualHost>
 
 <VirtualHost *:80>
     ServerName www.example.com
-    RemoteIPProxyProtocolEnable On
+    RemoteIPProxyProtocol On
 
-    #Requests to this virtual host must have a proxy protocol
+    #Requests to this virtual host must have a PROXY protocol
     # header provided. If it is missing, a 400 will result
 </VirtualHost>
 
 Listen 8080
 <VirtualHost *:8080>
     ServerName www.example.com
-    RemoteIPProxyProtocolEnable On
+    RemoteIPProxyProtocol On
 
-    #Requests to this virtual host must have a proxy protocol
+    #Requests to this virtual host must have a PROXY protocol
     # header provided. If it is missing, the connection will
     # be aborted
 </VirtualHost>
diff --git a/docs/manual/mod/mod_remoteip.xml.fr b/docs/manual/mod/mod_remoteip.xml.fr index 6655e17feb7..5456d48d23f 100644 --- a/docs/manual/mod/mod_remoteip.xml.fr +++ b/docs/manual/mod/mod_remoteip.xml.fr @@ -1,7 +1,7 @@ - +