From: Sarah Hoffmann Date: Wed, 6 May 2015 19:27:12 +0000 (+0200) Subject: set SQL statement timeout to php execution timeout X-Git-Tag: v.2.5.0~55 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/68596436b10edf588cca2356823dfdd11146e02d set SQL statement timeout to php execution timeout --- diff --git a/lib/db.php b/lib/db.php index b6dc89c4..d7c85e7b 100644 --- a/lib/db.php +++ b/lib/db.php @@ -14,6 +14,8 @@ $oDB->setFetchMode(DB_FETCHMODE_ASSOC); $oDB->query("SET DateStyle TO 'sql,european'"); $oDB->query("SET client_encoding TO 'utf-8'"); + $iMaxExecution = ini_get('max_execution_time') * 1000; + if ($iMaxExecution > 0) $oDB->query("SET statement_timeout TO $iMaxExecution"); return $oDB; }