second argument of array_merge can be empty

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

diff --git a/lib/init-website.php b/lib/init-website.php
index 445bbc7ced2e5048f31766c78f6d0b40225c478f..a34e4c82787ae1dee4f77d5431a66376aeb077dc 100644 (file)
--- a/lib/init-website.php
+++ b/lib/init-website.php
@@ -1,8 +1,19 @@
 <?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)
        if (CONST_ClosedForIndexing && strpos(CONST_ClosedForIndexingExceptionIPs, ','.$_SERVER["REMOTE_ADDR"].',') === false)

-       {
+       {

                echo "Closed for re-indexing...";
                exit;
        }
                echo "Closed for re-indexing...";
                exit;
        }


@@ -26,25 +37,28 @@
                        $m->add('sleepCounter', 0);
                        $iCurrentSleeping = $m->increment('sleepCounter');
                }
                        $m->add('sleepCounter', 0);
                        $iCurrentSleeping = $m->increment('sleepCounter');
                }

-               if ($iCurrentSleeping >= CONST_ConnectionBucket_MaxSleeping)
+               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
                {
                {
                        // 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);
                        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)
        {
                }
                $m->decrement('sleepCounter');
        }
 
        if (strpos(CONST_BlockedIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false || $fBucketVal >= CONST_ConnectionBucket_BlockLimit)
        {

+               header("HTTP/1.0 429 Too Many Requests");

                echo "Your IP has been blocked. \n";
                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";
+               echo CONST_BlockMessage;

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

+