aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2013-08-20 10:29:56 -0400
committerjim-p <jimp@pfsense.org>2013-08-20 10:29:56 -0400
commite1d0046f620a5b9c244b2077cdd741359175bb91 (patch)
treee577d3315d697829210b820ee7ae913a7e0df9b8
parent41403b812238d571297a41d54697bbdef9540f60 (diff)
downloadpfsense-packages-e1d0046f620a5b9c244b2077cdd741359175bb91.tar.gz
pfsense-packages-e1d0046f620a5b9c244b2077cdd741359175bb91.tar.bz2
pfsense-packages-e1d0046f620a5b9c244b2077cdd741359175bb91.zip
HAproxy config parameter clitimeout is deprecated, should now be "timeout client".
-rw-r--r--config/haproxy/haproxy.inc2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
3 files changed, 3 insertions, 3 deletions
diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc
index 332cc8f7..61957252 100644
--- a/config/haproxy/haproxy.inc
+++ b/config/haproxy/haproxy.inc
@@ -534,7 +534,7 @@ function haproxy_writeconf() {
fwrite ($fd, "\tmaxconn\t\t\t" . $bind['max_connections'] . "\n");
if($bind['client_timeout'])
- fwrite ($fd, "\tclitimeout\t\t" . $bind['client_timeout'] . "\n");
+ fwrite ($fd, "\ttimeout client\t\t" . $bind['client_timeout'] . "\n");
// Combine the rest of the listener configs
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index ea761050..1667ab5a 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -137,7 +137,7 @@
Supports acl's for smart backend switching.]]></descr>
<website>http://haproxy.1wt.eu/</website>
<category>Services</category>
- <version>1.4.24 pkg v 1.2.2</version>
+ <version>1.4.24 pkg v 1.2.3</version>
<status>Release</status>
<required_version>2.0</required_version>
<config_file>http://www.pfsense.com/packages/config/haproxy/haproxy.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index e70de7c7..374d44e6 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -124,7 +124,7 @@
Supports acl's for smart backend switching.]]></descr>
<website>http://haproxy.1wt.eu/</website>
<category>Services</category>
- <version>1.4.24 pkg v 1.2.2</version>
+ <version>1.4.24 pkg v 1.2.3</version>
<status>Release</status>
<required_version>2.0</required_version>
<config_file>http://www.pfsense.com/packages/config/haproxy/haproxy.xml</config_file>