Merge remote branch 'mainline/master'

Conflicts:
	usr/local/www/services_rfc2136.php
	usr/local/www/services_snmp.php
	usr/local/www/status_rrd_graph.php
	usr/local/www/status_rrd_graph_settings.php

1 files changed, 9 insertions, 9 deletions

diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 41f3123..e7fc684 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -276,10 +276,10 @@ function system_routing_configure($interface = "") {
 
 	$gatewayip = "";
 	$interfacegw = "";
+	$foundgw = false;
 	/* tack on all the hard defined gateways as well */
 	if (is_array($config['gateways']['gateway_item'])) {
 		mwexec("/bin/rm {$g['tmp_path']}/*_defaultgw", true);
-		$foundgw = false;
 		foreach	($config['gateways']['gateway_item'] as $gateway) {
 			if (isset($gateway['defaultgw'])) {
 				if ($gateway['gateway'] == "dynamic")
@@ -295,13 +295,13 @@ function system_routing_configure($interface = "") {
 				break;
 			}
 		}
-		if ($foundgw == false) {
-			$defaultif = get_real_interface("wan");
-			$interfacegw = "wan";
-			$gatewayip = get_interface_gateway("wan");
-			@touch("{$g['tmp_path']}/{$defaultif}_defaultgw");
-		}	
 	}
+	if ($foundgw == false) {
+		$defaultif = get_real_interface("wan");
+		$interfacegw = "wan";
+		$gatewayip = get_interface_gateway("wan");
+		@touch("{$g['tmp_path']}/{$defaultif}_defaultgw");
+	}	
 	$dont_add_route = false;
 	/* if OLSRD is enabled, allow WAN to house DHCP. */
 	if($config['installedpackages']['olsrd']) {
@@ -727,7 +727,7 @@ function system_generate_lighty_config($filename,
 	$cert_location = "cert.pem",
 	$ca_location = "ca.pem",
 	$max_procs = 1,
-	$max_requests = "1",
+	$max_requests = "2",
 	$fast_cgi_enable = true,
 	$captive_portal = false) {
 
@@ -1451,4 +1451,4 @@ function system_get_dmesg_boot() {
 	return file_get_contents("{$g['varlog_path']}/dmesg.boot");
 }
 
-?>
\ No newline at end of file
+?>