From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 10 Sep 2013 17:09:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~580
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/0213643ebcba068561691bfbe366fed075d0d3d1

Merge remote-tracking branch 'upstream/master'

Conflicts:
	website/search.php
---

0213643ebcba068561691bfbe366fed075d0d3d1
diff --cc website/reverse.php
index 134b5e4e,ee6a6100..ed877899
--- a/website/reverse.php
+++ b/website/reverse.php
@@@ -3,7 -3,21 +3,9 @@@
  
  	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
  	require_once(CONST_BasePath.'/lib/log.php');
+ 	require_once(CONST_BasePath.'/lib/PlaceLookup.php');
+ 	require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
  
 -	if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
 -	{
 -		$fLoadAvg = getLoadAverage();
 -		if ($fLoadAvg > 2) sleep(60);
 -		if ($fLoadAvg > 4) sleep(120);
 -		if ($fLoadAvg > 6)
 -		{
 -			echo "Bulk User: Temporary block due to high server load\n";
 -			exit;
 -		}
 -	}
 -
  	$oDB =& getDB();
  	ini_set('memory_limit', '200M');