Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/init-website.php
	settings/settings.php

diff --cc lib/init-website.php
index ce046eaa6b752ef8d9bb41e4ef1e8025b5fc000a,bcf3ebf7a0aeb6674e874ebbf3ed7413572373dc..eb275af290e8b15b8aa791eddbd3bc72eb859613
--- 1/lib/init-website.php
--- 2/lib/init-website.php
+++ b/lib/init-website.php
@@@ -1,4 -1,64 +1,16 @@@
  <?php
-     require_once('init.php');
+       require_once('init.php');
+ 
+       if (CONST_NoAccessControl)
+       {
+               header("Access-Control-Allow-Origin: *");
+               header("Access-Control-Allow-Methods: OPTIONS,GET");
+               if (!empty($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']))
+               {
+                       header("Access-Control-Allow-Headers: ".$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']);
+               }
+       }
+       if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') exit;
+ 
 -      if (CONST_ClosedForIndexing && strpos(CONST_ClosedForIndexingExceptionIPs, ','.$_SERVER["REMOTE_ADDR"].',') === false)
 -      {
 -              echo "Closed for re-indexing...";
 -              exit;
 -      }
 -
 -      $aBucketKeys = array();
 -
 -      if (isset($_SERVER["HTTP_REFERER"])) $aBucketKeys[] = str_replace('www.','',strtolower(parse_url($_SERVER["HTTP_REFERER"], PHP_URL_HOST)));
 -      if (isset($_SERVER["REMOTE_ADDR"])) $aBucketKeys[] = $_SERVER["REMOTE_ADDR"];
 -      if (isset($_GET["email"])) $aBucketKeys[] = $_GET["email"];
 -
 -      $fBucketVal = doBucket($aBucketKeys, 
 -                      (defined('CONST_ConnectionBucket_PageType')?constant('CONST_ConnectionBucket_Cost_'.CONST_ConnectionBucket_PageType):1) + user_busy_cost(),
 -                      CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_BlockLimit);
 -
 -      if ($fBucketVal > CONST_ConnectionBucket_WaitLimit && $fBucketVal < CONST_ConnectionBucket_BlockLimit)
 -      {
 -              $m = getBucketMemcache();
 -              $iCurrentSleeping = $m->increment('sleepCounter');
 -              if (false === $iCurrentSleeping)
 -              {
 -                      $m->add('sleepCounter', 0);
 -                      $iCurrentSleeping = $m->increment('sleepCounter');
 -              }
 -              if ($iCurrentSleeping >= CONST_ConnectionBucket_MaxSleeping || isBucketSleeping($aBucketKeys))
 -              {
 -                      // Too many threads sleeping already.  This becomes a hard block.
 -                      $fBucketVal = doBucket($aBucketKeys, CONST_ConnectionBucket_BlockLimit, CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_BlockLimit);
 -              }
 -              else
 -              {
 -                      setBucketSleeping($aBucketKeys, true);
 -                      sleep(($fBucketVal - CONST_ConnectionBucket_WaitLimit)/CONST_ConnectionBucket_LeakRate);
 -                      $fBucketVal = doBucket($aBucketKeys, CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_BlockLimit);
 -                      setBucketSleeping($aBucketKeys, false);
 -              }
 -              $m->decrement('sleepCounter');
 -      }
 -
 -      if (strpos(CONST_BlockedIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false || $fBucketVal >= CONST_ConnectionBucket_BlockLimit)
 -      {
 -              echo "Your IP has been blocked. \n";
 -              echo "Please create a nominatim trac ticket (http://trac.openstreetmap.org/newticket?component=nominatim) to request this to be removed. \n";
 -              echo "Information on the Nominatim usage policy can be found here: http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy \n";
 -              exit;
 -      }
 -
 -      header('Content-type: text/html; charset=utf-8');
  
 +    header('Content-type: text/html; charset=utf-8');

diff --cc settings/settings.php
index 5cc368eca4d1b8f3768ad1fc42c45dac31dd17af,cd97b4a76fd7c9feda9ba19278df5c7880b394d6..5231692fa04a2b9a27d14ca010aad7bc59053814
--- 1/settings/settings.php
--- 2/settings/settings.php
+++ b/settings/settings.php
@@@ -37,14 -37,13 +37,15 @@@
        }
  
        // Website settings
 -      @define('CONST_ClosedForIndexing', false);
 -      @define('CONST_ClosedForIndexingExceptionIPs', '');
+       @define('CONST_NoAccessControl', true);
        @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');

diff --cc sql/partitions.src.sql
Simple merge

diff --cc website/reverse.php
Simple merge