From: Sarah Hoffmann Date: Fri, 12 Apr 2013 21:23:36 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: deploy~623 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/12c1deeb8a313873af7c33c878f48a819305b483?hp=--cc Merge remote-tracking branch 'upstream/master' Conflicts: lib/log.php website/reverse.php website/search.php --- 12c1deeb8a313873af7c33c878f48a819305b483 diff --cc settings/settings.php index 159c24ac,f2cdf918..31dc8eac --- a/settings/settings.php +++ b/settings/settings.php @@@ -48,17 -48,15 +48,17 @@@ // Website settings @define('CONST_NoAccessControl', true); - @define('CONST_ClosedForIndexing', false); - @define('CONST_ClosedForIndexingExceptionIPs', ''); @define('CONST_BlockedIPs', ''); + @define('CONST_IPBanFile', CONST_BasePath.'/settings/ip_blocks'); + @define('CONST_WhitelistedIPs', ''); + @define('CONST_BlockedUserAgents', ''); + @define('CONST_BlockReverseMaxLoad', 15); @define('CONST_BulkUserIPs', ''); - @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/'); + @define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/'); @define('CONST_Tile_Default', 'Mapnik'); - @define('CONST_Default_Language', 'xx'); + @define('CONST_Default_Language', false); @define('CONST_Default_Lat', 20.0); @define('CONST_Default_Lon', 0.0); @define('CONST_Default_Zoom', 2); diff --cc website/reverse.php index c348659e,fda11582..a1c39d9d --- a/website/reverse.php +++ b/website/reverse.php @@@ -4,43 -4,27 +4,15 @@@ 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(); - 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'); - 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; - } - } -- - // Format for output - $sOutputFormat = 'xml'; - if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2')) - { - $sOutputFormat = $_GET['format']; - } + $oDB =& getDB(); + ini_set('memory_limit', '200M'); + + // Format for output + $sOutputFormat = 'xml'; + if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2')) + { + $sOutputFormat = $_GET['format']; + } // Show address breakdown $bShowAddressDetails = true;