doc update

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

NEWS

@@ -4,6 +4,8 @@
   accurate TCP_INFO socket option to obtain MTU information.
 - Disable DTLS-PSK when operating under a unix socket. When no session is available
   it is not possible to derive PSK keys.
+- Added support for haproxy's protocol v1 format. That allows to utilize
+  ocserv, even with servers supporting the old protocol.
 
 
 * Version 0.11.7 (released 2017-02-12)

doc/sample.config

@@ -181,8 +181,10 @@ max-same-clients = 2
 
 # When the server receives connections from a proxy, like haproxy
 # which supports the proxy protocol, set this to obtain the correct
-# client addresses. The proxy protocol (v2) would then be expected in
-# the TCP or UNIX socket (not the UDP one).
+# client addresses. The proxy protocol would then be expected in
+# the TCP or UNIX socket (not the UDP one). Although both v1
+# and v2 versions of proxy protocol are supported, the v2 version
+# is recommended as it is more efficient in parsing.
 #listen-proxy-proto = true
 
 # Limit the number of client connections to one every X milliseconds 

src/ocserv-args.def

@@ -273,7 +273,9 @@ max-same-clients = 2
 # When the server receives connections from a proxy, like haproxy
 # which supports the proxy protocol, set this to obtain the correct
 # client addresses. The proxy protocol (v2) would then be expected in
-# the TCP or UNIX socket (not the UDP one).
+# the TCP or UNIX socket (not the UDP one). Although both v1
+# and v2 versions of proxy protocol are supported, the v2 version
+# is recommended as it is more efficient in parsing.
 #listen-proxy-proto = true
 
 # Limit the number of client connections to one every X milliseconds