diff options
| author | Jim P <jim@pingle.org> | 2013-06-17 14:38:50 -0700 |
|---|---|---|
| committer | Jim P <jim@pingle.org> | 2013-06-17 14:38:50 -0700 |
| commit | 268bcb9a886494c81191ec63e220ec1c02508b65 (patch) | |
| tree | 98cfd8a664cf3766c25862790cef4e6b1c972e0d /config/haproxy-devel | |
| parent | 03459dd5d8c83f53e7751ab0ac906b7e5609777b (diff) | |
| parent | b373b72bb60dea4a33b4f6c8b87cf1860cca4de3 (diff) | |
| download | pfsense-packages-268bcb9a886494c81191ec63e220ec1c02508b65.tar.gz pfsense-packages-268bcb9a886494c81191ec63e220ec1c02508b65.tar.bz2 pfsense-packages-268bcb9a886494c81191ec63e220ec1c02508b65.zip | |
Merge pull request #459 from PiBa-NL/haproxy-devel-2.1
haproxy-devel updated to version 1.5dev19, including support for 'transparent proxy'
Diffstat (limited to 'config/haproxy-devel')
| -rw-r--r-- | config/haproxy-devel/haproxy.inc | 2 | ||||
| -rw-r--r-- | config/haproxy-devel/haproxy_pool_edit.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc index 66bcf81f..b5ca35cd 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();'> |