From: Sarah Hoffmann Date: Wed, 13 Feb 2013 23:47:22 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: deploy~638 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/717f9b07af279e6ce622924d45f0904b7b8bda41?hp=-c Merge remote-tracking branch 'upstream/master' --- 717f9b07af279e6ce622924d45f0904b7b8bda41 diff --combined website/reverse.php index 434b5bd1,33e6cd5e..c348659e --- a/website/reverse.php +++ b/website/reverse.php @@@ -4,22 -4,6 +4,22 @@@ require_once(dirname(dirname(__FILE__)).'/lib/init-website.php'); require_once(CONST_BasePath.'/lib/log.php'); + if (preg_match(CONST_BlockedUserAgents, $_SERVER["HTTP_USER_AGENT"]) > 0) + { + $fLoadAvg = getLoadAverage(); + if ($fLoadAvg >= CONST_BlockReverseMaxLoad) { + header('HTTP/1.0 403 Forbidden'); + header('Content-type: text/html; charset=utf-8'); + echo "

App temporarily blocked

"; + echo "Your application has been temporarily blocked from the OpenStreetMap Nominatim "; + echo "geolocation service due to high server load."; + echo "\n\n"; + exit; + } + + } + + if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false) { $fLoadAvg = getLoadAverage(); @@@ -91,7 -75,7 +91,7 @@@ $iMaxRank = (isset($_GET['zoom']) && isset($aZoomRank[$_GET['zoom']]))?$aZoomRank[$_GET['zoom']]:28; // Find the nearest point - $fSearchDiam = 0.0001; + $fSearchDiam = 0.0004; $iPlaceID = null; $aArea = false; $fMaxAreaDistance = 1;