aboutsummaryrefslogtreecommitdiffstats
path: root/config/haproxy-devel/haproxy_global.php
diff options
context:
space:
mode:
authorJim P <jim@pingle.org>2013-05-01 14:08:24 -0700
committerJim P <jim@pingle.org>2013-05-01 14:08:24 -0700
commit85768b005a06bb109a822f00730da4283b0ec1bf (patch)
tree0d21b109bbcc2ce718f922dd3e9535cd2f08711b /config/haproxy-devel/haproxy_global.php
parent3fc3abd66decb105600cd58f2e3a4ca901f1f2c0 (diff)
parent647d80b809eadc6183122dd746a9b8d13f6117d0 (diff)
downloadpfsense-packages-85768b005a06bb109a822f00730da4283b0ec1bf.tar.gz
pfsense-packages-85768b005a06bb109a822f00730da4283b0ec1bf.tar.bz2
pfsense-packages-85768b005a06bb109a822f00730da4283b0ec1bf.zip
Merge pull request #442 from PiBa-NL/haproxy-devel-2.1
haproxy-devel added widget from external github tree made by: jvorhees
Diffstat (limited to 'config/haproxy-devel/haproxy_global.php')
-rwxr-xr-xconfig/haproxy-devel/haproxy_global.php8
1 files changed, 1 insertions, 7 deletions
diff --git a/config/haproxy-devel/haproxy_global.php b/config/haproxy-devel/haproxy_global.php
index 2ff65c0e..7ff0fb65 100755
--- a/config/haproxy-devel/haproxy_global.php
+++ b/config/haproxy-devel/haproxy_global.php
@@ -42,13 +42,7 @@ if ($_POST) {
$pconfig = $_POST;
if ($_POST['apply']) {
- $retval = 0;
- config_lock();
- $retval = haproxy_configure();
- config_unlock();
-
- $result = haproxy_check_writtenconfig_error($messages);
- $savemsg = $messages;
+ $result = haproxy_check_and_run($savemsg, true);
if ($result)
unlink_if_exists($d_haproxyconfdirty_path);
} else {