Merge remote branch 'upstream/master'

Conflicts:
	etc/version

6 files changed, 65 insertions, 24 deletions

diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 382e8dd..d800859 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -1440,8 +1440,11 @@ function setup_wireless_olsr() {
 	conf_mount_rw();
 	foreach($config['installedpackages']['olsrd']['config'] as $olsrd) {
 		$olsr_enable = $olsrd['enable'];
-		if($olsr_enable <> "on")
+		if($olsr_enable <> "on") {
+			if (is_process_running("olsrd"))
+				mwexec("/usr/bin/killall olsrd", true);
 			return;
+		}
 		$fd = fopen("{$g['varetc_path']}/olsr.conf", "w");
 
 		if($olsrd['announcedynamicroute'] or $olsrd['enableannounce'] == "on") {
@@ -1703,7 +1706,7 @@ EODAD;
 		fclose($fd);
 	}
 
-	if(is_process_running("olsrd"))
+	if (is_process_running("olsrd"))
 		mwexec("/usr/bin/killall olsrd", true);
 
 	sleep(2);
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 7fd3bcf..2c644d8 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -86,7 +86,9 @@ function system_resolvconf_generate($dynupdate = false) {
 
 	$syscfg = $config['system'];
 
-	$resolvconf = "domain {$syscfg['domain']}\n";
+	// Do not create blank domain lines, it breaks tools like dig.
+	if($syscfg['domain'])
+		$resolvconf = "domain {$syscfg['domain']}\n";
 
 	$havedns = false;
 
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 258700c..f5b74b5 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -1327,29 +1327,30 @@ function is_interface_vlan_mismatch() {
 }
 
 function is_interface_mismatch() {
-        global $config, $g;
+	global $config, $g;
 
-        /* XXX: Should we process only enabled interfaces?! */
-        $do_assign = false;
-        $i = 0;
+	$do_assign = false;
+	$i = 0;
 	if (is_array($config['interfaces'])) {
-        	foreach ($config['interfaces'] as $ifname => $ifcfg) {
-                	if (preg_match("/^enc|^cua|^tun|^l2tp|^pptp|^ppp|^ovpn|^gif|^gre|^lagg|^bridge|vlan|_wlan/i", $ifcfg['if'])) {
-                        	$i++;
-                	}
-                	else if (does_interface_exist($ifcfg['if']) == false) {
+		foreach ($config['interfaces'] as $ifname => $ifcfg) {
+			if (preg_match("/^enc|^cua|^tun|^l2tp|^pptp|^ppp|^ovpn|^gif|^gre|^lagg|^bridge|vlan|_wlan/i", $ifcfg['if'])) {
+				// Do not check these interfaces.
+				$i++;
+				continue;
+			}
+			else if (does_interface_exist($ifcfg['if']) == false) {
 				$do_assign = true;
-                	} else
-                        	$i++;
-        	}
+			} else
+				$i++;
+		}
 	}
 
-        if ($g['minimum_nic_count'] > $i) {
-                $do_assign = true;
-        } else if (file_exists("{$g['tmp_path']}/assign_complete"))
-                $do_assign = false;
+	if ($g['minimum_nic_count'] > $i) {
+		$do_assign = true;
+	} else if (file_exists("{$g['tmp_path']}/assign_complete"))
+	$do_assign = false;
 
-        return $do_assign;
+	return $do_assign;
 }
 
 /* sync carp entries to other firewalls */
diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip
index e95acd4..fd60d6a 100755
--- a/etc/rc.initial.setlanip
+++ b/etc/rc.initial.setlanip
@@ -217,7 +217,7 @@
 	}
 
 	$upperifname = strtoupper($interface);
-	echo "\nPlease wait, saving and activating your changes to {$upperifname}...";
+	echo "\nPlease wait while the changes are saved to {$upperifname}...";
 	write_config(gettext("{$interface} IP configuration from console menu"));
 	interface_reconfigure(strtolower($upperifname));
 	echo " Reloading filter...";
diff --git a/etc/rc.php_ini_setup b/etc/rc.php_ini_setup
index 99efc39..0135e9c 100755
--- a/etc/rc.php_ini_setup
+++ b/etc/rc.php_ini_setup
@@ -116,8 +116,9 @@ PHPMODULES="$PHPMODULES zmq"
 PHPMODULES="$PHPMODULES ssh2"
 # pfSense extensions
 PHPMODULES="$PHPMODULES pfSense"
-# ion cube
-PHPMODULES="$PHPMODULES ioncube_loader"
+
+PHP_ZEND_MODULES=""
+PHP_ZEND_MODULES_TS=""
 
 # Modules previously included.
 # can be turned on by touching
@@ -178,6 +179,12 @@ EOF
 if [ ! -d /etc/php_dynamodules ]; then
 	/bin/mkdir /etc/php_dynamodules
 fi
+if [ ! -d /etc/php_dynamodules_zend ]; then
+	/bin/mkdir /etc/php_dynamodules_zend
+fi
+if [ ! -d /etc/php_dynamodules_zend_ts ]; then
+	/bin/mkdir /etc/php_dynamodules_zend_ts
+fi
 
 # Read in dynamodules
 if [ -d /etc/php_dynamodules ]; then
@@ -185,6 +192,18 @@ if [ -d /etc/php_dynamodules ]; then
 	PHPMODULES="$PHPMODULES $DYNA_MODULES"
 fi
 
+# Read in zend modules
+if [ -d /etc/php_dynamodules_zend ]; then
+	DYNA_MODULES=`/bin/ls /etc/php_dynamodules/`
+	PHP_ZEND_MODULES="$PHP_ZEND_MODULES $DYNA_MODULES"
+fi
+
+# Read in zend threaded modules
+if [ -d /etc/php_dynamodules_zend_ts ]; then
+	DYNA_MODULES=`/bin/ls /etc/php_dynamodules/`
+	PHP_ZEND_MODULES_TS="$PHP_ZEND_MODULES $DYNA_MODULES"
+fi
+
 # Loop through and generate modules to load.
 # Take into account modules built into php.
 for EXT in $PHPMODULES; do
@@ -203,6 +222,22 @@ for EXT in $PHPMODULES; do
 	fi
 done
 
+# Zend modules
+for EXT in $PHP_ZEND_MODULES; do
+	# Ensure extension exists before adding.
+	if [ -f "${EXTENSIONSDIR}${EXT}.so" ]; then
+		echo "zend_extension=${EXT}.so" >> /usr/local/lib/php.ini
+	fi
+done
+
+# Zend threaded modules
+for EXT in $PHP_ZEND_MODULES_TS; do
+	# Ensure extension exists before adding.
+	if [ -f "${EXTENSIONSDIR}${EXT}.so" ]; then
+		echo "zend_extension_ts=${EXT}.so" >> /usr/local/lib/php.ini
+	fi
+done
+
 # Get amount of ram installed on this system
 RAM=`/sbin/sysctl hw.realmem | /usr/bin/awk '{print $2/1000000}' | /usr/bin/awk -F '.' '{print $1}'`
 export RAM
diff --git a/etc/version b/etc/version
index 5134f7e..064823b 100644
--- a/etc/version
+++ b/etc/version
@@ -1 +1 @@
-2.0-RC2-IPv6
+2.0-RC3-IPv6