diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-01-02 08:40:25 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-01-02 08:40:25 -0200 |
| commit | bdf71c5659ad14c22ca0395f87327a3963a7ffb3 (patch) | |
| tree | 15c50ece03be5058fde66ccdc6ec0e732b22ffd1 | |
| parent | e9ba9c13ea2a56ca9aa529f7d2f9fb19f02bdf09 (diff) | |
| parent | 90e3a2b3636b8bda325ed66663bba6a6f126762b (diff) | |
| download | pfsense-packages-bdf71c5659ad14c22ca0395f87327a3963a7ffb3.tar.gz pfsense-packages-bdf71c5659ad14c22ca0395f87327a3963a7ffb3.tar.bz2 pfsense-packages-bdf71c5659ad14c22ca0395f87327a3963a7ffb3.zip | |
Merge pull request #764 from PiBa-NL/haproxy-devel_0_13
| -rw-r--r-- | config/haproxy-devel/haproxy.inc | 2 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc index 950d5f5b..9b758370 100644 --- a/config/haproxy-devel/haproxy.inc +++ b/config/haproxy-devel/haproxy.inc @@ -1259,6 +1259,7 @@ function haproxy_writeconf($configpath) { // Combine the rest of the frontend configs $default_backend = ""; + $config_usebackend = ""; $inspectdelay = 0; $i = 0; foreach ($bind['config'] as $frontend) { @@ -1285,7 +1286,6 @@ function haproxy_writeconf($configpath) { $a_acl_combine[$name][] = $entry['ref']; } - $config_usebackend = ""; foreach ($a_acl_combine as $a_usebackend) { $aclnames = ""; foreach ($a_usebackend as $entry) { diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 0edfb092..72bc03c5 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -153,7 +153,7 @@ Supports ACLs for smart backend switching.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>1.5.9 pkg v 0.14</version> + <version>1.5.9 pkg v 0.15</version> <status>Release</status> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 032217f7..6c858027 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -166,7 +166,7 @@ Supports ACLs for smart backend switching.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>1.5.3 pkg v 0.14</version> + <version>1.5.3 pkg v 0.15</version> <status>Release</status> <required_version>2.1</required_version> <config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index ff20e448..d3705b7c 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -153,7 +153,7 @@ Supports ACLs for smart backend switching.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>1.5.3 pkg v 0.14</version> + <version>1.5.3 pkg v 0.15</version> <status>Release</status> <required_version>2.1</required_version> <config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file> |