diff options
| author | bmeeks8 <bmeeks8@bellsouth.net> | 2013-06-18 18:49:39 -0400 |
|---|---|---|
| committer | bmeeks8 <bmeeks8@bellsouth.net> | 2013-06-18 18:49:39 -0400 |
| commit | 34cb0a39d7d14ecba7a4fc5060a04760d3921bc8 (patch) | |
| tree | be1f93eff4980ae6cf3f0d3bbbd5735a426f7b60 /config/haproxy-devel | |
| parent | 8c5840439b815474d2a39434147b7892590198f3 (diff) | |
| parent | 268bcb9a886494c81191ec63e220ec1c02508b65 (diff) | |
| download | pfsense-packages-34cb0a39d7d14ecba7a4fc5060a04760d3921bc8.tar.gz pfsense-packages-34cb0a39d7d14ecba7a4fc5060a04760d3921bc8.tar.bz2 pfsense-packages-34cb0a39d7d14ecba7a4fc5060a04760d3921bc8.zip | |
Merge remote-tracking branch 'upstream/master'
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();'> |