haproxy-devel, move files to subfolders

6 files changed, 3262 insertions, 0 deletions

diff --git a/config/haproxy-devel/pkg/haproxy.inc b/config/haproxy-devel/pkg/haproxy.inc
new file mode 100644
index 00000000..15fbcd17
--- /dev/null
+++ b/config/haproxy-devel/pkg/haproxy.inc
@@ -0,0 +1,2006 @@
+<?php
+/*
+    haproxy.inc
+	Copyright (C) 2013-2015 PiBa-NL
+	Copyright (C) 2009 Scott Ullrich <sullrich@pfsense.com>
+    Copyright (C) 2008 Remco Hoef
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/* include all configuration functions */
+require_once("functions.inc");
+require_once("pkg-utils.inc");
+require_once("notices.inc");
+require_once("filter.inc");
+require_once("haproxy_utils.inc");
+require_once("haproxy_xmlrpcsyncclient.inc");
+
+$d_haproxyconfdirty_path = $g['varrun_path'] . "/haproxy.conf.dirty";
+
+global $a_frontendmode;
+$a_frontendmode = array();
+$a_frontendmode['http'] = array('name' => "http / https(offloading)", 'shortname' => "http/https");
+$a_frontendmode['https'] = array('name' => "ssl / https(TCP mode)", 'shortname' => "ssl/https");
+$a_frontendmode['tcp'] = array('name' => "tcp", 'shortname' => "tcp");
+$a_frontendmode['health'] = array('name' => "health", 'shortname' => "health");
+
+global $a_acltypes;
+$a_acltypes = array();
+$a_acltypes["host_starts_with"] = array('name' => 'Host starts with:',
+				'mode' => 'http', 'syntax' => 'hdr_beg(host) -i %1$s');
+$a_acltypes["host_ends_with"] = array('name' => 'Host ends with:',
+				'mode' =>'http', 'syntax' => 'hdr_end(host) -i %1$s');
+$a_acltypes["host_matches"] = array('name' => 'Host matches:',
+				'mode' =>'http', 'syntax' => 'hdr(host) -i %1$s');
+$a_acltypes["host_regex"] = array('name' => 'Host regex:',
+				'mode' =>'http', 'syntax' => 'hdr_reg(host) -i %1$s');
+$a_acltypes["host_contains"] = array('name' => 'Host contains:',
+				'mode' => 'http', 'syntax' => 'hdr_dir(host) -i %1$s');
+$a_acltypes["path_starts_with"] = array('name' => 'Path starts with:',
+				'mode' => 'http', 'syntax' => 'path_beg -i %1$s');
+$a_acltypes["path_ends_with"] = array('name' => 'Path ends with:',
+				'mode' => 'http', 'syntax' => 'path_end -i %1$s');
+$a_acltypes["path_matches"] = array('name' => 'Path matches:',
+				'mode' => 'http', 'syntax' => 'path -i %1$s');
+$a_acltypes["path_regex"] = array('name' => 'Path regex:',
+				'mode' => 'http', 'syntax' => 'path_reg -i %1$s');
+$a_acltypes["path_contains"] = array('name' => 'Path contains:',
+				'mode' => 'http', 'syntax' => 'path_dir -i %1$s');
+$a_acltypes["ssl_c_verify_code"] = array('name' => 'SSL Client certificate verify error result:',
+				'mode' => 'http', 'syntax' => 'ssl_c_verify %1$s', 'require_client_cert' => '1');
+				// ssl_c_verify result codes: https://www.openssl.org/docs/apps/verify.html#DIAGNOSTICS
+$a_acltypes["ssl_c_verify"] = array('name' => 'SSL Client certificate valid.',
+				'mode' => 'http', 'syntax' => 'ssl_c_verify 0', 'novalue' => '1', 'require_client_cert' => '1');
+$a_acltypes["ssl_c_ca_commonname"] = array('name' => 'SSL Client issued by CA common-name:',
+				'mode' => 'http', 'syntax' => 'ssl_c_i_dn(CN) %1$s', 'require_client_cert' => '1');
+$a_acltypes["source_ip"] = array('name' => 'Source IP matches IP or Alias:',
+				'mode' => '', 'syntax' => 'src %1$s');
+$a_acltypes["backendservercount"] = array('name' => 'Minimum count usable servers:',
+				'mode' => '', 'syntax' => 'nbsrv(%2$s) ge %1$d', 'parameters' => 'value,backendname');
+$a_acltypes["traffic_is_http"] = array('name' => 'Traffic is http (no value needed):',  'inspect-delay' => '5',
+				'mode' => 'tcp', 'syntax' => 'req.proto_http', 'advancedoptions' => "tcp-request content accept if { req.proto_http }");
+$a_acltypes["traffic_is_ssl"] = array('name' => 'Traffic is ssl (no value needed):', 'inspect-delay' => '5',
+				'mode' => 'tcp', 'syntax' => 'req.ssl_ver gt 0', 'advancedoptions' => "tcp-request content accept if { req.ssl_ver gt 0 }");
+// 'ssl_sni_matches' was added in HAProxy1.5dev17
+$a_acltypes["ssl_sni_matches"] = array('name' => 'Server Name Indication TLS extension matches:', 'inspect-delay' => '5',
+				'mode' => 'https', 'syntax' => 'req.ssl_sni -i %1$s', 'advancedoptions' => "tcp-request content accept if { req.ssl_hello_type 1 }");
+$a_acltypes["ssl_sni_contains"] = array('name' => 'Server Name Indication TLS extension contains:', 'inspect-delay' => '5',
+				'mode' => 'https', 'syntax' => 'req.ssl_sni -m sub -i %1$s', 'advancedoptions' => "tcp-request content accept if { req.ssl_hello_type 1 }");
+$a_acltypes["ssl_sni_starts_with"] = array('name' => 'Server Name Indication TLS extension starts with:', 'inspect-delay' => '5',
+				'mode' => 'https', 'syntax' => 'req.ssl_sni -m beg -i %1$s', 'advancedoptions' => "tcp-request content accept if { req.ssl_hello_type 1 }");
+$a_acltypes["ssl_sni_ends_with"] = array('name' => 'Server Name Indication TLS extension ends with:', 'inspect-delay' => '5',
+				'mode' => 'https', 'syntax' => 'req.ssl_sni -m end -i %1$s', 'advancedoptions' => "tcp-request content accept if { req.ssl_hello_type 1 }");
+$a_acltypes["ssl_sni_regex"] = array('name' => 'Server Name Indication TLS extension regex:', 'inspect-delay' => '5',
+				'mode' => 'https', 'syntax' => 'req.ssl_sni -m reg -i %1$s', 'advancedoptions' => "tcp-request content accept if { req.ssl_hello_type 1 }");
+$a_acltypes["custom"] = array('name' => 'Custom acl:',
+				'mode' => '', 'syntax' => '%1$s');
+
+global $a_checktypes;
+$a_checktypes = array();
+$a_checktypes['none'] = array('name' => 'none', 'syntax' => '',
+	'descr' => 'No health checks will be performed.');
+$a_checktypes['Basic'] = array('name' => 'Basic', 'syntax' => '',
+	'descr' => 'Basic socket connection check');
+$a_checktypes['HTTP'] = array('name' => 'HTTP', 'syntax' => 'httpchk',
+	'descr' => 'HTTP protocol to check on the servers health, can also be used for HTTPS servers(requirs checking the SSL box for the servers).', 'parameters' => "uri,method,version");
+// 'Agent' was added in HAProxy1.5dev18, and removed in 1.5dev20, in favor of the seperate agent-check option.
+$a_checktypes['Agent'] = array('name' => 'Agent', 'syntax' => 'lb-agent-chk', 'usedifferenport' => 'yes', 
+	'descr' => 'Use a TCP connection to read an ASCII string of the form 100%,75%,drain,down (others in haproxy manual)',
+	'deprecated' => true);
+$a_checktypes['LDAP'] = array('name' => 'LDAP', 'syntax' => 'ldap-check',
+	'descr' => 'Use LDAPv3 health checks for server testing');
+$a_checktypes['MySQL'] = array('name' => 'MySQL', 'syntax' => 'mysql-check',
+	'descr' => 'Use MySQL health checks for server testing', 'parameters' => 'username');
+$a_checktypes['PostgreSQL'] = array('name' => 'PostgreSQL', 'syntax' => 'pgsql-check',
+	'descr' => 'Use PostgreSQL health checks for server testing', 'parameters' => 'username');
+$a_checktypes['Redis'] = array('name' => 'Redis', 'syntax' => 'redis-check',
+	'descr' => 'Test that the server correctly talks REDIS protocol.');
+$a_checktypes['SMTP'] = array('name' => 'SMTP', 'syntax' => 'smtpchk HELO',
+	'descr' => 'Use SMTP HELO health checks for server testing', 'parameters' => 'domain');
+$a_checktypes['ESMTP'] = array('name' => 'ESMTP', 'syntax' => 'smtpchk EHLO',
+	'descr' => 'Use ESMTP EHLO health checks for server testing', 'parameters' => 'domain');
+$a_checktypes['SSL'] = array('name' => 'SSL', 'syntax' => 'ssl-hello-chk',
+	'descr' => 'Use SSLv3 client hello health checks for server testing.');
+
+global $a_httpcheck_method;
+$a_httpcheck_method = array();
+$a_httpcheck_method['OPTIONS'] = array('name' => 'OPTIONS', 'syntax' => 'OPTIONS');
+$a_httpcheck_method['HEAD']    = array('name' => 'HEAD', 'syntax' => 'HEAD');
+$a_httpcheck_method['GET']     = array('name' => 'GET', 'syntax' => 'GET');
+$a_httpcheck_method['POST']    = array('name' => 'POST', 'syntax' => 'POST');
+$a_httpcheck_method['PUT']     = array('name' => 'PUT', 'syntax' => 'PUT');
+$a_httpcheck_method['DELETE']  = array('name' => 'DELETE', 'syntax' => 'DELETE');
+$a_httpcheck_method['TRACE']   = array('name' => 'TRACE', 'syntax' => 'TRACE');
+
+global $a_closetypes;
+$a_closetypes = array();
+//$a_closetypes['none'] = array('name' => 'none', 'syntax' => '',
+//	'descr' => 'No close headers will be changed.');
+$a_closetypes['http-keep-alive'] = array('name' => 'http-keep-alive (default)', 'syntax' => 'http-keep-alive',
+	'descr' => 'By default HAProxy operates in keep-alive mode with regards to persistent connections: for each connection it processes each request and response, and leaves the connection idle on both sides between the end of a response and the start of a new request.');
+$a_closetypes['http-tunnel'] = array('name' => 'http-tunnel', 'syntax' => 'http-tunnel',
+	'descr' => 'Option "http-tunnel" disables any HTTP processing past the first request and the first response. This is the mode which was used by default in versions 1.0 to 1.5-dev21. It is the mode with the lowest processing overhead, which is normally not needed anymore unless in very specific cases such as when using an in-house protocol that looks like HTTP but is not compatible, or just to log one request per client in order to reduce log size. Note that everything which works at the HTTP level, including header parsing/addition, cookie processing or content switching will only work for the first request and will be ignored after the first response.');
+$a_closetypes['httpclose'] = array('name' => 'httpclose', 'syntax' => 'httpclose',
+	'descr' => 'The "httpclose" option removes any "Connection" header both ways, and adds a "Connection: close" header in each direction. This makes it easier to disable HTTP keep-alive than the previous 4-rules block.');
+$a_closetypes['http-server-close'] = array('name' => 'http-server-close', 'syntax' => 'http-server-close',
+	'descr' => 'By default, when a client communicates with a server, HAProxy will only analyze, log, and process the first request of each connection. Setting "option http-server-close" enables HTTP connection-close mode on the server side while keeping the ability to support HTTP keep-alive and pipelining on the client side.  This provides the lowest latency on the client side (slow network) and the fastest session reuse on the server side to save server resources.');
+$a_closetypes['forceclose'] = array('name' => 'forceclose', 'syntax' => 'forceclose',
+	'descr' => 'Some HTTP servers do not necessarily close the connections when they receive the "Connection: close" set by "option httpclose", and if the client does not close either, then the connection remains open till the timeout expires. This causes high number of simultaneous connections on the servers and shows high global session times in the logs. Note that this option also enables the parsing of the full request and response, which means we can close the connection to the server very quickly, releasing some resources earlier than with httpclose.');
+
+global $a_servermodes;
+$a_servermodes = array();
+$a_servermodes["active"]['name'] = "active";
+$a_servermodes["active"]['sign'] = "";
+$a_servermodes["backup"]['name'] = "backup";
+$a_servermodes["backup"]['sign'] = "*";
+$a_servermodes["disabled"]['name'] = "disabled";
+$a_servermodes["disabled"]['sign'] = "?";
+$a_servermodes["inactive"]['name'] = "inactive";
+$a_servermodes["inactive"]['sign'] = "-";
+
+// http://www.exceliance.fr/sites/default/files/biblio/aloha_load_balancer_haproxy_cookie_persistence_methods_memo.pdf
+global $a_cookiemode;
+$a_cookiemode = array();
+$a_cookiemode['passive'] 				= array('name' => 'Passive', 'syntax' => 'cookie <cookie name>',
+	'descr' => 'Cookie is analysed on incoming request to choose server. HAProxy does not perform any insertion update or deletion on the Cookie or Set-Cookie. If the Cookie is not set, then the load-balancing algorithm is applied.');
+$a_cookiemode['passive-silent']			= array('name' => 'Passive-silent', 'syntax' => 'cookie <cookie name> indirect',
+	'descr' => 'Cookie is analysed on incoming request to choose server. HAProxy does not perform any insertion, update or deletion on the Cookie. Set-Cookie is removed from response if not required. If the Cookie is not set, then HAProxy applies the load-balancing algorithm.');
+$a_cookiemode['reset']					= array('name' => 'Reset', 'syntax' => 'cookie <cookie name> rewrite',
+	'descr' => 'Cookie is analysed on incoming request to choose server and Set-Cookie value is overwritten in response if present. If the Set-Cookie isn\'t sent by the server, then HAProxy won\'t set it.');
+$a_cookiemode['set']					= array('name' => 'Insert', 'syntax' => 'cookie <cookie name> insert',
+	'descr' => 'Cookie is analyzed on incoming request to choose server and Set-Cookie value is overwritten if present and set to an unknown value or inserted in response if not present.');
+$a_cookiemode['set-silent'] 			= array('name' => 'Insert-silent', 'syntax' => 'cookie <cookie name> insert indirect',
+	'descr' => 'Cookie is analyzed on incoming request to choose server and Set-Cookie value is overwritten if present, inserted in response if needed and removed if a valid Cookie was provided.');
+$a_cookiemode['insert-only'] 			= array('name' => 'Insert-preserve', 'syntax' => 'cookie <cookie name> preserve insert',
+	'descr' => 'Cookie is analyzed on incoming request to choose server. Set-Cookie value is set only if the server does not provide one or if the client came without the Cookie.');
+$a_cookiemode['insert-only-silent'] 	= array('name' => 'Insert-preserve-silent', 'syntax' => 'cookie <cookie name> preserve insert indirect',
+	'descr' => 'Cookie is analyzed on incoming request to choose server and Set-Cookie value is left untouched if present, inserted in response if needed or removed if not needed.');
+$a_cookiemode['session-prefix'] 		= array('name' => 'Session-prefix', 'syntax' => 'cookie <cookie name> prefix',
+	'descr' => 'Cookie is analyzed on incoming request to choose server whose Cookie Name prefix matches. Set Cookie value is prefixed using server line Cookie ID in response. Cookie is modified only between HAProxy and the client only');
+$a_cookiemode['passive-session-prefix'] = array('name' => 'Passive-session-prefix', 'syntax' => 'cookie <cookie name> preserve prefix indirect',
+	'descr' => 'Cookie is analysed on incoming request to choose server whose Cookie ID prefix matches.');
+foreach($a_cookiemode as &$cookiemode)
+	$cookiemode['descr'] = $cookiemode['descr'] . "\n\n" . $cookiemode['syntax'] . "";
+
+global $a_sticky_type;
+$a_sticky_type = array();
+$a_sticky_type['none'] = array('name' => 'none',
+	'descr' => "No stick-table will be used");
+$a_sticky_type['stick_sslsessionid'] = array('name' => 'Stick on SSL-Session-ID',
+	'descr' => "Only used on https frontends. Uses the SSL-Session-ID to persist clients to a server.");
+$a_sticky_type['stick_sourceipv4'] = array('name' => 'Stick on SourceIP IPv4',
+	'descr' => "Stick on the client ip, drawback is that multiple clients behind a natted public ip will be balanced to the same server.");
+$a_sticky_type['stick_sourceipv6'] = array('name' => 'Stick on SourceIP IPv6',
+	'descr' => "Stick on the client ip, drawback is that multiple clients behind a natted public ip will be balanced to the same server.");
+$a_sticky_type['stick_cookie_value'] = array('name' => 'Stick on existing Cookie value',
+	'descr' => "Stick on the value of a session cookie",
+	'cookiedescr' => "Enables SSL-session-id based persistence. (only use on 'https' and 'tcp' frontends that use SSL)<br/>EXAMPLE: JSESSIONID PHPSESSIONID ASP.NET_SessionId");
+$a_sticky_type['stick_rdp_cookie'] = array('name' => 'Stick on RDP-cookie',
+	'descr' => "Uses a RDP-Cookie send by the mstsc client, note that not all clients send this.",
+	'cookiedescr' => 'EXAMPLE: msts or mstshash');
+
+
+global $a_error;
+$a_error = array();
+$a_error['200'] = array('descr' => "stats or monitoring requests");
+$a_error['400'] = array('descr' => "request invalid or too large");
+$a_error['401'] = array('descr' => "authentication is required to perform the action");
+$a_error['403'] = array('descr' => "request is forbidden");
+$a_error['408'] = array('descr' => "timeout before the request is complete");
+$a_error['500'] = array('descr' => "internal error");
+$a_error['502'] = array('descr' => "server response invalid or blocked");
+$a_error['503'] = array('descr' => "no server was available to handle the request");
+$a_error['504'] = array('descr' => "timeout before the server responds");
+   
+if(!function_exists('group_ports')){
+// function group_ports() is present in pfSense 2.2 in util.inc
+/* create ranges of sequential port numbers (200:215) and remove duplicates */
+function group_ports($ports) {
+	if (!is_array($ports) || empty($ports))
+		return;
+
+	$uniq = array();
+	foreach ($ports as $port) {
+		if (is_portrange($port)) {
+			list($begin, $end) = explode(":", $port);
+			if ($begin > $end) {
+				$aux = $begin;
+				$begin = $end;
+				$end = $aux;
+			}
+			for ($i = $begin; $i <= $end; $i++)
+				if (!in_array($i, $uniq))
+					$uniq[] = $i;
+		} else if (is_port($port)) {
+			if (!in_array($port, $uniq))
+				$uniq[] = $port;
+		}
+	}
+	sort($uniq, SORT_NUMERIC);
+
+	$result = array();
+	foreach ($uniq as $idx => $port) {
+		if ($idx == 0) {
+			$result[] = $port;
+			continue;
+		}
+
+		$last = end($result);
+		if (is_portrange($last))
+			list($begin, $end) = explode(":", $last);
+		else
+			$begin = $end = $last;
+
+		if ($port == ($end+1)) {
+			$end++;
+			$result[count($result)-1] = "{$begin}:{$end}";
+		} else {
+			$result[] = $port;
+		}
+	}
+
+	return $result;
+}
+}
+
+function haproxy_portoralias_to_list($port_or_alias) {
+	// input: a port or aliasname: 80 https MyPortAlias
+	// returns: a array of ports and portranges 80 443 8000:8010
+	
+	global $aliastable;
+	$portresult = array();
+	if (alias_get_type($port_or_alias) == "port") {
+		$aliasports = $aliastable[$port_or_alias];
+		$ports = explode(' ',$aliasports);
+		foreach($ports as $port) {
+			$portresults = haproxy_portoralias_to_list($port);
+			$portresult = array_merge($portresult, $portresults);
+		}
+		return $portresult;
+	} else if (is_portrange($port_or_alias)) {
+		return (array)$port_or_alias;
+	} else {
+		$ports = explode(",", $port_or_alias);
+		foreach($ports as $port){
+			if (is_port($port)) {
+				if (getservbyname($port, "tcp"))
+					$port = getservbyname($port, "tcp");
+				if (getservbyname($port, "udp"))
+					$port = getservbyname($port, "udp");
+				$portresult[] = $port;
+			}
+		}
+		return $portresult;
+	}
+}
+function haproxy_addressoralias_to_list($address_or_alias) {
+	global $aliastable;
+	$result = array();
+	$alias_type = alias_get_type($address_or_alias);
+	if (!empty($alias_type)) {
+		$alias = $aliastable[$address_or_alias];
+		if ($alias_type == "url") {
+			$result = explode(' ',$alias);
+		} else
+		if ($alias_type == "network") {
+			//$result = explode(' ',$alias);
+		} else
+		if ($alias_type == "host") {
+			$result = explode(' ',$alias);
+		}
+	} else {
+		$result[] = $address_or_alias;
+	}
+	return $result;
+}
+
+function haproxy_hostoralias_to_list($host_or_alias) {
+	if (is_alias($host_or_alias)){
+		$result = filter_expand_alias_array($host_or_alias);
+	} else {
+		$result = array();
+		$result[] = $host_or_alias;
+	}
+	return $result;
+}
+
+function haproxy_get_fileslist() {
+	// returns the files array with 'keys'.
+	$result = array();
+	global $config;
+	// create a copy to not modify the original 'keyless' array
+	$a_files = $config['installedpackages']['haproxy']['files']['item'];
+	if (!is_array($a_files)) $a_files = array();	
+	foreach($a_files as $file) {
+		$key = $file['name'];
+		$result[$key] = $file;
+	}
+	return $result;
+}
+
+function haproxy_custom_php_deinstall_command() {
+	global $static_output;
+	$static_output .= "HAProxy, running haproxy_custom_php_deinstall_command()\n";
+	update_output_window($static_output);
+	$static_output .= "HAProxy, deleting haproxy webgui\n";
+	update_output_window($static_output);
+	exec("rm /usr/local/etc/rc.d/haproxy.sh");
+	$static_output .= "HAProxy, installing cron job if needed\n";
+	update_output_window($static_output);
+	haproxy_install_cron(false);
+	$static_output .= "HAProxy, running haproxy_custom_php_deinstall_command() DONE\n";
+	update_output_window($static_output);
+}
+
+function haproxy_custom_php_install_command() {
+	global $g, $config, $static_output;
+	$static_output .= "HAProxy, running haproxy_custom_php_install_command()\n";
+	update_output_window($static_output);
+	
+	$static_output .= "HAProxy, conf_mount_rw\n";
+	update_output_window($static_output);
+	conf_mount_rw();
+	
+	$static_output .= "HAProxy, create '/usr/local/etc/rc.d/haproxy.sh'\n";
+	update_output_window($static_output);
+	$haproxy = <<<EOD
+#!/bin/sh
+
+# PROVIDE: haproxy
+# REQUIRE: LOGIN
+# KEYWORD: FreeBSD
+
+. /etc/rc.subr
+
+name="haproxy"
+rcvar="\${name}_enable"
+command="/usr/pbi/haproxy-devel-`uname -m`/sbin/haproxy"
+haproxy_enable=\${haproxy-"YES"}
+
+start_cmd="haproxy_start"
+stop_postcmd="haproxy_stop"
+check_cmd="haproxy_check"
+extra_commands="check"
+
+load_rc_config \$name
+
+haproxy_start () {
+        echo "Starting haproxy."
+        /usr/bin/env \
+        PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
+		/usr/local/bin/php -q -d auto_prepend_file=config.inc <<ENDOFF
+		<?php
+			require_once("globals.inc");		
+			require_once("functions.inc");
+			require_once("haproxy.inc");
+			haproxy_configure();
+		?>
+ENDOFF
+}
+
+haproxy_check () {
+        echo "Checking haproxy."
+        /usr/bin/env \
+        PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
+		/usr/local/bin/php -q -d auto_prepend_file=config.inc <<ENDOFF
+		<?php
+			require_once("globals.inc");		
+			require_once("functions.inc");
+			require_once("haproxy.inc");
+			haproxy_check_run(0);
+		?>
+ENDOFF
+}
+
+haproxy_stop () {
+        echo "Stopping haproxy."
+        killall haproxy
+}
+
+run_rc_command "\$1"
+
+EOD;
+
+	$fd = fopen("/usr/local/etc/rc.d/haproxy.sh", "w");
+	fwrite($fd, $haproxy);
+	fclose($fd);
+	exec("chmod a+rx /usr/local/etc/rc.d/haproxy.sh");
+
+	$static_output .= "HAProxy, update configuration\n";
+	update_output_window($static_output);
+
+	// call from external file, so it is surely from the newly downloaded version
+	// this avoids a problem with php cache that loaded haproxy.inc during uninstalling the old version
+	require_once('haproxy_upgrade_config.inc'); 
+	haproxy_upgrade_config();
+	
+	$static_output .= "HAProxy, conf_mount_ro\n";
+	update_output_window($static_output);
+	conf_mount_ro();
+	
+	$static_output .= "HAProxy, starting haproxy (if previously enabled)\n";
+	update_output_window($static_output);
+	haproxy_check_run(1);
+	
+	$static_output .= "HAProxy, running haproxy_custom_php_install_command() DONE\n";
+	update_output_window($static_output);
+}
+
+function haproxy_install_cron($should_install) {
+	global $config, $g;
+	if($g['booting']==true) 
+		return;
+	$is_installed = false;
+	if(!$config['cron']['item'])
+		return;
+	$x=0;
+	foreach($config['cron']['item'] as $item) {
+		if(strstr($item['command'], "/usr/local/etc/rc.d/haproxy.sh")) {
+			$is_installed = true;
+			break;
+		}
+		$x++;
+	}
+	switch($should_install) {
+		case true:
+			if(!$is_installed) {
+				$cron_item = array();
+				$cron_item['minute'] = "*/2";
+				$cron_item['hour'] = "*";
+				$cron_item['mday'] = "*";
+				$cron_item['month'] = "*";
+				$cron_item['wday'] = "*";
+				$cron_item['who'] = "root";
+				$cron_item['command'] = "/usr/local/etc/rc.d/haproxy.sh onecheck";		
+				$config['cron']['item'][] = $cron_item;
+				parse_config(true);
+				write_config("haproxy, install cron CARP job");
+				configure_cron();
+			}
+		break;
+		case false:
+			if($is_installed == true) {
+				if($x > 0) {
+					unset($config['cron']['item'][$x]);
+					parse_config(true);
+					write_config("haproxy, remove cron CARP job");
+				}
+				configure_cron();
+			}
+		break;
+	}
+}
+
+function haproxy_find_backend($backendname) {
+	global $config;
+	$a_backends = &$config['installedpackages']['haproxy']['ha_pools']['item'];
+	foreach ($a_backends as &$backend) {
+		if ($backend['name'] == $backendname) {
+			return $backend;
+		}
+	}
+	return null;
+}
+
+function haproxy_find_acl($name) {
+	global $a_acltypes;
+	if($a_acltypes) {
+		foreach ($a_acltypes as $key => $acl) {
+			if ($key == $name)
+				return $acl;
+		}
+	}
+}
+
+function write_backend($configpath, $fd, $name, $pool, $backendsettings) {
+	$frontend = $backendsettings['frontend'];
+	$ipversion = $backendsettings['ipversion'];
+
+	if(!is_array($pool['ha_servers']['item']) && !$pool['stats_enabled']=='yes')
+		return;
+	global $a_checktypes, $a_cookiemode, $a_files_cache, $a_error;
+		
+	$a_servers = &$pool['ha_servers']['item'];
+	$frontendtype = $frontend['type'];
+	
+	fwrite ($fd, "backend " . $name . "\n");
+	// https is an alias for tcp for clarity purposes
+	if($frontendtype == "https") {
+		$backend_mode = "tcp";
+	} else {
+		$backend_mode = $frontendtype;
+	}
+	fwrite ($fd, "\tmode\t\t\t" . $backend_mode . "\n");
+	if ($pool['log-health-checks'] == 'yes')
+		fwrite ($fd, "\toption\t\t\tlog-health-checks\n");
+		
+	if ($frontendtype == "http") {
+		// actions that read/write http headers only work when 'mode http' is used
+		if ($pool["persist_cookie_enabled"] == "yes") {
+			$cookie_mode = $pool["persist_cookie_mode"];
+			$cookie_cachable = $pool["persist_cookie_cachable"];
+			$cookiesyntax = $a_cookiemode[$cookie_mode]["syntax"];
+			$cookie = str_replace("<cookie name>", $pool["persist_cookie_name"], $cookiesyntax);
+			$cookie .= $cookie_cachable == "yes" ? "" : " nocache";
+			fwrite ($fd, "\t" . $cookie . "\n");
+		}
+		
+		if ($pool["strict_transport_security"] && is_numeric($pool["strict_transport_security"])){
+			fwrite ($fd, "\trspadd Strict-Transport-Security:\\ max-age={$pool["strict_transport_security"]};\n");
+		}
+		
+		if ($pool["cookie_attribute_secure"] == 'yes'){
+			fwrite ($fd, "\trspirep ^(Set-Cookie:((?!;\\ secure).)*)$ \\1;\ secure if { ssl_fc }\n");
+		}
+		
+		if($pool['stats_enabled']=='yes') {
+			fwrite ($fd, "\tstats\t\t\tenable\n");
+			if($pool['stats_uri'])
+				fwrite ($fd, "\tstats\t\t\turi ".$pool['stats_uri']."\n");
+			if($pool['stats_realm'])
+				fwrite ($fd, "\tstats\t\t\trealm " . haproxy_escapestring($pool['stats_realm']) . "\n");
+			else 
+				fwrite ($fd, "\tstats\t\t\trealm .\n");
+				
+			if ($pool['stats_username'] && $pool['stats_password'])
+				fwrite ($fd, "\tstats\t\t\tauth " . haproxy_escapestring($pool['stats_username']).":". haproxy_escapestring($pool['stats_password'])."\n");
+			
+			if($pool['stats_admin']=='yes')
+				fwrite ($fd, "\tstats\t\t\tadmin if TRUE" . "\n");
+			
+			if($pool['stats_node'])
+				fwrite ($fd, "\tstats\t\t\tshow-node " . $pool['stats_node'] . "\n");
+			if($pool['stats_desc'])
+				fwrite ($fd, "\tstats\t\t\tshow-desc " . haproxy_escapestring($pool['stats_desc']) . "\n");
+			if($pool['stats_refresh'])
+				fwrite ($fd, "\tstats\t\t\trefresh " . $pool['stats_refresh'] . "\n");
+			
+			if ($pool['stats_scope']) {
+				$scope_items = explode(",", $pool['stats_scope']);
+				foreach($scope_items as $scope_item)
+					fwrite ($fd, "\tstats\t\t\tscope " . $scope_item . "\n");
+			}
+		}
+
+		if (is_arrayset($pool,'errorfiles','item')) {
+			foreach($pool['errorfiles']['item'] as $errorfile) {
+				if (!is_array($a_files_cache))// load only once
+					$a_files_cache = haproxy_get_fileslist();
+				$file = $errorfile['errorfile'];
+				$errorcodes = explode(",",$errorfile['errorcode']);
+				foreach($errorcodes as $errorcode) {
+					$filename = "$configpath/errorfile_{$name}_{$errorcode}_{$file}";
+					$content = base64_decode($a_files_cache[$file]['content']);
+					$content = str_replace('{errormsg}', $a_error[$errorcode]['descr'], $content);
+					$content = str_replace('{errorcode}', $errorcode, $content);
+					file_put_contents($filename, $content);
+					fwrite ($fd, "\terrorfile\t\t\t" . $errorcode ." " . $filename . "\n");
+				}
+			}
+		}
+	}
+	
+	switch($pool["persist_sticky_type"]) {
+	case 'stick_sslsessionid':
+		if ($frontendtype == "https") {
+			fwrite ($fd, "\ttcp-request inspect-delay 5s\n");
+			fwrite ($fd, "\tstick-table type binary len 32 size ".$pool["persist_stick_tablesize"]." expire ".$pool["persist_stick_expire"]."\n");
+			fwrite ($fd, "\tacl clienthello req.ssl_hello_type 1\n");
+			fwrite ($fd, "\tacl serverhello res.ssl_hello_type 2\n");
+			fwrite ($fd, "\ttcp-request content accept if clienthello\n");
+			fwrite ($fd, "\ttcp-response content accept if serverhello\n");
+			fwrite ($fd, "\tstick on payload_lv(43,1) if clienthello\n");
+			fwrite ($fd, "\tstick store-response payload_lv(43,1) if serverhello\n");
+		}
+		break;
+	case 'stick_rdp_cookie':
+		//tcp-request content accept if RDP_COOKIE
+		//fwrite ($fd, "\tstick on req.rdp_cookie(msts)\n");
+		fwrite ($fd, "\tstick-table type binary len 32 size ".$pool["persist_stick_tablesize"]." expire ".$pool["persist_stick_expire"]."\n");
+		fwrite ($fd, "\tstick on req.rdp_cookie(mstshash)\n");
+		break;
+	case 'stick_sourceipv4':
+		fwrite ($fd, "\tstick-table type ip size ".$pool["persist_stick_tablesize"]." expire ".$pool["persist_stick_expire"]."\n");
+		fwrite ($fd, "\tstick on src\n");
+		break;
+	case 'stick_sourceipv6':
+		fwrite ($fd, "\tstick-table type ip size ".$pool["persist_stick_tablesize"]." expire ".$pool["persist_stick_expire"]."\n");
+		fwrite ($fd, "\tstick on src\n");
+		break;
+	case 'stick_cookie_value':
+		if ($frontendtype == "http") {
+			fwrite ($fd, "\tstick-table type string len {$pool["persist_stick_length"]} size ".$pool["persist_stick_tablesize"]." expire ".$pool["persist_stick_expire"]."\n");
+			fwrite ($fd, "\tstick store-response res.cook({$pool["persist_stick_cookiename"]})\n");
+			fwrite ($fd, "\tstick on req.cook({$pool["persist_stick_cookiename"]})\n");
+		}
+		break;
+	}
+	
+	unset($checkport);
+	$check_type = $pool['check_type'];
+	if ($check_type != 'none') {
+		$optioncheck = $a_checktypes[$check_type]['syntax'];
+		if ($check_type == "MySQL" || $check_type == "PostgreSQL")
+			$optioncheck .= " user " . $pool['monitor_username'];
+		if ($check_type == "SMTP" || $check_type == "ESMTP")
+			$optioncheck .= " " . $pool['monitor_domain'];
+		if ($check_type == "HTTP") {
+			$uri = $pool['monitor_uri'];
+			if (!$uri)
+				$uri = "/";
+			$optioncheck .= " {$pool['httpcheck_method']} {$uri} {$pool['monitor_httpversion']}";
+		}
+		if ($check_type == "Agent") {
+			$checkport = " port " . $pool['monitor_agentport'];
+		}
+	} else {
+		$optioncheck = "httpchk";
+	}
+	
+	if($pool['balance'])
+		fwrite ($fd, "\tbalance\t\t\t" . $pool['balance'] . "\n");
+
+	if(!$pool['connection_timeout'])
+		$pool['connection_timeout'] = 30000;
+	fwrite ($fd, "\ttimeout connect\t\t" . $pool['connection_timeout'] . "\n");
+
+	if(!$pool['server_timeout'])
+		$pool['server_timeout'] = 30000;
+	fwrite ($fd, "\ttimeout server\t\t" . $pool['server_timeout'] . "\n");
+
+	if(!$pool['retries'])
+		$pool['retries'] = 3;
+	fwrite ($fd, "\tretries\t\t\t" . $pool['retries'] . "\n");
+
+	$addrprefix = "";
+	$dnsquerytype = "A,AAAA";
+	if ($pool['transparent_clientip'] == 'yes') {
+		if ($ipversion == "ipv6") {
+			$addrprefix = "ipv6@";
+			$dnsquerytype = "AAAA";
+		}
+		if ($ipversion == "ipv4") {
+			$addrprefix = "ipv4@";
+			$dnsquerytype = "A";
+		}
+		fwrite ($fd, "\tsource $addrprefix usesrc clientip\n");
+	}
+
+	$uri = $pool['monitor_uri'];
+	if ($pool['monitor_uri'])
+		$uri = $pool['monitor_uri'];
+	else
+		$uri = "/";
+		
+	if ($optioncheck)
+		fwrite ($fd, "\toption\t\t\t{$optioncheck}\n");
+	
+	if ($pool['advanced_backend']) {
+		$adv_be	= explode("\n", base64_decode($pool['advanced_backend']));
+		foreach($adv_be as $adv_line) {
+			if ($adv_line != "") {
+				fwrite($fd, "\t" . str_replace("\r", "", $adv_line) . "\n");
+			}
+		}
+	}
+
+	if($pool['advanced']) {
+		$advanced = base64_decode($pool['advanced']);
+		$advanced_txt = " " . $advanced;
+	} else {
+		$advanced_txt = "";
+	}
+	
+	if ($check_type != 'none') {
+		if($pool['checkinter']) 
+			$checkinter = " check inter {$pool['checkinter']}";
+		else 
+			$checkinter = " check inter 1000";
+	}
+	
+	//agent-check requires at least haproxy v1.5dev20
+	if ($pool['agent_check'])
+		$agentcheck = " agent-check agent-inter {$pool['agent_inter']} agent-port {$pool['agent_port']}";
+
+	if (is_array($a_servers)) {
+		foreach($a_servers as $be) {
+			if ($be['status'] == "inactive")
+				continue;
+			if($be['cookie'] && $frontendtype == "http") 
+				$cookie = " cookie {$be['cookie']}";
+			else 
+				$cookie = "";
+			
+			if (!$be['name'])
+				$be['name'] = $be['address'];
+			if(!$be['status'] || $be['status'] != 'active') {
+				$isbackup = $be['status'];
+			} else {
+				$isbackup = "";
+			}
+			$ssl = "";
+			$cafile = "";
+			$crlfile = "";
+			$crtfile = "";
+			$verifynone = "";
+			$verifyhost = "";
+			if ($be['ssl'] == 'yes')
+			{
+				$ssl = $frontendtype == "http" ? ' ssl' : ' check-ssl';
+				
+				if ($be['sslserververify'] != 'yes') {
+					$verifynone = " verify none";
+				} else {
+					$verifyhost = isset($be['verifyhost']) && $be['verifyhost'] != "" ? " verifyhost {$be['verifyhost']}" : "";
+					
+					$ca = $be['ssl-server-ca'];
+					$filename = "$configpath/ca_$ca.pem";
+					haproxy_write_certificate_crt($filename, $ca);
+					$cafile = " ca-file $filename";
+					
+					$crl = $be['ssl-server-crl'];
+					if ($crl && $crl != "") {
+						$filename = "$configpath/crl_$crl.pem";
+						haproxy_write_certificate_crl($filename, $crl);
+						$crlfile = " crl-file $filename";
+					}
+				}
+				
+				$server_clientcert = $be['ssl-server-clientcert'];
+				if ($server_clientcert && $server_clientcert != "") {
+					$filename = "$configpath/server_clientcert_$server_clientcert.pem";
+					haproxy_write_certificate_crt($filename, $server_clientcert, true);
+					$crtfile = " crt $filename";
+				}
+					
+			}
+			$weight = "";
+			if (is_numeric($be['weight'])){
+				$weight = " weight " . $be['weight'];
+			}
+			$maxconn = "";
+			if (is_numeric($be['maxconn'])){
+				$maxconn = " maxconn " . $be['maxconn'];
+			}
+			
+			$servers = array();
+			if ($be['forwardto'] && $be['forwardto'] != "") {
+				$servers[] = "/{$be['forwardto']}.socket send-proxy-v2-ssl-cn";
+			} else {
+				if (is_ipaddr($be['address'])) {
+					$servers[] = $be['address'];
+				} else if (is_hostname($be['address'])) {
+					$dnsresult_servers = haproxy_utils::query_dns($be['address'], $dnsquerytype);
+					foreach($dnsresult_servers as $dnsresult_server){
+						$servers[] = $dnsresult_server['data'];
+					}
+				}
+			}
+			$counter = 0;
+			foreach($servers as $server) {
+				if (is_ipaddr($server)) {
+					// skip ipv4 servers when using transparent client ip with ipv6 backend servers, and vice versa
+					if ($ipversion == "ipv4" && !is_ipaddrv4($server))
+						continue;
+					if ($ipversion == "ipv6" && !is_ipaddrv6($server))
+						continue;
+					if (isset($be['port']))
+						$server = $server . ":" . $be['port'];
+				}
+				$servername = $be['name'];
+				if (count($servers) > 1) {
+					$servername .= "_" . $counter;
+				}
+				fwrite ($fd, "\tserver\t\t\t" . $servername . " " . $server . "$ssl$cookie$checkinter$checkport$agentcheck $isbackup$weight$maxconn$cafile$crlfile$verifynone$verifyhost$crtfile{$advanced_txt} {$be['advanced']}\n");
+				$counter++;
+			}
+		}
+	}
+	fwrite ($fd, "\n");
+}
+
+function haproxy_configure() {
+	global $g;
+	// reload haproxy
+	return haproxy_check_run(1);
+}
+
+function haproxy_check_and_run(&$messages, $reload) {
+	global $g;
+	$testpath = "{$g['varetc_path']}/haproxy_test";
+	haproxy_writeconf($testpath);
+	$retval = exec("haproxy -c -V -f $testpath/haproxy.cfg 2>&1", $output, $err);
+	$messages = "";
+	if ($err > 1)
+		$messages = "<h2><strong>FATAL ERROR CODE: $err while starting haproxy</strong></h2>";
+	elseif ($err == 1)
+		$messages = "Errors found while starting haproxy";
+		
+	if ((count($output) > 1) && $output[0] != "Configuration file is valid")
+	{
+		foreach($output as $line)
+			$messages .= "<br/>" . htmlspecialchars($line) . "\n";
+	}
+	$ok = strstr($retval, "Configuration file is valid");
+	if ($ok && $reload) {
+		global $haproxy_run_message;
+		rmdir_recursive($testpath);
+		$ok = haproxy_check_run(1) == 0;
+		$messages = $haproxy_run_message;
+	}
+	return $ok;
+}
+
+function haproxy_lookup_cert($certid) {
+	$res = lookup_ca($certid);
+	if (!$res)	
+		$res = lookup_cert($certid);
+	return $res;
+}
+
+function haproxy_write_certificate_crt($filename, $certid, $include_psk = false, $append = false) {
+	$cert = haproxy_lookup_cert($certid);
+	$certcontent = base64_decode($cert['crt']);
+	if ($include_psk && isset($cert['prv']))
+		$certcontent .= "\r\n".base64_decode($cert['prv']);
+	$flags = $append ? FILE_APPEND : 0;
+	file_put_contents($filename, $certcontent, $flags);
+	unset($certcontent);
+	unset($cert);
+}
+
+function haproxy_write_certificate_crl($filename, $crlid, $append = false) {
+	$crl = lookup_crl($crlid);
+	$content = base64_decode($crl['text']);
+	$flags = $append ? FILE_APPEND : 0;
+	file_put_contents($filename, $content, $flags);
+	unset($content);
+	unset($crl);
+}
+
+function haproxy_write_certificate_fullchain($filename, $certid, $append = false) {
+	$cert = haproxy_lookup_cert($certid);
+
+	$certcontent = base64_decode($cert['crt']);
+	if (isset($cert['prv']))
+		$certcontent .= "\r\n".base64_decode($cert['prv']);
+	
+	$certchaincontent = ca_chain($cert);
+	if ($certchaincontent != "") {
+		$certcontent .= "\r\n" . $certchaincontent;
+	}
+	unset($certchaincontent);
+	$flags = $append ? FILE_APPEND : 0;
+	file_put_contents($filename, $certcontent, $flags);
+	unset($certcontent);
+	unset($cert);
+}
+
+function haproxy_writeconf($configpath) {
+	global $config;
+	global $aliastable;
+	if (!isset($aliastable))
+		alias_make_table($config);
+	$chroot_dir = "/tmp/haproxy_chroot"; // can contain socket to forward connection from backend to frontend. "/var/empty"
+	make_dirs($chroot_dir);
+
+	$configfile = $configpath . "/haproxy.cfg";
+
+	rmdir_recursive($configpath);
+	make_dirs($configpath);
+	
+	$a_global = &$config['installedpackages']['haproxy'];
+	$a_frontends = &$config['installedpackages']['haproxy']['ha_backends']['item'];
+	$a_backends = &$config['installedpackages']['haproxy']['ha_pools']['item'];
+	
+	$fd = fopen($configfile, "w");
+	if(is_array($a_global)) {
+		fwrite ($fd, "global\n");
+		if ($a_global['maxconn'])
+			fwrite ($fd, "\tmaxconn\t\t\t".$a_global['maxconn']."\n");
+		if($a_global['remotesyslog'])
+			fwrite ($fd, "\tlog\t\t\t{$a_global['remotesyslog']}\t{$a_global['logfacility']}\t{$a_global['loglevel']}\n");
+		fwrite ($fd, "\tstats socket /tmp/haproxy.socket level admin\n");
+		
+		if(!use_transparent_clientip_proxying())
+			fwrite ($fd, "\tuid\t\t\t80\n");
+			
+		fwrite ($fd, "\tgid\t\t\t80\n");
+		// Set numprocs if defined or use system default (#cores)
+		if($a_global['nbproc'])
+			$numprocs = $a_global['nbproc'];
+		else 
+			$numprocs ="1";
+		fwrite ($fd, "\tnbproc\t\t\t$numprocs\n");
+		fwrite ($fd, "\tchroot\t\t\t$chroot_dir\n");
+		fwrite ($fd, "\tdaemon\n");
+		//fwrite ($fd, "\tssl-server-verify none\n");
+		
+		if($a_global['ssldefaultdhparam'])
+			fwrite ($fd, "\ttune.ssl.default-dh-param\t{$a_global['ssldefaultdhparam']}\n");
+		if($a_global['log-send-hostname'])
+			fwrite ($fd, "\tlog-send-hostname\t\t{$a_global['log-send-hostname']}\n");
+
+		// Keep the advanced options on the bottom of the global settings, to allow additional sections to be easely added
+		if($a_global['advanced']) {
+			$adv = explode("\n", base64_decode($a_global['advanced']));
+			foreach($adv as $adv_line) {
+				fwrite($fd, "\t" . str_replace("\r", "", $adv_line) . "\n");
+
+			}
+		}
+		fwrite ($fd, "\n");
+		
+		$localstatsport = $a_global['localstatsport'];
+		if ($localstatsport){
+			fwrite ($fd, "listen HAProxyLocalStats\n");
+			fwrite ($fd, "\tbind 127.0.0.1:$localstatsport name localstats\n");
+			fwrite ($fd, "\tmode http\n");
+			fwrite ($fd, "\tstats enable\n");
+			if (is_numeric($a_global['localstats_refreshtime']))
+				fwrite ($fd, "\tstats refresh {$a_global['localstats_refreshtime']}\n");
+			fwrite ($fd, "\tstats admin if TRUE\n");
+			fwrite ($fd, "\tstats uri /haproxy_stats.php?haproxystats=1\n");
+			fwrite ($fd, "\ttimeout client 5000\n");
+			fwrite ($fd, "\ttimeout connect 5000\n");
+			fwrite ($fd, "\ttimeout server 5000\n");
+			fwrite ($fd, "\n");
+		}
+	}
+
+	// Try and get a unique array for address:port as frontends can duplicate
+	$a_bind = array();
+	if(is_array($a_frontends)) {
+		foreach ($a_frontends as $frontend) {
+			if($frontend['status'] != 'active')
+				continue;
+			if(!$frontend['backend_serverpool'])
+				continue;
+			$primaryfrontend = get_primaryfrontend($frontend);
+
+			$bname = $primaryfrontend['name'];
+			if (!is_array($a_bind[$bname])) {
+				$a_bind[$bname] = array();
+				$a_bind[$bname] = $primaryfrontend;
+				$a_bind[$bname]['config'] = array();
+			}
+
+			//check ssl info
+			$ssl = get_frontend_uses_ssl($frontend);
+			
+			if ($ssl) {
+				//ssl crt ./server.pem ca-file ./ca.crt verify optional crt-ignore-err all crl-file ./ca_crl.pem
+				$filename = "$configpath/{$frontend['name']}.pem";
+				$ssl_crt = " crt $filename";
+				haproxy_write_certificate_fullchain($filename, $frontend['ssloffloadcert']);
+				$subfolder = "$configpath/{$frontend['name']}";
+				$certs = $frontend['ha_certificates']['item'];
+				if (is_array($certs)){
+					if (count($certs) > 0){
+						make_dirs($subfolder);
+						foreach($certs as $cert){
+							haproxy_write_certificate_fullchain("$subfolder/{$cert['ssl_certificate']}.pem", $cert['ssl_certificate']);
+						}
+						$ssl_crt .= " crt $subfolder";
+					}
+				}
+			}else{
+				$ssl_crt="";
+				unlink_if_exists("var/etc/{$frontend['name']}.{$frontend['port']}.crt");//cleanup for possible old haproxy package version
+			}
+
+			$b = &$a_bind[$bname];
+			
+			if (($frontend['secondary'] != 'yes') && ($frontend['name'] != $b['name'])) {
+				// only 1 frontend can be the primary for a set of frontends that share 1 address:port.
+					$input_errors[] = "Multiple primary frontends for $bname use the 'Shared Frontend' option instead";
+			}
+			
+			if ($ssl_crt != "") {
+				if ($b['ssl_info'] == "")
+					$b['ssl_info'] = "ssl {$frontend['dcertadv']}";
+				$b['ssl_info'] .= $ssl_crt;
+			}
+
+			// pointer to each frontend 
+			$b['config'][] = $frontend;
+		}
+	}
+	
+	$a_pendingpl = array();
+
+	// Construct and write out configuration for each "frontend"
+	if(is_array($a_bind)) {
+		foreach ($a_bind as $bind) {
+			if (count($bind['config']) > 1)
+				$frontendinfo = "frontend {$bind['name']}-merged\n";
+			else
+				$frontendinfo = "frontend {$bind['name']}\n";
+
+			fwrite ($fd, "{$frontendinfo}");
+			
+			$advancedextra = array();
+			$ca_file = "";
+			$first = true;
+			if (is_array($bind['clientcert_ca']['item'])){
+				$filename = "$configpath/clientca_{$bind['name']}.pem";
+				foreach($bind['clientcert_ca']['item'] as $ca){
+					if (!empty($ca['cert_ca'])){
+						haproxy_write_certificate_crt($filename, $ca['cert_ca'], false, !$first);
+						$first = false;
+					}
+				}
+				$verify = $bind['sslclientcert-none'] == 'yes' ? "verify optional" : "verify required";
+				$ca_file = " ca-file $filename $verify";
+			}
+			$crl_file = "";
+			$first = true;
+			if (is_array($bind['clientcert_crl']['item'])){
+				$filename = "$configpath/clientcrl_{$bind['name']}.pem";
+				foreach($bind['clientcert_crl']['item'] as $ca){
+					haproxy_write_certificate_crl($filename, $ca['cert_crl'], !$first);
+					$first = false;
+				}
+				$crl_file = " crl-file $filename";
+			}
+			$advanced_bind = $bind['advanced_bind'];
+			$ssl_info = $bind['ssl_info'];
+			$ssl_info .= $ca_file . $crl_file;
+			if ($bind['sslclientcert-invalid'])
+				$ssl_info .= " crt-ignore-err all";
+			
+			$useipv4 = false;
+			$useipv6 = false;
+			// Process and add bind directives for ports
+			$bindips = get_frontend_bindips($bind);
+			$listenip = "";
+			foreach($bindips as $bindip) {
+				$ssl = $bindip['extaddr_ssl'] == 'yes' ? $ssl_info : "";
+				$listenip .=  "\tbind\t\t\t{$bindip['addr']}:{$bindip['port']} name {$bindip['addr']}:{$bindip['port']} {$ssl} {$advanced_bind} {$bindip['extaddr_advanced']}\n";
+				$useipv4 |= is_ipaddrv4($bindip['addr']);
+				$useipv6 |= is_ipaddrv6($bindip['addr']);
+			}
+			fwrite ($fd, "{$listenip}");
+			
+			if (use_frontend_as_unixsocket($bind['name'])){
+				fwrite ($fd, "\tbind /tmp/haproxy_chroot/{$bind['name']}.socket name unixsocket accept-proxy {$ssl_info} {$advanced_bind}\n");
+			}
+
+			// Advanced pass thru
+			if($bind['advanced']) {
+				$advanced	= explode("\n", base64_decode($bind['advanced']));
+				foreach($advanced as $adv_line) {
+					if ($adv_line != "") {
+						fwrite($fd, "\t" . str_replace("\r", "", $adv_line) . "\n");
+					}
+				}
+			}
+
+			// https is an alias for tcp for clarity purposes
+			if($bind['type'] == "https") {
+				$backend_type = "tcp";
+			} else {
+				$backend_type = $bind['type'];
+			}
+
+			fwrite ($fd, "\tmode\t\t\t" . $backend_type . "\n");
+			fwrite ($fd, "\tlog\t\t\tglobal\n");
+			
+			if ($bind['socket-stats'] == 'yes')
+				fwrite ($fd, "\toption\t\t\tsocket-stats\n");
+			if ($bind['dontlognull'] == 'yes')
+				fwrite ($fd, "\toption\t\t\tdontlognull\n");
+			if ($bind['dontlog-normal'] == 'yes')
+				fwrite ($fd, "\toption\t\t\tdontlog-normal\n");
+			if ($bind['log-separate-errors'] == 'yes')
+				fwrite ($fd, "\toption\t\t\tlog-separate-errors\n");
+			if ($bind['log-detailed'] == 'yes'){
+				if ($backend_type == 'http')
+					fwrite ($fd, "\toption\t\t\thttplog\n");
+				else
+					fwrite ($fd, "\toption\t\t\ttcplog\n");
+			}
+
+			if ($backend_type == 'http') {
+				if($bind['httpclose'] && $bind['httpclose'] != "none" ) 
+					fwrite ($fd, "\toption\t\t\t{$bind['httpclose']}\n");
+
+				if($bind['forwardfor']) {
+					fwrite ($fd, "\toption\t\t\tforwardfor\n");
+					fwrite ($fd, "\tacl https ssl_fc\n");
+					fwrite ($fd, "\treqadd X-Forwarded-Proto:\ http if !https\n");
+					fwrite ($fd, "\treqadd X-Forwarded-Proto:\ https if https\n");
+				}
+			}
+
+			if($bind['max_connections'])
+				fwrite ($fd, "\tmaxconn\t\t\t" . $bind['max_connections'] . "\n");
+
+			if(!$bind['client_timeout'])
+				$bind['client_timeout'] = 30000;
+			
+			fwrite ($fd, "\ttimeout client\t\t" . $bind['client_timeout'] . "\n");
+
+	
+			// Combine the rest of the frontend configs
+			$default_backend = "";
+			$config_acls = "";
+			$config_usebackends = "";
+			$config_usedefaultbackends = "";
+			
+			$transparent_clientip = false;
+			foreach ($bind['config'] as $frontend) {
+				$backend = haproxy_find_backend($frontend['backend_serverpool']);
+				if ($backend["transparent_clientip"] == 'yes') {
+					$transparent_clientip = true;
+					break;
+				}
+			}
+			if ($transparent_clientip && $useipv4 && $useipv6) {
+				// set the src_is_ipv4 acl if needed.
+				$config_acls .= "\tacl\t\t\tsrc_is_ipv4\tsrc 0.0.0.0/0\n";
+			}
+			
+			$inspectdelay = 0;
+			$i = 0;
+			$acllist = array();
+			$acl_newid = 0;
+			foreach ($bind['config'] as $frontend) {
+				$a_acl = get_frontend_acls($frontend);
+
+				$backend = haproxy_find_backend($frontend['backend_serverpool']);
+				$transparent_clientip = $backend["transparent_clientip"] == 'yes';
+				
+				$allowfordefaultbackend = true;
+				$ipv = array();
+				if ($transparent_clientip) {
+					if ($useipv4 && $useipv6) {
+						$ipv["ipv4"]['acl'] = " src_is_ipv4 ";
+						$ipv["ipv6"]['acl'] = " !src_is_ipv4 ";
+						$allowfordefaultbackend = false; // transparent backend must always match client-ip which is ipv4 v.s. ipv6 specific so there cannot be a default.
+					} else if ($useipv6)
+						$ipv["ipv6"]['acl'] = " ";
+					else
+						$ipv["ipv4"]['acl'] = " ";
+				} else
+					$ipv["ipvANY"]['acl'] = " ";
+				
+				// combine acl's with same name to allow for 'combined checks' to check for example hostname and fileextension together..
+				$a_acl_combine = array();
+				foreach ($a_acl as $entry) {
+					$name = $entry['ref']['name'];
+					
+					$acl = array();
+					$acl['ref'] = $entry['ref'];
+					$acltype = haproxy_find_acl($entry['ref']['expression']);
+					$acl['acltype'] = $acltype;
+					if (!isset($acltype))
+						continue;
+					$a_acl_combine[$name][] = $acl;
+					
+					if (isset($acltype['require_client_cert'])){
+						$acl = array();
+						$acl['ref']['expression'] = "ssl_c_used";
+						$acl['acltype']['syntax'] = "ssl_c_used";
+						$acl['acltype']['novalue'] = 1;
+						$a_acl_combine[$name][] = $acl;
+					}
+				}
+				
+				$certacl = "";
+				$y = 0;
+				foreach($ipv as $ipversion => $ipversionoptions) {
+					$useracls = array();
+					$poolname = $frontend['backend_serverpool'] . "_" . strtolower($bind['type'])."_".$ipversion;
+					if (!isset($a_pendingpl[$poolname])) {
+						$a_pendingpl[$poolname] = array();
+						$a_pendingpl[$poolname]['name'] = $poolname;
+						$a_pendingpl[$poolname]['backend'] = $frontend['backend_serverpool'];
+						$a_pendingpl[$poolname]['frontend'] = $bind;
+						$a_pendingpl[$poolname]['ipversion'] = $ipversion;
+					}
+					$canbedefaultbackend = false;
+					// Write this out once, and must be before any backend config text
+					if (($default_backend == "" || $frontend['secondary'] != 'yes') && count($a_acl) == 0 ) {
+						$canbedefaultbackend = true;
+						if ($allowfordefaultbackend)
+							$default_backend = $poolname;
+					}
+				
+					foreach ($a_acl_combine as $a_usebackend) {
+						$aclnames = "";
+						foreach ($a_usebackend as $entry2) {
+							$entry = $entry2['ref'];
+							$acl = $entry2['acltype'];
+
+							// Filter out acls for different modes
+							if ($acl['mode'] != '' && $acl['mode'] != strtolower($bind['type']))
+								continue;
+							if (($entry['expression'] == "source_ip") && is_alias($entry['value'])) {
+								$filename = "$configpath/ipalias_{$entry['value']}.lst";
+								$listitems = haproxy_hostoralias_to_list($entry['value']);
+								$fd_alias = fopen("$filename", "w");
+								foreach($listitems as $item)
+									fwrite($fd_alias, $item."\r\n");
+								fclose($fd_alias);
+								$expr = "src -f $filename";
+							} else
+								$expr = sprintf($acl['syntax'],$entry['value'],$poolname);
+
+							$not = $entry['not'] == "yes" ? "!" : "";
+							
+							unset($aclkey);
+							foreach($acllist as $aclid => $aclitem) {
+								if ($aclitem['expr'] == $expr) {
+									$aclkey = $aclid;
+								}
+							}
+							if (isset($aclkey)) {
+								$aclname = $acllist[$aclkey]['aclname'];
+							} else {
+								$aclkey = $acl_newid++;
+								if ($entry['certacl']) {
+									$aclname = "aclcrt_".$frontend['name'];
+									$certacl = $aclname;
+								} else {
+									$aclname = "aclusr_{$entry['expression']}";
+									if (!isset($acl['novalue']))
+										$aclname .= "_{$entry['value']}";
+									$aclname = haproxy_escape_acl_name($aclname);
+									$i++;
+								}
+								$acllist[$aclkey]['aclname'] = $aclname;
+								$acllist[$aclkey]['expr'] = $expr;
+								$config_acls .= "\tacl\t\t\t" . $aclname . "\t" .  $expr . "\n";
+							}
+							if (!isset($entry['certacl']))
+								$useracls[$y] .= $not . $aclname . " ";
+							
+							if ($acl['inspect-delay'] != '')
+								$inspectdelay = $acl['inspect-delay'];
+							
+							if ($acl['advancedoptions'] != '')
+								$advancedextra[$acl['syntax']] = $acl['advancedoptions']."\n";
+						}
+						$y++;
+					}
+
+					$systemacl = trim("{$certacl}{$ipversionoptions['acl']}");
+					if (!empty($systemacl) && count($useracls) == 0) $useracls[] = ""; // add empty item to enter foreach loop at least once when a system acl is pressent.
+					foreach($useracls as $useracl) {
+						$backendacl = "";
+						$backendacl .= "|| {$useracl}{$systemacl}";
+						$backendacl = substr($backendacl, 3);
+						if ($canbedefaultbackend) {
+							// makes sure these come last even though systemacl's might have been added.
+							$config_usedefaultbackends .= "\tuse_backend\t\t" . $poolname . " if " . $backendacl . "\n";
+						} else
+							$config_usebackends .= "\tuse_backend\t\t" . $poolname . " if " . $backendacl . "\n";
+					}
+				}
+			}
+			
+			if ($inspectdelay > 0)
+				fwrite ($fd, "\ttcp-request inspect-delay\t" . $inspectdelay . "\n");
+				
+			// Write acl's first, so they may be used by advanced text options written by user.
+			fwrite ($fd, $config_acls);
+			
+			foreach($advancedextra as $extra)
+				fwrite ($fd, "\t".$extra."\n");
+
+			// Write backends after advanced options so custom use_backend rules can be applied first.
+			fwrite ($fd, $config_usebackends);
+			fwrite ($fd, $config_usedefaultbackends);
+			if ($default_backend)
+				fwrite ($fd, "\tdefault_backend\t\t" . $default_backend . "\n");
+			
+			fwrite ($fd, "\n");
+		}
+	}
+	// Construct and write out configuration for each "backend"
+	if (is_array($a_pendingpl) && is_array($a_backends)) {
+		foreach ($a_pendingpl as $pending) {
+			foreach ($a_backends as $pool) {
+				if ($pending['backend'] == $pool['name']) {
+					write_backend($configpath, $fd, $pending['name'], $pool, $pending);
+				}
+			}
+		}
+	}
+	fwrite ($fd, "\n");
+
+	// close config file
+	fclose($fd);
+
+	if ($input_errors)
+	{
+		require_once("guiconfig.inc");
+		print_input_errors($input_errors);
+	} else {
+		// Only sync to xmlrpc backup machine if no errors are found in config
+		if(isset($config['installedpackages']['haproxy']['enablesync'])) {
+			haproxy_do_xmlrpc_sync();
+		}
+	}
+	
+	if (isset($a_global['carpdev']))
+		haproxy_install_cron(true);
+	else
+		haproxy_install_cron(false);
+}
+
+function haproxy_is_running() {
+        $running = (shell_exec("/bin/pgrep -x haproxy") != '');
+        return $running;
+}
+
+function haproxy_load_modules() {
+	// On FreeBSD 8 ipfw is needed to allow 'transparent' proxying (getting reply's to a non-local ip to pass back to the client-socket).
+	// On FreeBSD 9 and 10 it should have been possible to do the same with the pf(4) option "divert-reply" however that is not implemented.
+	// FreeBSD 10 patch proposal: http://lists.freebsd.org/pipermail/freebsd-bugs/2014-April/055823.html
+	
+	mute_kernel_msgs();
+	if (!is_module_loaded("ipfw.ko")) {
+		mwexec("/sbin/kldload ipfw");
+		/* make sure ipfw is not on pfil hooks */
+		mwexec("/sbin/sysctl net.inet.ip.pfil.inbound=\"pf\" net.inet6.ip6.pfil.inbound=\"pf\"" .
+				" net.inet.ip.pfil.outbound=\"pf\" net.inet6.ip6.pfil.outbound=\"pf\"");
+	}
+	
+	/* Activate layer2 filtering */
+	mwexec("/sbin/sysctl net.link.ether.ipfw=1 net.inet.ip.fw.one_pass=1");
+	
+	unmute_kernel_msgs();
+}
+
+function use_transparent_clientip_proxying() {
+	global $config;
+	$a_backends = &$config['installedpackages']['haproxy']['ha_pools']['item'];
+	if (is_array($a_backends)) {
+		foreach ($a_backends as $backend) {
+			if ($backend["transparent_clientip"] == 'yes') {
+				return true;
+				break;
+			}
+		}
+	}
+	return false;
+}
+
+function haproxy_get_transparent_backends(){
+	global $config;
+	$a_backends = &$config['installedpackages']['haproxy']['ha_pools']['item'];
+	$transparent_backends = array();
+	foreach ($a_backends as $backend) {
+		if ($backend["transparent_clientip"] != 'yes')
+			continue;
+		$real_if = get_real_interface($backend["transparent_interface"]);
+		$a_servers = &$backend['ha_servers']['item'];
+		if (is_array($a_servers)) {
+			foreach($a_servers as $be) {
+				if (!$be['status'] == "inactive")
+					continue;
+				if (!is_ipaddr($be['address']))
+					continue;
+				$item = array();
+				$item['name'] = $be['name'];
+				$item['interface'] = $real_if;
+				$item['forwardto'] = $be['forwardto'];
+				$item['address'] = $be['address'];
+				$item['port'] = $be['port'];
+				$transparent_backends[] = $item;
+			}
+		}
+	}
+	return $transparent_backends;
+}
+
+function haproxy_generate_rules($type) {
+	// called by filter.inc when pfSense rules generation happens
+	global $g, $config;
+	$rules = "";
+	switch($type) {
+	case 'filter':
+		// Sloppy pf rules are needed because of ipfw is used to 'catch' return traffic, and pf would otherwise terminate the connection after a few packets..
+		$transparent_backends = haproxy_get_transparent_backends();
+		if (count($transparent_backends) > 0) {
+			$rules .= "# allow HAProxy transparent traffic\n";
+			foreach($transparent_backends as $tb){
+				if (is_ipaddrv4($tb['address']))
+					$rules .= "pass  out  quick  on {$tb['interface']} inet proto tcp  from any to {$tb['address']} port {$tb['port']} flags S/SA keep state ( sloppy )  label \"HAPROXY_transparent_rule_{$tb['name']}\"\n";
+				if (is_ipaddrv6($tb['address'])) {
+					list ($addr, $scope) = explode("%", $tb['address']);
+					$rules .= "pass  out  quick  on {$tb['interface']} inet6 proto tcp  from any to {$addr} port {$tb['port']} flags S/SA keep state ( sloppy )  label \"HAPROXY_transparent_rule_{$tb['name']}\"\n";
+				}
+			}
+		}
+		break;
+	}
+	return $rules;
+}
+
+function load_ipfw_rules() {
+	// On FreeBSD 8 pf does not support "divert-reply" so ipfw is needed.
+	global $g, $config;
+	if (haproxy_utils::$pf_version < 2.2) {
+		$ipfw_zone_haproxy = "haproxy";
+	} else {
+		$ipfw_zone_haproxy = "4000"; // seems that 4000 is a safe zone number to avoid conflicts with captive portal.. and 4095 is the max?
+	}
+	
+	$a_backends = &$config['installedpackages']['haproxy']['ha_pools']['item'];
+	
+	haproxy_load_modules();
+
+	$transparent_backends = haproxy_get_transparent_backends();
+	
+	$transparent_interfaces = array();
+	foreach($transparent_backends as $transparent_backend){
+		$interface = $transparent_backend['interface'];
+		$transparent_interfaces[$interface] = 1;
+	}
+	
+	if (haproxy_utils::$pf_version < 2.2) {
+		// pfSense 2.1 FreeBSD 8.3
+		mwexec("/usr/local/sbin/ipfw_context -a $ipfw_zone_haproxy", true);
+		
+		foreach($transparent_interfaces as $transparent_if => $value) {
+			mwexec("/usr/local/sbin/ipfw_context -a $ipfw_zone_haproxy -n $transparent_if", true);
+		}
+	} else {
+		// pfSense 2.2 FreeBSD 10
+		mwexec("/sbin/ipfw zone $ipfw_zone_haproxy create", true);
+		foreach($transparent_interfaces as $transparent_if => $value) {
+			mwexec("/sbin/ipfw zone $ipfw_zone_haproxy madd $transparent_if", true);
+		}
+	}
+	
+	$rulenum = 64000; // why that high? captiveportal.inc also does it...
+	$rules = "flush\n";
+	foreach($transparent_backends as $transparent_be) {
+		if (is_ipaddrv4($transparent_be["address"]))
+			$rules .= "add $rulenum fwd localhost tcp from {$transparent_be["address"]} {$transparent_be["port"]} to any in recv {$transparent_be["interface"]}\n";
+		else if (is_ipaddrv6($transparent_be["address"])) {
+			list ($addr, $scope) = explode("%", $transparent_be['address']);
+			$rules .= "add $rulenum fwd ::1 tcp from {$addr} {$transparent_be["port"]} to any in recv {$transparent_be["interface"]}\n";
+		}
+		
+		$rulenum++;
+	}
+	
+
+	file_put_contents("{$g['tmp_path']}/ipfw_{$ipfw_zone_haproxy}.haproxy.rules", $rules);
+	if (haproxy_utils::$pf_version < 2.2)
+		mwexec("/usr/local/sbin/ipfw_context -s $ipfw_zone_haproxy", true);
+	mwexec("/sbin/ipfw -x $ipfw_zone_haproxy -q {$g['tmp_path']}/ipfw_{$ipfw_zone_haproxy}.haproxy.rules", true);
+}
+
+function haproxy_plugin_carp($pluginparams) {
+	// called by pfSense when a CARP interface changes its state (called multiple times when multiple interfaces change state)
+	// $pluginparams['type'] always 'carp'
+	// $pluginparams['event'] either 'rc.carpmaster' or 'rc.carpbackup'
+	// $pluginparams['interface'] contains the affected interface
+	$type = $pluginparams['type'];
+	$event = $pluginparams['event'];
+	$interface = $pluginparams['interface'];
+	haproxy_check_run(0);
+}
+
+function haproxy_plugin_certificates($pluginparams) {
+	global $config;
+	$result = array();
+	if ($pluginparams['type'] == 'certificates' && $pluginparams['event'] == 'used_certificates') {
+		$result['pkgname'] = "HAProxy";
+		$result['certificatelist'] = array();
+		// return a array of used certificates.
+		foreach($config['installedpackages']['haproxy']['ha_backends']['item'] as &$frontend) {
+			if (get_frontend_uses_ssl($frontend)) {
+				if ($frontend['ssloffloadacl']){
+					$item = array();
+					$cert = $frontend['ssloffloadcert'];
+					$item['usedby'] = $frontend['name'];
+					$result['certificatelist'][$cert][] = $item;
+				}
+				if ($frontend['ssloffloadacladditional']){
+					foreach($frontend['ha_certificates']['item'] as $certref){
+						$item = array();
+						$cert = $certref['ssl_certificate'];
+						$item['usedby'] = $frontend['name'];
+						$result['certificatelist'][$cert][] = $item;
+					}
+				}
+			}
+		}
+	}
+	return $result;
+}
+
+function haproxy_carpipismaster($ip) {
+	global $config;
+	foreach($config['virtualip']['vip'] as $carp) {
+		if ($carp['mode'] != "carp")
+			continue;
+		$ipaddress = $carp['subnet'];
+		if ($ipaddress != $ip)
+			continue;
+
+		$carp_int = "{$carp['interface']}_vip{$carp['vhid']}";
+		$status = get_carp_interface_status($carp_int);
+		return ($status == "MASTER");
+	}
+	return null;
+}
+
+function haproxy_check_run($reload) {
+	global $config, $g, $haproxy_run_message;
+
+	$haproxylock = lock("haproxy", LOCK_EX);
+	$a_global = &$config['installedpackages']['haproxy'];
+	$configpath = "{$g['varetc_path']}/haproxy";
+	
+	if ($reload)
+		haproxy_writeconf($configpath);
+
+	if(isset($a_global['enable'])) {
+		if (isset($a_global['carpdev'])) {
+			$status = haproxy_carpipismaster($a_global['carpdev']);
+			if (!$status) {
+				if (haproxy_is_running()) {
+					log_error("Stopping haproxy on CARP backup.");
+					//exec("/bin/pkill -F /var/run/haproxy.pid haproxy");//doesnt work for multiple pid's in a pidfile
+					haproxy_kill();
+				}
+				unlock($haproxylock);
+				return (0);
+			} else if (haproxy_is_running() && $reload == 0) { 
+				unlock($haproxylock);
+				return (0);
+			}
+			log_error("Starting haproxy on CARP master.");
+			/* fallthrough */
+		} else if ($reload == 0){
+			unlock($haproxylock);
+			return (0);
+		}
+
+		if(use_transparent_clientip_proxying()) {
+			filter_configure();
+			load_ipfw_rules();
+		} else {
+			if (haproxy_utils::$pf_version < 2.2) {
+				mwexec("/usr/local/sbin/ipfw_context -d haproxy", true);
+			} else {			
+				$ipfw_zone_haproxy = 4000;
+				mwexec("/sbin/ipfw zone $ipfw_zone_haproxy destroy", true);
+			}
+		}
+		
+		if (file_exists('/var/run/haproxy.pid')){
+			$old_pid = file_get_contents('/var/run/haproxy.pid');
+		} else
+			$old_pid = 'none';
+		
+		if (haproxy_is_running()) {
+			if (isset($a_global['terminate_on_reload']))
+				$sf_st = "-st";//terminate old process as soon as the new process is listening
+			else
+				$sf_st = "-sf";//finish serving existing connections exit when done, and the new process is listening
+			
+			syslog(LOG_NOTICE, "haproxy: reload old pid:$old_pid");
+			exec("/usr/local/sbin/haproxy -f {$configpath}/haproxy.cfg -p /var/run/haproxy.pid $sf_st `cat /var/run/haproxy.pid` 2>&1", $output, $errcode);
+		} else {
+			syslog(LOG_NOTICE, "haproxy: starting old pid:$old_pid");
+			exec("/usr/local/sbin/haproxy -f {$configpath}/haproxy.cfg -p /var/run/haproxy.pid -D 2>&1", $output, $errcode);
+		}
+		if (file_exists('/var/run/haproxy.pid')){
+			$new_pid = file_get_contents('/var/run/haproxy.pid');
+		} else
+			$new_pid = 'none';
+		syslog(LOG_NOTICE, "haproxy: started new pid:$new_pid");
+		
+		foreach($output as $line)
+			$haproxy_run_message .= "<br/>" . htmlspecialchars($line) . "\n";
+	} else {
+		if ($reload && haproxy_is_running()) {
+			//exec("/bin/pkill -F /var/run/haproxy.pid haproxy");//doesnt work for multiple pid's in a pidfile
+			haproxy_kill();
+		}
+		$errcode = 0;
+	}
+	unlock($haproxylock);
+	return ($errcode);
+}
+
+function haproxy_kill($killimmediately = true) {
+	if ($killimmediately)
+		$signal = "KILL"; // stop now
+	else
+		$signal = "USR1"; // stop when all connections are closed
+	killprocesses("haproxy", "/var/run/haproxy.pid", $signal);
+}
+
+function killprocesses($processname, $pidfile, $signal = "KILL") {
+	exec("kill -$signal `pgrep -x $processname | grep -w -f $pidfile`");
+}
+
+function haproxy_sync_xmlrpc_settings() {
+	global $config;
+	// preserve 'old' sync settings, that should not be overwritten by xmlrpc-sync.
+	$old_config = $config['installedpackages']['haproxy'];
+	$enable = isset($config['installedpackages']['haproxy']['enablesync']);
+	
+	$config['installedpackages']['haproxy'] = $config['installedpackages']['haproxysyncpkg'];
+	unset($config['installedpackages']['haproxysyncpkg']);
+	$new_config = &$config['installedpackages']['haproxy'];
+	
+	// restore 'old' settings.
+	$config['installedpackages']['haproxy']['enablesync'] = $enable ? true : false;
+	$new_config['log-send-hostname'] = $old_config['log-send-hostname'];
+	
+	write_config("haproxy, xmlrpc config synced"); // Write new 'merged' configuration
+}
+
+function haproxy_do_xmlrpc_sync() {
+	$syncinfo = array();
+	$syncinfo['sync_logname'] = "HAProxy";
+	$syncinfo['data'] = haproxy_xmlrpc_sync_prepare_config();
+	$syncinfo['sync_include'] = "/usr/local/pkg/haproxy.inc";	
+	$syncinfo['sync_done_execute'] = "haproxy_xmlrpc_sync_configure";	
+	xmlrpc_sync_execute($syncinfo);
+}
+
+function haproxy_xmlrpc_sync_prepare_config() {
+	/* xml will hold the sections to sync */
+	global $config;
+	$xml = array();
+	$xml['haproxysyncpkg'] = $config['installedpackages']['haproxy'];
+	return $xml;
+}
+
+function haproxy_xmlrpc_sync_configure() {
+	// this function is called by xmlrpc after config has been synced.
+	
+	haproxy_sync_xmlrpc_settings();
+	haproxy_configure(); // Configure HAProxy config files to use the new configuration.
+	
+	// sync 2nd and further nodes in the chain if applicable.
+	if(isset($config['installedpackages']['haproxy']['enablesync'])) {
+		haproxy_do_xmlrpc_sync();
+	}
+}
+
+function get_frontend_id($name) {
+	global $config;
+	$a_frontend = &$config['installedpackages']['haproxy']['ha_backends']['item'];
+	$i = 0;
+	foreach($a_frontend as $frontend)
+	{
+		if ($frontend['name'] == $name)
+			return $i;
+		$i++;
+	}
+	return null;
+}
+
+function haproxy_is_frontendname($name) {
+	if ($name[0] == '!')
+		$name = substr($name, 1);
+	return get_frontend_id($name) != null;
+}
+
+function get_primaryfrontend($frontend) {
+	global $config;
+	$a_frontend = &$config['installedpackages']['haproxy']['ha_backends']['item'];
+	if ($frontend['secondary'] == 'yes')
+		$mainfrontend = $a_frontend[get_frontend_id($frontend['primary_frontend'])];
+	else
+		$mainfrontend = $frontend;
+	return $mainfrontend;
+}
+
+function get_frontend_ipport($frontend, $userfriendly=false) {
+	$mainfrontend = get_primaryfrontend($frontend);
+	$result = array();
+	if (!is_arrayset($mainfrontend,"a_extaddr","item"))
+		return $result;
+	foreach($mainfrontend['a_extaddr']['item'] as $extaddr) {
+		if ($extaddr['extaddr'] == 'custom'){
+			$addr = $extaddr['extaddr_custom'];
+		} else {
+			$addr = haproxy_interface_ip($extaddr['extaddr'], $userfriendly);
+		}
+		if ($userfriendly and is_ipaddrv6($addr))
+			$addr = "[{$addr}]";
+		
+		$port = $extaddr['extaddr_port'];
+		$newitem = array();
+		$newitem['addr'] = $addr;
+		$newitem['port'] = $port;
+		$newitem['ssl'] = $extaddr['extaddr_ssl'];
+		$result[$addr.$port] = $newitem;
+	}
+	ksort($result);
+	return $result;
+}
+
+function get_frontend_bindips($frontend) {
+	$mainfrontend = get_primaryfrontend($frontend);
+	$result = array();
+	if (!is_arrayset($mainfrontend,"a_extaddr","item"))
+		return $result;
+	foreach($mainfrontend['a_extaddr']['item'] as $extaddr) {
+		$a_ip = array();
+		if (isset($extaddr['extaddr']) && $extaddr['extaddr'] != "custom") {
+			$a_ip[] = haproxy_interface_ip($extaddr['extaddr']);
+		} else {						
+			$iporalias = $extaddr['extaddr_custom'];
+			$a_ip = haproxy_addressoralias_to_list($iporalias);
+		}
+		if ($extaddr['extaddr_ssl'] == 'yes')
+			$ssl = $ssl_info;
+		else
+			$ssl = "";
+		
+		foreach($a_ip as $ip) {
+			$portsnumeric = group_ports(haproxy_portoralias_to_list($extaddr['extaddr_port']));
+			if (is_array($portsnumeric)) {
+				foreach($portsnumeric as $portnumeric) {
+					$portnumeric = str_replace(":","-",$portnumeric);
+					$newitem = array();
+					$newitem['addr'] = $ip;
+					$newitem['port'] = $portnumeric;
+					$newitem['extaddr_ssl'] = $extaddr['extaddr_ssl'];
+					$newitem['extaddr_advanced'] = $extaddr['extaddr_advanced'];
+					$result[] = $newitem;
+				}
+			}
+		}
+	}
+	return $result;
+}
+
+function haproxy_check_config() {
+	global $config;
+	$a_backends = &$config['installedpackages']['haproxy']['ha_backends']['item'];
+	$result = false;
+	$activefrontends = array();
+	$issues = array();
+	
+	foreach($a_backends as $frontend) {
+		if (($frontend['status'] != 'active') || ($frontend['secondary'] == 'yes'))
+			continue;
+		$ipports = get_frontend_ipport($frontend);
+		foreach($ipports as $ipport) {
+			$id = "{$ipport['addr']}:{$ipport['port']}";
+			if (isset($activefrontends[$id]))
+				$issues['P_'.$id] = "Multiple primary frontends with IP:Port \"$id\", use Shared-Frontends instead.";
+			else
+				$activefrontends[$id] = true;
+		}
+	}
+	foreach($a_backends as $frontend) {
+		if (($frontend['status'] != 'active') || ($frontend['secondary'] != 'yes'))
+			continue;
+		$mainfrontend = get_primaryfrontend($frontend);
+		if (!isset($mainfrontend))
+			$issues['S_'.$frontend['name']] = "Secondary frontend \"{$frontend['name']}\" without active primary frontend.";
+	}
+	foreach ($issues as $item)
+		$result .= ($result == false ? "" : "<br/>") . $item;	
+	return $result;
+}
+
+function get_haproxy_frontends($excludeitem="") {
+	global $config;
+	$a_frontend = &$config['installedpackages']['haproxy']['ha_backends']['item'];
+	$result = array();
+	if(!is_array($a_frontend))
+		return $result;
+	foreach($a_frontend as &$frontend)
+	{
+		if ($frontend['secondary'])
+			continue;
+		if ($frontend['name'] == $excludeitem)
+			continue;
+		
+		$serveraddress = get_frontend_ipport($frontend, true);
+		$serveradresstext = null;
+		foreach($serveraddress as $addr) {
+			$serveradresstext .=($serveradresstext == null ? "" : ", ") . "{$addr['addr']}:{$addr['port']}";
+		}
+		$result[$frontend['name']]['name'] = "{$frontend['name']} - {$frontend['type']} ({$serveradresstext})";
+		$result[$frontend['name']]['ref'] = &$frontend;
+	}
+	uasort($result, haproxy_compareByName);
+	return $result;
+}
+
+function get_frontend_uses_ssl($frontend) {
+	$mainfrontend = get_primaryfrontend($frontend);
+	$ssl = false;
+	if (is_arrayset($mainfrontend,'a_extaddr','item')) {
+		foreach($mainfrontend['a_extaddr']['item'] as $extaddr) {
+			if ($extaddr['extaddr_ssl'] == 'yes') {
+				$ssl = true;
+				break;
+			}
+		}
+	}
+	if ($mainfrontend['name'] != $frontend['name'])
+		$ssl = $ssl && $frontend['ssloffload'] == 'yes';
+	return $ssl;
+}
+
+function get_frontend_uses_ssl_only($frontend) {
+	$mainfrontend = get_primaryfrontend($frontend);
+	if (is_arrayset($mainfrontend,'a_extaddr','item')) {
+		foreach($mainfrontend['a_extaddr']['item'] as $extaddr) {
+			if ($extaddr['extaddr_ssl'] != 'yes')
+				return false;
+		}
+	}
+	return true;
+}
+
+function haproxy_get_cert_acl($cert) {
+	$acl_item = array();
+	
+	$cert_cn = cert_get_cn($cert['crt']);
+	$descr = haproxy_escape_acl_name($cert['descr']);
+	unset($cert);
+	$is_wildcard = substr($cert_cn, 0, 2) == "*.";
+	$cert_cn_regex = str_replace(".", "\.", $cert_cn); // escape '.' in regex.
+	$wild_regex = "";
+	if ($is_wildcard) {
+		$cert_cn_regex = "([^\.]*)" . substr($cert_cn_regex, 1);// match only subdomains directly under the wildcard
+	}
+	$cert_cn_regex = "^{$cert_cn_regex}(:([0-9]){1,5})?$";// match both with and without port.
+	
+	$acl_item['descr'] = "Certificate ACL matches: {$cert_cn}";
+	$acl_item['ref'] = array('name' => "{$aclname}_{$descr}",'expression' => 'host_regex', 'value' => $cert_cn_regex, 'certacl' => true);
+	return $acl_item;
+}
+
+function get_frontend_acls($frontend) {
+	$mainfrontend = get_primaryfrontend($frontend);
+	$result = array();
+	$a_acl = &$frontend['ha_acls']['item'];
+	if (is_array($a_acl))
+	{
+		foreach ($a_acl as $entry) {
+			$acl = haproxy_find_acl($entry['expression']);
+			if (!$acl)
+				continue;
+
+			// Filter out acls for different modes
+			if ($acl['mode'] != '' && $acl['mode'] != strtolower($mainfrontend['type']))
+				continue;
+			$not = $entry['not'] == "yes" ? "not " : "";
+			$acl_item = array();
+			$acl_item['descr'] = $acl['name'] . " " . (isset($acl['novalue']) ? "" : $entry['value']);
+			$acl_item['ref'] = $entry;
+			
+			$result[] = $acl_item;
+		}
+	}
+	
+	if (get_frontend_uses_ssl($frontend)) {
+		$a_acl = &$frontend['ha_acls']['item'];
+		if(!is_array($a_acl)) 
+			$a_acl=array();
+	
+		$poolname = $frontend['backend_serverpool'] . "_" . strtolower($frontend['type']);
+		$aclname = "SNI_" . $poolname;
+		
+		if (ifset($frontend['ssloffloadacl']) == 'yes' || ifset($frontend['ssloffloadaclnondefault']) == 'yes') {
+			$cert = lookup_cert($frontend['ssloffloadcert']);
+			$result[] = haproxy_get_cert_acl($cert);
+		}
+		if (ifset($frontend['ssloffloadacladditional']) == 'yes') {
+			$certs = $frontend['ha_certificates']['item'];
+			if (is_array($certs)){
+				foreach($certs as $certref){
+					$cert = lookup_cert($certref['ssl_certificate']);
+					$result[] = haproxy_get_cert_acl($cert);
+				}
+			}
+		}
+	}
+	return $result;
+}
+
+function get_backend_id($name) {
+	global $config;
+	$a_backend = &$config['installedpackages']['haproxy']['ha_pools']['item'];
+	$i = 0;
+	if(is_array($a_backend))
+		foreach($a_backend as $key => $backend) {
+			if ($backend['name'] == $name)
+				return $i;
+			$i++;
+		}
+	return null;
+}
+
+function get_backend($name) {
+	global $config;
+	$a_backend = &$config['installedpackages']['haproxy']['ha_pools']['item'];
+	$id = get_backend_id($name);
+	if (is_numeric($id))
+		return $a_backend[$id];
+	return null;
+}
+
+function use_frontend_as_unixsocket($name) {
+	global $config;
+	$a_backends = &$config['installedpackages']['haproxy']['ha_pools']['item'];
+	foreach ($a_backends as $backend) {
+		$a_servers = &$backend['ha_servers']['item'];
+		if (is_array($a_servers)) {
+			foreach($a_servers as $server) {	
+				if ($server['forwardto'] && $server['forwardto'] == $name)
+					return true;
+			}
+		}
+	}
+	return false;
+}
+
+function haproxy_escapestring($configurationsting) {
+	$result = str_replace('\\', '\\\\', $configurationsting);
+	$result = str_replace(' ', '\\ ', $result);
+	return str_replace('#', '\\#', $result);
+}
+
+function haproxy_escape_acl_name($aclname) {
+	return preg_replace_callback('([^A-Za-z0-9\._\-\:])', function($match){return "_".dechex(ord($match[0]));}, $aclname);
+}
+
+function haproxy_find_create_certificate($certificatename) {
+	global $g;
+	$cert = lookup_cert_by_name($certificatename);
+	if (is_array($cert))
+		return $cert;
+	global $config;
+	$a_cert =& $config['cert'];	
+	$cert = array();
+	$cert['refid'] = uniqid();
+	$cert['descr'] = gettext($certificatename);
+	
+	$new_cert = array();
+	$dn = array(
+		"organizationName" => "haproxy-pfsense",
+		"commonName"       => "haproxy-pfsense"
+	);
+	$new_cert = array();
+	ca_create($new_cert, 1024, 2000, $dn);
+	$crt = base64_decode($new_cert['crt']);
+	$prv = base64_decode($new_cert['prv']);
+	cert_import($cert, $crt, $prv);
+	$a_cert[] = $cert;
+	return $cert;
+}
+
+?>
diff --git a/config/haproxy-devel/pkg/haproxy_htmllist.inc b/config/haproxy-devel/pkg/haproxy_htmllist.inc
new file mode 100644
index 00000000..f873028e
--- /dev/null
+++ b/config/haproxy-devel/pkg/haproxy_htmllist.inc
@@ -0,0 +1,455 @@
+<?php
+/*
+	haproxy_htmllist.php
+	part of pfSense (https://www.pfsense.org/)
+	Copyright (C) 2013 PiBa-NL
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+/*
+  This file contains functions which are NOT specific to HAProxy and may/could/should 
+  be moved to the general pfSense php library for possible easy use by other parts of pfSense
+*/
+
+require_once("config.inc");
+require_once("haproxy_utils.inc");
+
+class HaproxyHtmlList
+{
+	/*
+		javascript 'events':
+			<tableId>_row_added(tableId, rowNr)
+			<tableId>_field_changed(tableId, rowNr, fieldId, field)
+	*/
+
+	private $tablename = "";
+	private $fields = array();
+	public $editmode = false;
+	public $fields_details = null;
+	public $keyfield = "";
+	
+	public function HaproxyHtmlList($tablename, $fields){
+		$this->tablename = $tablename;
+		$this->fields = $fields;
+	}
+	
+	public function Draw($data){
+		$this->haproxy_htmllist($data, $this->fields, $this->editmode, $this->fields_details);
+	}
+	
+	function haproxy_htmllist_get_values(){
+		$values = array();
+		for($x=0; $x<99; $x++) {
+			$value = array();
+			$add_item = false;
+			foreach($this->fields as $item){
+				$itemname = $item['name'];
+				$value[$itemname] = $_POST[$itemname.$x];
+				if ($item['type'] == 'textarea')
+					$value[$itemname] = base64_encode($value[$itemname]);
+				$add_item |= isset($_POST[$itemname.$x]);
+			}
+			if ($add_item) {
+				if ($this->keyfield != "") {
+					if (isset($_POST[$this->tablename."_key".$x]))
+						$key = $_POST[$this->tablename."_key".$x];
+					else
+						$key = $_POST[$this->keyfield.$x];
+						
+				} else 
+					$key = "";
+					
+				if (isset($values[$key]))
+					$values[] = $value;
+				else
+					$values[$key] = $value;
+			}
+		}
+		return $values;
+	}
+
+	private function haproxy_htmllist_drawcell($item, $itemvalue, $editable, $itemname, $counter) {
+		$itemnamenr = $itemname . $counter;
+		$itemtype = $item['type'];
+		if ($editable) {
+			$itemtype = $item['type'];
+			if ($itemtype == "select"){
+				echo_html_select($itemnamenr, $item['items'], $itemvalue,"","html_listitem_change(\"{$this->tablename}\",\"{$itemname}\",\"{$counter}\",this);", "width:{$item['size']}");
+			} else
+			if ($itemtype == "checkbox"){
+				$checked = $itemvalue=='yes' ? " checked" : "";
+				echo "<input onclick='html_listitem_change(\"{$this->tablename}\",\"{$itemname}\",\"{$counter}\",this);' name='$itemnamenr' id='$itemnamenr' type='checkbox'$checked value='yes' size='{$item['size']}' />";
+			}  else
+			if ($itemtype == "textarea"){
+				echo "<textarea name='$itemnamenr' id='$itemnamenr' type='text' cols='{$item['size']}' rows='10'>";
+				echo htmlspecialchars(base64_decode($itemvalue));
+				echo "</textarea>";
+			}  else
+				echo "<input name='$itemnamenr' id='$itemnamenr' type='text' value='{$itemvalue}' size='{$item['size']}' />";
+		} else {
+			if ($itemtype == "select"){
+				echo $item['items'][$itemvalue]['name'];
+			} else
+			if ($itemtype == "checkbox"){
+				echo $itemvalue=='yes' ? gettext('yes') : gettext('no');
+			} else
+			if ($itemtype == "textarea"){
+				echo htmlspecialchars(base64_decode($itemvalue));
+			} else
+				echo htmlspecialchars($itemvalue);
+		}
+	}
+
+	function haproxy_htmllist($rowvalues,$items,$editstate=false,$itemdetails=null){
+		$tablename = $this->tablename;
+		global $g, $counter;
+		echo "<table class='' width='100%' cellpadding='0' cellspacing='0' id='$tablename'>
+		<tr>";
+		foreach($items as $item){
+			echo "<td width='{$item['colwidth']}' class='listhdrr'>{$item['columnheader']}</td>";
+		}
+		echo "<td width='5%' class=''></td>
+		</tr>";
+		if (is_array($rowvalues)){
+			foreach($rowvalues as $keyid => $value){
+				if ($this->keyfield != "") {
+					if (preg_match("/[^0-9]/", $keyid))
+						$itemvalue = $keyid;
+					else
+						$itemvalue = $value[$this->keyfield];
+					$key = "<input name='{$tablename}_key{$counter}' id='{$tablename}_key{$counter}' type='hidden' value='{$itemvalue}'>";
+				} else
+					$key = "";
+				
+				if (!$editstate) {
+					echo "<tr id='tr_view_$counter' ondblclick='editRow($counter); return false;' >";
+					$leftitem = true;
+					foreach($items as $item) {
+						$tdclass = $leftitem ? "vtable listlr" : "vtable listr";
+						echo "<td class='$tdclass'>";
+						$itemname = $item['name'];
+						$itemvalue = $value[$itemname];
+						if (isset($item['customdrawcell'])) {
+							$item['customdrawcell']($item, $itemvalue, false);
+						} else
+							$this->haproxy_htmllist_drawcell($item, $itemvalue, false, $itemname, $counter);
+						echo "</td>";
+						$leftitem = false;
+						
+					}
+					echo "
+			<td class='list'>
+				<table border='0' cellspacing='0' cellpadding='1'><tr>
+				<td valign='middle'>
+				<img src='/themes/{$g['theme']}/images/icons/icon_e.gif' title='edit entry' width='17' height='17' border='0' onclick='editRow($counter); return false;' />
+				</td>
+				<td valign='middle'>
+				<img src='/themes/{$g['theme']}/images/icons/icon_x.gif' title='delete entry' width='17' height='17' border='0' onclick='deleteRow($counter, \"$tablename\"); return false;' />
+				</td>
+				<td valign='middle'>
+				<img src='/themes/{$g['theme']}/images/icons/icon_plus.gif' title='duplicate entry' width='17' height='17' border='0' onclick='dupRow($counter, \"$tablename\"); return false;' />
+				</td></tr></table>
+			</td>";
+					echo "</tr>";
+				}
+				$displaystyle = $editstate ? "" : "display: none;";
+				echo "<tr id='tr_edit_$counter' style='$displaystyle'>";
+				foreach($items as $item){
+					$itemname = $item['name'];
+					$itemvalue = $value[$itemname];					
+					echo "<td class='vtable'>".$key;
+					if (isset($item['customdrawcell'])) {
+						$item['customdrawcell']($item, $itemvalue, true, $item['name'].$counter);
+					} else
+						$this->haproxy_htmllist_drawcell($item, $itemvalue, true, $itemname, $counter);
+					echo "</td>";
+					$key = "";
+				}
+				echo "
+		<td class='list'>
+			<table border='0' cellspacing='0' cellpadding='1'><tr>
+			<td valign='middle'>
+			<img src='/themes/{$g['theme']}/images/icons/icon_x.gif' title='delete entry' width='17' height='17' border='0' onclick='removeRow(this); return false;' />
+			</td>
+			<td valign='middle'>
+			<img src='/themes/{$g['theme']}/images/icons/icon_plus.gif' title='duplicate entry' width='17' height='17' border='0' onclick='dupRow($counter, \"$tablename\"); return false;' />
+			</td></tr></table>
+		</td>";
+				echo "</tr>";
+					if (isset($itemdetails)) {
+						$colspan = count($items)-1;
+						echo "<tr id='tr_viewdetail_$counter'>";
+						?>
+							<td class='vtable listlr' style='border-bottom-width: medium;vertical-align:top;'>
+							<div style="position:relative;float:right;width:11px;height:11px;">
+							<a onclick="htmltable_toggle_details('<?="htmltable_{$tablename}_{$counter}_details"?>')">
+								<img id="htmltable_<?="{$tablename}_{$counter}"?>_details_off" alt="Expand advanced server settings" 
+								src="tree/plus.gif" style="clip:rect(19px 13px 30px 2px); top:-19px;position:absolute;"/>
+							</a>
+							</div>
+							</td>
+						<?
+						echo "<td class='vtable listr' colspan='$colspan' style='border-bottom-width: medium;'>";
+						$itemnr = 0;
+						echo "<div id='htmltable_{$tablename}_{$counter}_details_view'>";
+						$itemcount = count($itemdetails);
+						foreach($itemdetails as $item) {
+							echo "<div style='float: left;padding-right: 2px;'>";
+							$tdclass = "";//$leftitem ? "vtable listlr" : "vtable listr";
+							echo $item['columnheader'] . ": ";
+							$itemname = $item['name'];
+							$itemvalue = $value[$itemname];
+							if (isset($item['customdrawcell'])) {
+								$item['customdrawcell']($item, $itemvalue, false);
+							} else
+								$this->haproxy_htmllist_drawcell($item, $itemvalue, false, $itemname, $counter);
+							$leftitem = false;
+							$itemnr++;
+							if ($itemcount != $itemnr)
+								echo ", ";
+							echo "</div>";
+						}
+						echo "</div>";
+						echo "<div id='htmltable_{$tablename}_{$counter}_details_edit' style='display:none;'>";
+						echo "<table class='tabcont' style='border-collapse:collapse' border='1' cellspacing='0' >";
+						$leftitem = true;
+						foreach($itemdetails as $item) {
+						echo "<tr id='tr_edititemdetails_$counter' ondblclick='editRow($counter); return false;'>";
+							$tdclass = "";//$leftitem ? "vtable listlr" : "vtable listr";
+							echo "<td style='border-right:0' class='$tdclass'>";
+							echo "{$item['columnheader']}: ";
+							echo "</td>";
+							echo "<td style='border-left:0' class='$tdclass'>";
+							$itemname = $item['name'];
+							$itemvalue = $value[$itemname];
+							echo "{$item['description']}<br/>";
+							if (isset($item['customdrawcell'])) {
+								$item['customdrawcell']($item, $itemvalue, true, $itemname . $counter);
+							} else
+								$this->haproxy_htmllist_drawcell($item, $itemvalue, true, $itemname, $counter);
+							echo "</td>";
+							$leftitem = false;
+						echo "</tr>";
+						}
+						echo "</table>";
+						echo "</div>";
+						echo "</td>";
+						echo "</tr>";
+					}
+					if (isset($itemdetails)) {
+						$colspan = count($items)-1;
+						echo "<tr id='htmltable_{$tablename}_{$counter}_details' style='$displaystyle' >";
+						echo "<td class='vtable listlr' style='border-bottom-width: medium;'> </td>";
+						echo "<td class='vtable listr' colspan='$colspan' style='border-bottom-width: medium;'>";
+						echo "</td>";
+						echo "</tr>";
+					}
+				
+				$counter++;
+			}
+		}
+		echo "</table>
+			<a onclick='javascript:addRowTo(\"$tablename\"); return false;' href='#'>
+			<img border='0' src='/themes/{$g['theme']}/images/icons/icon_plus.gif' alt='' title='add another entry' />
+			</a>";
+	}
+}
+
+function haproxy_htmllist($tablename,$rowvalues,$items,$editstate=false,$itemdetails=null){
+	$list = new HaproxyHtmlList($tablename, $items);
+	$list->haproxy_htmllist($rowvalues, $items, $editstate, $itemdetails);
+}
+
+function haproxy_htmllist_get_values($html_list){
+	$list = new HaproxyHtmlList("-", $html_list);
+	return $list->haproxy_htmllist_get_values();
+}
+
+function haproxy_htmllist_js(){
+?><script type="text/javascript">
+	function html_listitem_change(tableId, fieldId, rowNr, field) {
+		javascript_event = tableId + "_listitem_change";
+		var fn = window[javascript_event];
+		if (typeof fn === 'function'){
+			fn(tableId, fieldId, rowNr, field);
+		}
+	}
+	
+	function htmllist_get_select_items(prefix,tableId) {
+		var items;
+		var i = tableId.lastIndexOf('_');
+		var items_name = prefix+"_"+tableId.substr(i+1);
+		items = eval("typeof "+items_name+" !== 'undefined' ? "+items_name+" : {}");
+		return items;
+	}
+
+	var addRowTo = (function() {
+	return (function (tableId) {
+		var d, tbody, tr, td, bgc, i, ii, j, type, seltext, items;
+		var btable, btbody, btr, btd;
+		d = document;
+		
+		items = htmllist_get_select_items('fields',tableId);
+
+		tbody = d.getElementById(tableId).getElementsByTagName("tbody").item(0);
+		tr = d.createElement("tr");
+		totalrows++;
+		tr.setAttribute("id","aclrow" + totalrows);
+		
+		for (var i in items) {
+			td = d.createElement("td");
+			if(items[i]['type'] == 'textbox') {
+				td.innerHTML="<input size='" + items[i]['size'] + "' name='" + items[i]['name'] + totalrows +
+				"' id='" + items[i]['name'] + totalrows +
+				"'><\/input> ";
+			} else if(items[i]['type'] == 'textarea') {
+				td.innerHTML="<textarea cols='" + items[i]['size'] + "' rows='30' name='" + items[i]['name'] + totalrows +
+				"' id='" + items[i]['name'] + totalrows +
+				"'><\/textarea> ";
+			} else if(items[i]['type'] == 'select') {
+				seltext = htmllist_get_select_options(tableId, items[i]['name']);
+				td.innerHTML="<select style='width:" + items[i]['size'] + "'  name='" + items[i]['name'] + totalrows + 
+				"' id='" + items[i]['name'] + totalrows + "' "+
+				"onchange='html_listitem_change(\""+tableId+"\",\""+items[i]['name']+"\",\""+totalrows+"\",this);' " +
+				">" + seltext + "<\/select> ";
+			} else {
+				td.innerHTML="<input type='checkbox' name='" + items[i]['name'] + totalrows +"'"+
+				"id='" + items[i]['name'] + totalrows + "' "+
+				"onclick='html_listitem_change(\""+tableId+"\",\""+items[i]['name']+"\",\""+totalrows+"\",this);' " +
+				"value='yes'><\/input> ";
+			}
+			tr.appendChild(td);
+		}
+		td = d.createElement("td");
+		td.rowSpan = "1";
+		td.setAttribute("class","list");
+
+		items = htmllist_get_select_items('fields_details',tableId);
+		for (var i in items) {
+			td.innerHTML=td.innerHTML+"<input type='hidden' name='" + items[i]['name'] + totalrows +
+				"' id='" + items[i]['name'] + totalrows +
+				"'><\/input> ";
+		}
+		
+		// Recreate the button table.
+		btable = document.createElement("table");
+		btable.setAttribute("border", "0");
+		btable.setAttribute("cellspacing", "0");
+		btable.setAttribute("cellpadding", "1");
+		btbody = document.createElement("tbody");
+		btr = document.createElement("tr");
+		btd = document.createElement("td");
+		btd.setAttribute("valign", "middle");
+		btd.innerHTML = '<img src="/themes/' + theme + '/images/icons/icon_x.gif" title="delete entry" width="17" height="17" border="0" onclick="removeRow(this); return false;" />';
+		btr.appendChild(btd);
+		btd = document.createElement("td");
+		btd.setAttribute("valign", "middle");
+		btd.innerHTML = '<img src="/themes/' + theme + "/images/icons/icon_plus.gif\" title=\"duplicate entry\" width=\"17\" height=\"17\" border=\"0\" onclick=\"dupRow(" + totalrows + ", '" + tableId + "'); return false;\" />";
+		btr.appendChild(btd);
+		btbody.appendChild(btr);
+		btable.appendChild(btbody);
+		td.appendChild(btable);
+		tr.appendChild(td);
+		tbody.appendChild(tr);
+
+		javascript_row_added = tableId + "_row_added";
+		var fn = window[javascript_row_added];
+		if (typeof fn === 'function'){
+			fn(tableId, totalrows);
+		}
+	});
+	})();
+	function dupRow(rowId, tableId) {
+		var dupEl;
+		var newEl;
+		addRowTo(tableId);
+		items = htmllist_get_select_items('fields',tableId);
+		for (var i in items) {
+			dupEl = document.getElementById(items[i]['name'] + rowId);
+			newEl = document.getElementById(items[i]['name'] + totalrows);
+			if (dupEl && newEl)
+				if(items[i]['type'] == 'checkbox')
+					newEl.checked = dupEl.checked;
+				else
+					newEl.value = dupEl.value;
+		}
+		items = htmllist_get_select_items('fields_details',tableId);
+		for (var i in items) {
+			dupEl = document.getElementById(items[i]['name'] + rowId);
+			newEl = document.getElementById(items[i]['name'] + totalrows);
+			if (dupEl && newEl)
+				if(items[i]['type'] == 'checkbox')
+					newEl.value = dupEl.checked ? 'yes' : '';
+				else
+					newEl.value = dupEl.value;
+		}
+		javascript_row_added = tableId + "_row_added";
+		var fn = window[javascript_row_added];
+		if (typeof fn === 'function'){
+			fn(tableId, totalrows);
+		}
+	}
+	function editRow(num) {
+		var trview = document.getElementById('tr_view_' + num);
+		var tredit = document.getElementById('tr_edit_' + num);
+		trview.style.display='none';
+		tredit.style.display='';
+	}
+	function deleteRow(rowId, tableId) {
+		var view = document.getElementById("tr_view_" + rowId);
+		var viewdetail = document.getElementById("tr_viewdetail_" + rowId);
+		var edit = document.getElementById("tr_edit_" + rowId);
+		if (view)
+			view.parentNode.removeChild(view);
+		if (viewdetail)
+			viewdetail.parentNode.removeChild(viewdetail);
+		if (edit)
+			edit.parentNode.removeChild(edit);
+	}
+	function removeRow(el) {
+		var cel;
+		// Break out of one table first
+		while (el && el.nodeName.toLowerCase() != "table")
+			el = el.parentNode;
+		while (el && el.nodeName.toLowerCase() != "tr")
+			el = el.parentNode;
+
+		if (el && el.parentNode) {
+			cel = el.getElementsByTagName("td").item(0);
+			el.parentNode.removeChild(el);
+		}
+	}
+	
+	function htmltable_toggle_details(table_row_detail_id) {
+		tredit = document.getElementById(table_row_detail_id+'_off');
+		trviewdetail = document.getElementById(table_row_detail_id+'_edit');
+		treditdetail = document.getElementById(table_row_detail_id+'_view');
+		current_on = tredit.style.display == 'none';
+		tredit.style.display=current_on ? '' : 'none';
+		trviewdetail.style.display=current_on ? 'none' : '';
+		treditdetail.style.display=current_on ? '' : 'none';
+	}
+</script><?
+}
+
+?>
diff --git a/config/haproxy-devel/pkg/haproxy_socketinfo.inc b/config/haproxy-devel/pkg/haproxy_socketinfo.inc
new file mode 100644
index 00000000..cbfb131b
--- /dev/null
+++ b/config/haproxy-devel/pkg/haproxy_socketinfo.inc
@@ -0,0 +1,165 @@
+<?php
+/*
+		Copyright (C) 2013 PiBa-NL
+        Copyright 2011 Thomas Schaefer - Tomschaefer.org
+        Copyright 2011 Marcello Coutinho
+        Part of pfSense widgets (www.pfsense.org)
+
+        Redistribution and use in source and binary forms, with or without
+        modification, are permitted provided that the following conditions are met:
+
+        1. Redistributions of source code must retain the above copyright notice,
+           this list of conditions and the following disclaimer.
+
+        2. Redistributions in binary form must reproduce the above copyright
+           notice, this list of conditions and the following disclaimer in the
+           documentation and/or other materials provided with the distribution.
+
+        THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+        AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+        AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+        OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+        SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+        INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+        CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+        ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+        POSSIBILITY OF SUCH DAMAGE.
+*/
+/*
+	Some mods made from pfBlocker widget to make this for HAProxy on Pfsense
+	Copyleft 2012 by jvorhees
+*/
+
+//set variables
+$refresh_rate = 5000; //miliseconds
+$show_frontends = "YES";
+$show_clients = "YES";
+$show_clients_traffic = "YES";
+
+function haproxy_socket_command($command){
+	$result = array();
+	if (file_exists("/tmp/haproxy.socket")) {
+		$socket = stream_socket_client('unix:///tmp/haproxy.socket', $errno, $errstr);
+		if ($socket) {
+			fwrite($socket, "$command\n");
+			while (!feof($socket)) {
+				$result[] = fgets($socket);
+			}
+			fclose($socket);
+		}
+	}
+	return $result;
+}
+
+function haproxy_set_server_enabled($backend, $server, $enable) {//"enable be/server ?"/"disable be/server ?"
+	$enablecommand = $enable ? "enable" : "disable";
+	return haproxy_socket_command("$enablecommand server $backend/$server");
+}
+
+function haproxy_get_tables(){// "show table"
+	$result = array();
+	$cmdresult = haproxy_socket_command("show table");
+	foreach($cmdresult as $line) {
+		if (trim($line) == "")
+			continue;
+		list($table,$type,$size,$used) = explode(",", $line);
+		$table = explode(":", $table);
+		$type = explode(":", $type);
+		$size = explode(":", $size);
+		$used = explode(":", $used);
+		$newtable = array();
+		$tablename = trim($table[1]);
+		$newtable['type'] = trim($type[1]);
+		$newtable['size'] = $size[1];
+		$newtable['used'] = $used[1];
+		$result[$tablename] = $newtable;
+	}
+	return $result;
+}
+
+function haproxy_get_statistics(){// "show stat"
+	$result = array();
+	$frontends=array();
+	$backends=array();
+	$servers=array();
+
+	$cmdresult = haproxy_socket_command("show stat");
+	
+	foreach($cmdresult as $line) {
+		list($pxname,$svname,$qcur,$qmax,$scur,$smax,$slim,$stot,$bin,$bout,$dreq,$dresp,$ereq,$econ,$eresp,$wretr,$wredis,$status,$weight,$act,$bck,$chkfail,$chkdown,$lastchg,$downtime,$qlimit,$pid,$iid,$sid,$throttle,$lbtot,$tracked,$type,$rate,$rate_lim,$rate_max,$check_status,$check_code,$check_duration,$hrsp_1xx,$hrsp_2xx,$hrsp_3xx,$hrsp_4xx,$hrsp_5xx,$hrsp_other,$hanafail,$req_rate,$req_rate_max,$req_tot,$cli_abrt,$srv_abrt,$comp_in,$comp_out,$comp_byp,$comp_rsp) = explode(",", $line);
+		#Retrieve data
+		switch ($svname) {
+		case "FRONTEND":	
+			$frontends[] = array(
+				"pxname" => $pxname,
+				"scur" => $scur,
+				"slim" => $slim,
+				"status" => $status);
+		break;
+		case "BACKEND":	
+			$backends[] = array(
+				"pxname" => $pxname,
+				"scur" => $scur,
+				"slim" => $slim,
+				"status" => $status);
+		break;
+		default:	
+			$servers[] = array(
+				"pxname" => $pxname,
+				"svname" => $svname,
+				"scur" => $scur,
+				"status" => $status);
+		}
+	}
+	$result['frontends'] = $frontends;
+	$result['backends'] = $backends;
+	$result['servers'] = $servers;
+	return $result;
+}
+
+function haproxy_get_clients($show_traffic = false){// "show sess"
+	$clients=array();
+	$sessions = haproxy_socket_command("show sess");
+	foreach($sessions as $line) {
+		if (trim($line) == "")
+			continue;
+		list($sessid,$proto,$src,$fe,$be,$srv,$ts,$age,$calls,$rq,$rp,$s0,$s1,$exp) = explode(" ", $line);
+		#Retrieve data
+		$sessid = explode(":", $sessid);
+		$src = explode("=", $src);
+		$srcip = explode(":", $src[1]);
+		$srcport = explode(":", $src[1]);
+		$be = explode("=", $be);
+		$srv = explode("=", $srv);
+		$age = explode("=", $age);
+		$calls = explode("=", $calls);
+		$exp = explode("=", $exp);
+		$clients[] = array(
+			"sessid" => $sessid[0],
+			"src" => $src[1],
+			"srcip" => $srcip[0],
+			"srcport" => $srcport[1],
+			"be" => $be[1],
+			"srv" => $srv[1],
+			"age" => $age[1],
+			"calls" => $calls[1],
+			"exp" => $exp[1]);
+	}
+	if ($show_traffic) {
+		foreach($clients as &$client) {
+			$session_data = haproxy_socket_command("show sess {$client['sessid']}");
+			$client['session_data'] = $session_data;
+			
+			$req = explode(" ",$session_data[12]);
+			$x = explode("=",$req[7]);
+			$client['session_datareq'] = $x[1];
+			$res = explode(" ",$session_data[15]);
+			$x = explode("=",$res[7]);
+			$client['session_datares'] = $x[1];
+		}
+	}
+	return $clients;
+}
+
+?>
diff --git a/config/haproxy-devel/pkg/haproxy_utils.inc b/config/haproxy-devel/pkg/haproxy_utils.inc
new file mode 100644
index 00000000..4b945c06
--- /dev/null
+++ b/config/haproxy-devel/pkg/haproxy_utils.inc
@@ -0,0 +1,459 @@
+<?php
+/*
+	haproxy_utils.php
+	part of pfSense (https://www.pfsense.org/)
+	Copyright (C) 2013-2015 PiBa-NL
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+/*
+  This file contains functions which are NOT specific to HAProxy and may/could/should 
+  be moved to the general pfSense php library for possible easy use by other parts of pfSense
+*/
+
+require_once("config.inc");
+
+class haproxy_utils {
+	public static $pf_version;
+
+	public function query_dns($host, $querytype="A,AAAA", $dnsserver = "127.0.0.1") {
+		$result = array();
+		$host = trim($host, " \t\n\r\0\x0B[];\"'");
+		$host_esc = escapeshellarg($host);
+		$types = explode(',',$querytype);
+		foreach($types as $type){
+			$resolved = gethostbyname($host);
+			if($resolved) {
+				$resolved = array();
+				if (haproxy_utils::$pf_version < '2.2')
+					exec("/usr/bin/dig   {$host_esc} $type @$dnsserver | /usr/bin/grep {$host_esc} | /usr/bin/grep -v ';' | /usr/bin/awk '{ print $5 }'", $resolved);
+				else
+					exec("/usr/bin/drill {$host_esc} $type @$dnsserver | /usr/bin/grep {$host_esc} | /usr/bin/grep -v ';' | /usr/bin/awk '{ print $5 }'", $resolved);
+				foreach($resolved as $item) {
+					$newitem = array();
+					$newitem["typeid"] = $type;
+					$newitem["data"] = $item;
+					$result[] = $newitem;
+				}
+			}
+		}
+		return $result;
+	}
+}
+haproxy_utils::$pf_version = substr(trim(file_get_contents("/etc/version")),0,3);
+
+if(!function_exists('ifset')){
+	function ifset(&$var, $default = ''){
+		return isset($var) ? $var : $default;
+	};
+}
+
+if(!function_exists('is_arrayset')){
+	function is_arrayset(&$array, $items){
+		if (!isset($array))
+			return false;
+		$item = $array;
+		$arg = func_get_args();
+		for($i = 1; $i < count($arg); $i++) {
+
+			$itemindex = $arg[$i];
+			if (!isset($item[$itemindex]) || !is_array($item[$itemindex]))
+				return false;
+			$item = $item[$itemindex];
+
+		}
+		return true;
+	}
+}
+
+function haproxy_compareByName($a, $b) {
+	return strcasecmp($a['name'], $b['name']);
+}
+
+function haproxy_interface_ip($interfacebindname,$userfriendly=false){
+	$list = haproxy_get_bindable_interfaces();
+	$item = $list[$interfacebindname];
+	$result = $item['ip'];
+	if ($userfriendly && !$result)
+		$result = $item['name'];
+	return $result;
+}
+
+function haproxy_get_bindable_interfaces($ipv="ipv4,ipv6", $interfacetype="any,localhost,real,carp,ipalias"){
+	// returns a list of ALL interface/IPs that can be used to bind a service to.
+	// filtered by the conditions given in the two filter parameters.
+	// result array includes:
+	// $bindable[key]                can be stored and compared with previous setings
+	// $bindable[key]['ip']          the current IP (possibly changes for dhcp enabled interfaces..)
+	// $bindable[key]['description'] can be shown to user in a selection box
+
+	global $config;
+	$ipverions = split(',',$ipv);
+	$interfacetypes= split(',',$interfacetype);
+
+	$bindable = array();
+	if (in_array("ipv4",$ipverions)){
+		if (in_array('any',$interfacetypes)){
+			$item = array();
+			$item[ip] = '0.0.0.0';
+			$item[name] = 'any (IPv4)';
+			$bindable['any_ipv4'] = $item;
+		}
+		if (in_array('localhost',$interfacetypes)){
+			$item = array();
+			$item[ip] = '127.0.0.1';
+			$item[name] = 'localhost (IPv4)';
+			$bindable['localhost_ipv4'] = $item;
+		}
+		if (in_array('real',$interfacetypes)){
+			foreach($config['interfaces'] as $if => $ifdetail) {
+				if (!isset($ifdetail['enable']))
+					continue;
+				if (!isset($ifdetail['ipaddr']))
+					continue;
+				$descr = $ifdetail['descr'];
+				if (!$descr){
+					if ($if == "wan" && !$ifdetail['descr'])
+						$descr = "WAN";
+					else if ($if == "lan" && !$ifdetail['descr'])
+						$descr = "LAN";
+					else
+						$descr = $if;
+				}
+				$item = array();
+				$item['ip'] = get_interface_ip($if);
+				$item['name'] = "$descr address (IPv4)";
+				$bindable[$if.'_ipv4'] = $item;
+			}
+		}
+		if (in_array('carp',$interfacetypes)){
+			$carplist = get_configured_carp_interface_list();
+			foreach ($carplist as $carpif => $carpip){
+				if (is_ipaddrv4($carpip)){
+					$item = array();
+					$item['ip'] = $carpip;
+					$item['name'] = $carpip." (".get_vip_descr($carpip).")";
+					$bindable[$carpip] = $item;
+				}
+			}
+
+		}
+		if (in_array('ipalias',$interfacetypes)){
+			$aliaslist = get_configured_ip_aliases_list();
+			foreach ($aliaslist as $aliasip => $aliasif){
+				if (is_ipaddrv4($aliasip)){
+					$item = array();
+					$item['ip'] = $aliasip;
+					$item['name'] = $aliasip." (".get_vip_descr($aliasip).")";
+					$bindable[$aliasip.'_ipv4'] = $item;	
+				}
+			}
+		}
+	}
+	if (!isset($config['system']['ipv6allow']))
+		return $bindable;// skip adding the IPv6 addresses if those are not 'allowed'
+	
+	if (in_array("ipv6",$ipverions)){
+		if (in_array('any',$interfacetypes)){
+			$item = array();
+			$item[ip] = '::';
+			$item[name] = 'any (IPv6)';
+			$bindable['any_ipv6'] = $item;
+		}
+		if (in_array('localhost',$interfacetypes)){
+			$item = array();
+			$item[ip] = '::1';
+			$item[name] = 'localhost (IPv6)';
+			$bindable['localhost_ipv6'] = $item;
+		}
+		if (in_array('real',$interfacetypes)){
+			foreach($config['interfaces'] as $if => $ifdetail) {
+				if (!isset($ifdetail['enable']))
+					continue;
+				if (!isset($ifdetail['ipaddrv6']))
+					continue;
+				$descr = $ifdetail['descr'];
+				if (!$descr){
+					if ($if == "wan" && !$ifdetail['descr'])
+						$descr = "WAN";
+					else if ($if == "lan" && !$ifdetail['descr'])
+						$descr = "LAN";
+					else
+						$descr = $if;
+				}
+				$item = array();
+				$item['ip'] = get_interface_ipv6($if);
+				$item['name'] = "$descr  address (IPv6)";
+				$bindable[$if.'_ipv6'] = $item;
+			}
+		}		
+		if (in_array('carp',$interfacetypes)){
+			$carplist = get_configured_carp_interface_list();
+			foreach ($carplist as $carpif => $carpip){
+				if (is_ipaddrv6($carpip)){
+					$item = array();
+					$item['ip'] = $carpip;
+					$item['name'] = $carpip." (".get_vip_descr($carpip).")";
+					$bindable[$carpip] = $item;
+				}
+			}
+
+		}
+		if (in_array('ipalias',$interfacetypes)){
+			$aliaslist = get_configured_ip_aliases_list();
+			foreach ($aliaslist as $aliasip => $aliasif){
+				if (is_ipaddrv6($aliasip)){
+					$item = array();
+					$item['ip'] = $aliasip;
+					$item['name'] = $aliasip." (".get_vip_descr($aliasip).")";
+					$bindable[$aliasip] = $item;	
+				}
+			}
+		}
+	}
+	return $bindable;
+}
+
+function haproxy_get_cert_extensions($crt){
+	$cert = openssl_x509_parse(base64_decode($crt['crt']));
+	return $cert['extensions'];
+}
+
+function haproxy_get_cert_authoritykeyidentifier($cert)
+{
+	$certextension = haproxy_get_cert_extensions($cert);
+	$lines = preg_split('/[\n]+/',$certextension['authorityKeyIdentifier']);
+	return substr($lines[0],6);// cut off the starting string 'keyid:'
+}
+function haproxy_get_cert_subjectKeyIdentifier($cert)
+{
+	$certextension = haproxy_get_cert_extensions($cert);
+	$lines = preg_split('/[\n]+/',$certextension['subjectKeyIdentifier']);
+	return $lines[0];
+}
+
+function haproxy_cert_signed_by($cert, $signedbycert) {
+	// checks if $cert was signed by $signedbycert
+	// this does NOT validate a proper signature but only checks if the extension properties match.
+	$authoritykeyid = haproxy_get_cert_authoritykeyidentifier($cert);
+	$subjectid = haproxy_get_cert_subjectKeyIdentifier($signedbycert);
+	return $authoritykeyid == $subjectid;
+}
+
+function haproxy_recalculate_certifcate_chain(){
+	// and set "selfsigned" for certificates that where used to sign themselves
+	// recalculate the "caref" for all certificates where it is currently unkown.
+	
+	$allcertificates = haproxy_get_certificates('ca,server,user',true);
+	$items_recalculated = 0;
+	foreach($allcertificates as &$cert){
+		$recalculate=false;
+		if (!isset($cert['selfsigned'])){
+			if (!isset($cert['caref']))
+				$recalculate=true;
+			else {		
+				$ca = lookup_ca($cert['caref']);
+				if (!$ca)	
+					$recalculate=true;
+			}
+		}
+		if ($recalculate){
+			foreach($allcertificates as &$signedbycert){
+				if(haproxy_cert_signed_by($cert, $signedbycert)){
+					if ($cert['refid'] == $signedbycert['refid']){
+						$cert['selfsigned'] = true;
+					} else {					
+						$cert['caref'] = $signedbycert['refid'];
+					}
+					$items_recalculated++;
+				}
+			}
+		}
+	}
+	if ($items_recalculated > 0)
+		write_config("Services: HAProxy: Recalculated $items_recalculated certificate chains.");
+	return $items_recalculated;
+}
+
+function get_certificat_usage($refid) {
+	$usage = array();
+	$cert = lookup_cert($refid);
+	if (is_cert_revoked($cert))
+		$usage[] = "*Revoked";
+	if (is_webgui_cert($refid))
+		$usage[] = "webConfigurator";
+	if (is_user_cert($refid))
+		$usage[] = "User Cert";
+	if (is_openvpn_server_cert($refid))
+		$usage[] = "OpenVPN Server";
+	if (is_openvpn_client_cert($refid))
+		$usage[] = "OpenVPN Client";
+	if (is_ipsec_cert($refid))
+		$usage[] = "IPsec Tunnel";
+	if (function_exists("is_captiveportal_cert"))
+		if (is_captiveportal_cert($refid))
+			$usage[] = "Captive Portal";
+	return $usage;
+}
+
+function haproxy_get_certificate_descriptivename($cert) {
+	$usage = get_certificat_usage($cert['crt']);
+	foreach($usage as $use){
+		$usagestr .= " " . $use;
+	}		
+	if ($usagestr != "")
+		$usagestr = " (".trim($usagestr).")";
+
+	$purpose = cert_get_purpose($cert['crt']);
+	$certserverpurpose = $purpose['server'] == 'Yes' ? " [Server cert]" : "";
+		
+	$caname = "";
+	$ca = lookup_ca($cert['caref']);
+	if ($ca)
+		$caname = " (CA: {$ca['descr']})";
+	
+	return $cert['descr'] . $caname . $certserverpurpose . $usagestr;
+}
+
+function haproxy_get_certificates($type = 'server,user', $get_includeWebCert=false) {
+	// $type one or multiple of these separated by a comma:  ca,server,user
+	// $get_includeWebCert if the webgui certificate may be included.
+
+	// This function (is intended to) provide a uniform way to retrieve a list of server certificates
+	global $config;
+	$type = ",$type,";
+	$certificates = array();
+	if (strpos($type,',server,') !== false || strpos($type,',user,') !== false ) {
+		if (is_array($config['cert'])) {
+			$a_cert = &$config['cert'];
+			foreach ($a_cert as $cert) {
+				$purpose = cert_get_purpose($cert['crt']);
+				
+				$ok = false;
+				$ok |= stristr($type,',server,') && $purpose['server'] == 'Yes';
+				$ok |= stristr($type,',user,') && $purpose['server'] != 'Yes';
+				if (!$ok)
+					continue;
+				if ($get_includeWebCert == false && is_webgui_cert($cert['refid']))
+					continue;
+				$certificates[$cert['refid']]['name'] = haproxy_get_certificate_descriptivename($cert);
+			}
+		}
+	}
+	if (strpos($type,',ca,') !== false) {
+		if (is_array($config['ca'])) {
+			$a_cert = &$config['ca'];
+			foreach ($a_cert as $cert) {
+				$certificates[$cert['refid']]['name'] = haproxy_get_certificate_descriptivename($cert);
+			}
+		}
+	}
+	uasort($certificates, haproxy_compareByName);
+	return $certificates;
+}
+
+function haproxy_get_crls() {
+	global $config;
+	$certificates=array();
+	if (is_array($config['crl'])) {
+		foreach ($config['crl'] as $crl) {
+			$caname = "";
+			$ca = lookup_ca($crl['caref']);
+			if ($ca)
+				$caname = " (CA: {$ca['descr']})";
+		
+			$certificates[$crl['refid']]['name'] = $crl['descr'] . $caname;
+		}
+	}
+	uasort($certificates, haproxy_compareByName);
+	return $certificates;
+}
+
+function phparray_to_javascriptarray_recursive($nestID, $path, $items, $nodeName, $includeitems) {
+	$offset = str_repeat('  ',$nestID);
+	$itemName = "item$nestID";
+	echo "{$offset}$nodeName = {};\n";
+	if (is_array($items))
+		foreach ($items as $key => $item)
+		{
+			if (in_array($path.'/'.$key, $includeitems))
+				$subpath = $path.'/'.$key;
+			else
+				$subpath = $path.'/*';
+			if (in_array($subpath, $includeitems) || in_array($path.'/*', $includeitems)) {
+				if (is_array($item)) {
+					$subNodeName = "item$nestID";
+					phparray_to_javascriptarray_recursive($nestID+1, $subpath, $items[$key], $subNodeName, $includeitems);
+					echo "{$offset}{$nodeName}['{$key}'] = $itemName;\n";
+				} else {
+					$item = json_encode($item);
+					echo "{$offset}{$nodeName}['$key'] = $item;\n";
+				}
+			}
+		}
+}
+function phparray_to_javascriptarray($items, $javaMapName, $includeitems) {
+	phparray_to_javascriptarray_recursive(1,'',$items, $javaMapName, $includeitems);
+}
+
+function haproxy_html_select_options($keyvaluelist, $selected="") {
+	$result = "";
+	foreach($keyvaluelist as $key => $desc){
+		$selectedhtml = $key == $selected ? "selected" : "";
+		if ($desc['deprecated'] && $key != $selected){
+			continue;
+		}
+		$name = htmlspecialchars($desc['name']);
+		$result .= "<option value='{$key}' {$selectedhtml}>{$name}</option>";
+	}
+	return $result;
+}
+
+function haproxy_js_select_options($keyvaluelist, $selected="") {
+	$result = "";
+	foreach($keyvaluelist as $key => $desc){
+		$selectedhtml = $key == $selected ? "selected" : "";
+		if ($desc['deprecated'] && $key != $selected){
+			continue;
+		}
+		$name = htmlspecialchars($desc['name']);
+		$result .= "<option value='{$key}' {$selectedhtml}>{$name}<\/option>";
+	}
+	return $result;
+}
+
+function echo_html_select($name, $keyvaluelist, $selected, $listEmptyMessage="", $onchangeEvent="", $style="") {
+	if (count($keyvaluelist)>0){
+		if ($onchangeEvent != "")
+			$onchangeEvent = " onchange='$onchangeEvent'";
+		if ($style != "")
+			$style = " style='$style'";
+		echo "<select name=\"$name\" id=\"$name\" class=\"formselect\"$onchangeEvent$style>";
+		echo haproxy_html_select_options($keyvaluelist, $selected);
+		echo "</select>";
+	} else {
+		echo $listEmptyMessage;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/config/haproxy-devel/pkg/haproxy_xmlrpcsyncclient.inc b/config/haproxy-devel/pkg/haproxy_xmlrpcsyncclient.inc
new file mode 100644
index 00000000..699dffd1
--- /dev/null
+++ b/config/haproxy-devel/pkg/haproxy_xmlrpcsyncclient.inc
@@ -0,0 +1,149 @@
+<?php
+/*
+    haproxy_xmlrpcsyncclient.inc
+	Copyright (C) 2013 PiBa-NL
+	Copyright (C) 2009 Scott Ullrich <sullrich@pfsense.com>
+    Copyright (C) 2008 Remco Hoef
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/* include all configuration functions */
+require_once("functions.inc");
+require_once("pkg-utils.inc");
+require_once("notices.inc");
+
+function xmlrpc_sync_execute($syncinfo) {
+	// name that is logged if something fails during syncing
+	$sync_logname  = $syncinfo['sync_logname'];
+	// configuration data to sync
+	$xml           = $syncinfo['data'];
+	// include file in which the "function sync_done_execute(){xxx}" must be pressent
+	$sync_include  = $syncinfo['sync_include'];
+	// executes to apply the changed configuration on the target system
+	$sync_function = $syncinfo['sync_done_execute'];
+	
+	global $config, $g;
+	//if(!$password)
+		$password = $config['hasync']['password'];
+	if(!$password)
+		return;
+
+	//if(!$sync_to_ip)
+		$sync_to_ip = $config['hasync']['synchronizetoip'];
+	if(!$sync_to_ip)
+		return;
+	
+	// Do not allow syncing to self.
+	$donotsync = false;
+	$localips = get_configured_ip_addresses();
+	if (in_array($sync_to_ip, $localips , true))
+		$donotsync = true;
+	
+	if($donotsync) {
+		log_error("Disallowing sync loop for {$sync_logname} sync.");
+		return;
+	}
+
+	$xmlrpc_sync_neighbor = $sync_to_ip;
+    if($config['system']['webgui']['protocol'] != "") {
+		$synchronizetoip = $config['system']['webgui']['protocol'];
+		$synchronizetoip .= "://";
+    }
+    $port = $config['system']['webgui']['port'];
+    /* if port is empty lets rely on the protocol selection */
+    if($port == "") {
+		if($config['system']['webgui']['protocol'] == "http") 
+			$port = "80";
+		else 
+			$port = "443";
+    }
+	$synchronizetoip .= $sync_to_ip;
+
+	/* xml will hold the sections to sync */
+	//$xml = prepare_xmlrpc_sync_config();
+
+
+	/* assemble xmlrpc payload */
+	$params = array(
+		XML_RPC_encode($password),
+		XML_RPC_encode($xml)
+	);
+
+	/* set a few variables needed for sync code borrowed from filter.inc */
+	$url = $synchronizetoip;
+	log_error("Beginning {$sync_logname} XMLRPC sync to {$url}:{$port}.");
+	$method = 'pfsense.merge_installedpackages_section_xmlrpc';
+	$msg = new XML_RPC_Message($method, $params);
+	$cli = new XML_RPC_Client('/xmlrpc.php', $url, $port);
+	$cli->setCredentials('admin', $password);
+	if($g['debug'])
+		$cli->setDebug(1);
+	/* send our XMLRPC message and timeout after 250 seconds */
+	$resp = $cli->send($msg, "250");
+	if(!$resp) {
+		$error = "A communications error occurred while attempting {$sync_logname} XMLRPC sync with {$url}:{$port}.";
+		log_error($error);
+		file_notice("sync_settings", $error, "{$sync_logname} Settings Sync", "");
+	} elseif($resp->faultCode()) {
+		$cli->setDebug(1);
+		$resp = $cli->send($msg, "250");
+		$error = "An error code was received while attempting {$sync_logname} XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
+		log_error($error);
+		file_notice("sync_settings", $error, "{$sync_logname} Settings Sync", "");
+	} else {
+		log_error("{$sync_logname} XMLRPC sync successfully completed with {$url}:{$port}.");
+	}
+
+	/* tell package to reload our settings on the destination sync host. */
+	$method = 'pfsense.exec_php';
+	$execcmd  = "require_once('{$sync_include}');\n";
+	$execcmd .= "{$sync_function}();\n";
+	
+	/* assemble xmlrpc payload */
+	$params = array(
+		XML_RPC_encode($password),
+		XML_RPC_encode($execcmd)
+	);
+
+	log_error("{$sync_logname} XMLRPC reload data {$url}:{$port}.");
+	$msg = new XML_RPC_Message($method, $params);
+	$cli = new XML_RPC_Client('/xmlrpc.php', $url, $port);
+	$cli->setCredentials('admin', $password);
+	$resp = $cli->send($msg, "250");
+	if(!$resp) {
+		$error = "A communications error occurred while attempting {$sync_logname} XMLRPC sync with {$url}:{$port} (exec_php).";
+		log_error($error);
+		file_notice("sync_settings", $error, "{$sync_logname} Settings Reload", "");
+	} elseif($resp->faultCode()) {
+		$cli->setDebug(1);
+		$resp = $cli->send($msg, "250");
+		$error = "An error code was received while attempting {$sync_logname} XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
+		log_error($error);
+		file_notice("sync_settings", $error, "{$sync_logname} Settings Sync", "");
+	} else {
+		log_error("{$sync_logname} XMLRPC reload data success with {$url}:{$port} (exec_php).");
+	}
+}
+
+?>
diff --git a/config/haproxy-devel/pkg/pkg_haproxy_tabs.inc b/config/haproxy-devel/pkg/pkg_haproxy_tabs.inc
new file mode 100644
index 00000000..a74ee20a
--- /dev/null
+++ b/config/haproxy-devel/pkg/pkg_haproxy_tabs.inc
@@ -0,0 +1,28 @@
+<?php
+
+//require_once("guiconfig.inc"); DO NOT REQUIRE THIS!
+
+// DO NOT REQUIRE guiconfig.inc HERE! though it contains the function display_top_tabs needed below.
+// however if included it will hang filter rule generation, and might cause pf to not load any rules.
+// This happens when /usr/local/pkg/*.inc files are dynamically loaded during package generation from filter.inc with function discover_pkg_rules(x).
+
+global $haproxy_tab_array;
+
+$haproxy_tab_array['haproxy'] = array();
+$haproxy_tab_array['haproxy']['settings'] = Array(name => "Settings", url => "haproxy_global.php");
+$haproxy_tab_array['haproxy']['frontend'] = Array(name => "Frontend", url => "haproxy_listeners.php");
+$haproxy_tab_array['haproxy']['backend'] = Array(name => "Backend", url => "haproxy_pools.php");
+$haproxy_tab_array['haproxy']['files'] = Array(name => "Files", url => "haproxy_files.php");
+$haproxy_tab_array['haproxy']['stats'] = Array(name => "Stats", url => "haproxy_stats.php");
+$haproxy_tab_array['haproxy']['statsfs'] = Array(name => "Stats FS", url => "haproxy_stats.php?haproxystats=1");
+$haproxy_tab_array['haproxy']['templates'] = Array(name => "Templates", url => "haproxy_templates.php");
+
+function haproxy_display_top_tabs_active($top_tabs, $activetab) {
+	$tab_array = array();
+	foreach($top_tabs as $key => $tab_item){
+		$tab_array[] = array($tab_item['name'], $key == $activetab, $tab_item['url']);
+	}
+	display_top_tabs($tab_array);
+}
+
+?>