diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-06-29 12:30:08 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-06-29 12:30:08 -0500 |
| commit | bdfce2a4b3f0bb7e542dcd66f28a9cbbb384562e (patch) | |
| tree | ca45c569ea765bf02d14dccfc80cf8635043cdc0 | |
| parent | fc04a23eaddc9545a5a7940a2fd58b2b53ded736 (diff) | |
| parent | 342f509028bc675c81172fb89275fd60ec761399 (diff) | |
| download | pfsense-bdfce2a4b3f0bb7e542dcd66f28a9cbbb384562e.zip pfsense-bdfce2a4b3f0bb7e542dcd66f28a9cbbb384562e.tar.gz | |
Merge branch 'RELENG_2_2' of git.pfmechanics.com:pfsense/pfsense into RELENG_2_2
| -rw-r--r-- | etc/inc/unbound.inc | 2 | ||||
| -rw-r--r-- | etc/version | 2 | ||||
| -rw-r--r-- | usr/local/www/diag_tables.php | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/etc/inc/unbound.inc b/etc/inc/unbound.inc index 1d61d77..aaaeed8 100644 --- a/etc/inc/unbound.inc +++ b/etc/inc/unbound.inc @@ -155,6 +155,8 @@ EOF; } else { $bindints .= "interface: 0.0.0.0\n"; $bindints .= "interface: ::0\n"; + /* If the active interface array is empty, treat it the same as "All" as is done above. Otherwise it breaks CARP with a default config. */ + $bindints .= "interface-automatic: yes\n"; } // Determine interfaces to run on diff --git a/etc/version b/etc/version index 8f3cbcd..6356011 100644 --- a/etc/version +++ b/etc/version @@ -1 +1 @@ -2.2.3-RELEASE +2.2.4-DEVELOPMENT diff --git a/usr/local/www/diag_tables.php b/usr/local/www/diag_tables.php index 09237e3..9cfc73f 100644 --- a/usr/local/www/diag_tables.php +++ b/usr/local/www/diag_tables.php @@ -110,7 +110,8 @@ include("head.inc"); if (200 == response.status) { // Escape all dots to not confuse jQuery selectors name = response.responseText.replace(/\./g,'\\.'); - name = name.replace(/\//g,'\\/'); + name = name.replace(/\//g,'\\-'); + name = "entry_" + name; jQuery('#' + name).fadeOut(1000); } } @@ -138,7 +139,7 @@ include("head.inc"); </tr> <?php $count = 0; foreach($entries as $entryA): ?> <?php $entry = trim($entryA); ?> - <tr id="<?=$entry?>"> + <tr id="entry_<?=str_replace("/", "-", $entry);?>"> <td> <?php echo $entry; ?> </td> |
