check correct variable for SQL error

[nominatim.git] / lib / init-website.php

diff --git a/lib/init-website.php b/lib/init-website.php
index 40e4713e21c1c6261fd12910d239c880d522a402..6db83988551f4d2fd6fba8ac745befa3f9043388 100644 (file)
--- a/lib/init-website.php
+++ b/lib/init-website.php
@@ -1,6 +1,17 @@
 <?php
        require_once('init.php');
 
 <?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...";
        if (CONST_ClosedForIndexing && strpos(CONST_ClosedForIndexingExceptionIPs, ','.$_SERVER["REMOTE_ADDR"].',') === false)
        {
                echo "Closed for re-indexing...";


@@ -17,17 +28,37 @@
                        (defined('CONST_ConnectionBucket_PageType')?constant('CONST_ConnectionBucket_Cost_'.CONST_ConnectionBucket_PageType):1) + user_busy_cost(),
                        CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_BlockLimit);
 
                        (defined('CONST_ConnectionBucket_PageType')?constant('CONST_ConnectionBucket_Cost_'.CONST_ConnectionBucket_PageType):1) + user_busy_cost(),
                        CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_BlockLimit);
 

-       if (strpos(CONST_BlockedIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false || $fBucketVal >= CONST_ConnectionBucket_BlockLimit)
+       if ($fBucketVal > CONST_ConnectionBucket_WaitLimit && $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;
+               $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 ($fBucketVal > CONST_ConnectionBucket_WaitLimit)
+       if (strpos(CONST_BlockedIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false || $fBucketVal >= CONST_ConnectionBucket_BlockLimit)

        {
        {

-               sleep(($fBucketVal - CONST_ConnectionBucket_WaitLimit)/CONST_ConnectionBucket_LeakRate);
+               header("HTTP/1.0 429 Too Many Requests");
+               echo "Your IP has been blocked. \n";
+               echo CONST_BlockMessage;
+               exit;

        }
 
        header('Content-type: text/html; charset=utf-8');
        }
 
        header('Content-type: text/html; charset=utf-8');

+