X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/02e7cfd6f483a6274417e5284ba547eda7ef3007..e891aa304193e274992d96a8bef01fd3f7ebe7e2:/lib/init-website.php

diff --git a/lib/init-website.php b/lib/init-website.php
index 8f04d97d..bcf3ebf7 100644
--- a/lib/init-website.php
+++ b/lib/init-website.php
@@ -1,6 +1,17 @@
 <?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...";
@@ -19,8 +30,26 @@
 
 	if ($fBucketVal > CONST_ConnectionBucket_WaitLimit && $fBucketVal < CONST_ConnectionBucket_BlockLimit)
 	{
-		sleep(($fBucketVal - CONST_ConnectionBucket_WaitLimit)/CONST_ConnectionBucket_LeakRate);
-		$fBucketVal = doBucket($aBucketKeys, 0, 0, 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)
@@ -32,3 +61,4 @@
 	}
 
 	header('Content-type: text/html; charset=utf-8');
+