From 921f05b5f350ef0d39e93fe9b1c8efac7dd8b64d Mon Sep 17 00:00:00 2001 From: PiBa-NL Date: Mon, 16 Mar 2015 19:34:37 +0100 Subject: haproxy-1_5, haproxy-devel, pkg v0.22 fix SNI handling inspect-delay 5s instead if 5ms, show 'not' in acls when set --- config/haproxy-devel/pkg/haproxy.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config/haproxy-devel/pkg') diff --git a/config/haproxy-devel/pkg/haproxy.inc b/config/haproxy-devel/pkg/haproxy.inc index 15fbcd17..495f59c0 100644 --- a/config/haproxy-devel/pkg/haproxy.inc +++ b/config/haproxy-devel/pkg/haproxy.inc @@ -1302,7 +1302,7 @@ function haproxy_writeconf($configpath) { } if ($inspectdelay > 0) - fwrite ($fd, "\ttcp-request inspect-delay\t" . $inspectdelay . "\n"); + fwrite ($fd, "\ttcp-request inspect-delay\t" . $inspectdelay . "s\n"); // Write acl's first, so they may be used by advanced text options written by user. fwrite ($fd, $config_acls); @@ -1897,9 +1897,9 @@ function get_frontend_acls($frontend) { // Filter out acls for different modes if ($acl['mode'] != '' && $acl['mode'] != strtolower($mainfrontend['type'])) continue; - $not = $entry['not'] == "yes" ? "not " : ""; + $not = $entry['not'] == "yes" ? "not: " : ""; $acl_item = array(); - $acl_item['descr'] = $acl['name'] . " " . (isset($acl['novalue']) ? "" : $entry['value']); + $acl_item['descr'] = $acl['name'] . " " . (isset($acl['novalue']) ? "" : $not . $entry['value']); $acl_item['ref'] = $entry; $result[] = $acl_item; -- cgit v1.2.3