From b373b72bb60dea4a33b4f6c8b87cf1860cca4de3 Mon Sep 17 00:00:00 2001
From: PiBa-NL <pba_2k3@yahoo.com>
Date: Mon, 17 Jun 2013 23:13:23 +0200
Subject: haproxy-devel updated to version 1.5dev19, including support for
 'transparent proxy'

---
 config/haproxy-devel/haproxy.inc           | 2 ++
 config/haproxy-devel/haproxy_pool_edit.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'config/haproxy-devel')

diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc
index 954e933f..4095f8cd 100644
--- a/config/haproxy-devel/haproxy.inc
+++ b/config/haproxy-devel/haproxy.inc
@@ -934,6 +934,8 @@ function haproxy_check_run($reload) {
 
 	if(use_transparent_clientip_proxying())
 		load_ipfw_rules();
+	else
+		mwexec("/usr/local/sbin/ipfw_context -d haproxy", true);
 	
 	if(isset($a_global['enable'])) {
 		if (isset($a_global['carpdev'])) {
diff --git a/config/haproxy-devel/haproxy_pool_edit.php b/config/haproxy-devel/haproxy_pool_edit.php
index 4b93632f..a7a56b1c 100644
--- a/config/haproxy-devel/haproxy_pool_edit.php
+++ b/config/haproxy-devel/haproxy_pool_edit.php
@@ -491,7 +491,7 @@ foreach($simplefields as $field){
 				</table>
 			</td>
 		</tr>
-		<tr align="left" style="display:none;">
+		<tr align="left">
 			<td width="22%" valign="top" class="vncell">Transparent ClientIP</td>
 			<td width="78%" class="vtable" colspan="2">
 				<input id="transparent_clientip" name="transparent_clientip" type="checkbox" value="yes" <?php if ($pconfig['transparent_clientip']=='yes') echo "checked"; ?> onclick='updatevisibility();'>
-- 
cgit v1.2.3