From e05ad5dd996123bff31218fed54995216416b712 Mon Sep 17 00:00:00 2001 From: Aleks Date: Fri, 18 May 2018 17:47:47 +0200 Subject: docs: mention HAproxy protocol "version 1" ...as there's also a version 2. Closes #2579 --- docs/libcurl/curl_easy_setopt.3 | 2 +- docs/libcurl/opts/CURLOPT_HAPROXYPROTOCOL.3 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/libcurl') diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index 01fecec86..bdaf59f6c 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -186,7 +186,7 @@ Socks5 GSSAPI NEC mode. See \fICURLOPT_SOCKS5_GSSAPI_NEC(3)\fP .IP CURLOPT_PROXY_SERVICE_NAME Proxy authentication service name. \fICURLOPT_PROXY_SERVICE_NAME(3)\fP .IP CURLOPT_HAPROXYPROTOCOL -Send an HAProxy PROXY protocol header. See \fICURLOPT_HAPROXYPROTOCOL(3)\fP +Send an HAProxy PROXY protocol v1 header. See \fICURLOPT_HAPROXYPROTOCOL(3)\fP .IP CURLOPT_SERVICE_NAME Authentication service name. \fICURLOPT_SERVICE_NAME(3)\fP .IP CURLOPT_INTERFACE diff --git a/docs/libcurl/opts/CURLOPT_HAPROXYPROTOCOL.3 b/docs/libcurl/opts/CURLOPT_HAPROXYPROTOCOL.3 index 01e667d16..679ab2360 100644 --- a/docs/libcurl/opts/CURLOPT_HAPROXYPROTOCOL.3 +++ b/docs/libcurl/opts/CURLOPT_HAPROXYPROTOCOL.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2017, Daniel Stenberg, , et al. +.\" * Copyright (C) 1998 - 2018, Daniel Stenberg, , et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -22,7 +22,7 @@ .\" .TH CURLOPT_HAPROXYPROTOCOL 3 "5 Feb 2018" "libcurl 7.60.0" "curl_easy_setopt options" .SH NAME -CURLOPT_HAPROXYPROTOCOL \- send HAProxy PROXY protocol header +CURLOPT_HAPROXYPROTOCOL \- send HAProxy PROXY protocol v1 header .SH SYNOPSIS #include @@ -30,7 +30,7 @@ CURLcode curl_easy_setopt(CURL *handle, CURLOPT_HAPROXYPROTOCOL, long haproxy_protocol); .SH DESCRIPTION A long parameter set to 1 tells the library to send an HAProxy PROXY -protocol header at beginning of the connection. The default action is not to +protocol v1 header at beginning of the connection. The default action is not to send this header. This option is primarily useful when sending test requests to a service that @@ -38,7 +38,7 @@ expects this header. Most applications do not need this option. .SH DEFAULT -0, do not send HAProxy PROXY protocol header +0, do not send any HAProxy PROXY protocol header .SH PROTOCOLS HTTP .SH EXAMPLE -- cgit v1.2.3