Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index ee6a6100c8a4da0e4c6addd6058b0c951f66ecf3..3f062f46bff8b870eaff8a4194cb0990dea89f24 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -6,18 +6,6 @@
        require_once(CONST_BasePath.'/lib/PlaceLookup.php');
        require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
 
        require_once(CONST_BasePath.'/lib/PlaceLookup.php');
        require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
 

-       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');
 
        $oDB =& getDB();
        ini_set('memory_limit', '200M');
 


@@ -60,6 +48,8 @@
                $aPlace = $oReverseGeocode->lookup();
        }
 
                $aPlace = $oReverseGeocode->lookup();
        }
 

+       logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
+

        if (CONST_Debug) exit;
 
        include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');
        if (CONST_Debug) exit;
 
        include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');