Merge remote-tracking branch 'upstream/master'

diff --combined utils/update.php
index cefccd623305e1693b7b6a1a6e12274c6370190c,189a18255090732a4d62f08f9436caa8447b99da..dd0dc6d03e45facd5341a4563053324c731eba30
--- 1/utils/update.php
--- 2/utils/update.php
+++ b/utils/update.php
@@@ -49,13 -49,13 +49,14 @@@ $aCMDOption
  getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
  
  if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
 +
  if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
  
  date_default_timezone_set('Etc/UTC');
  
  $oDB = new Nominatim\DB();
  $oDB->connect();
+ $fPostgresVersion = $oDB->getPostgresVersion();
  
  $aDSNInfo = Nominatim\DB::parseDSN(CONST_Database_DSN);
  if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
@@@ -91,6 -91,12 +92,12 @@@ if (isset($aDSNInfo['password']) && $aD
  if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
      $oOsm2pgsqlCmd->addParams('--flat-nodes', CONST_Osm2pgsql_Flatnode_File);
  }
+ if ($fPostgresVersion >= 11.0) {
+     $oOsm2pgsqlCmd->addEnvPair(
+         'PGOPTIONS',
+         '-c jit=off -c max_parallel_workers_per_gather=0'
+     );
+ }
  
  
  $oIndexCmd = (new \Nominatim\Shell(CONST_BasePath.'/nominatim/nominatim.py'))