X-Git-Url: https://git.rapsys.eu/packbundle/blobdiff_plain/884434e58dda34f2c3f780999c74f8d6a11569d5..refs/heads/master:/Controller/MapController.php?ds=sidebyside diff --git a/Controller/MapController.php b/Controller/MapController.php index 869d5ab..8d38aa6 100644 --- a/Controller/MapController.php +++ b/Controller/MapController.php @@ -11,22 +11,22 @@ namespace Rapsys\PackBundle\Controller; +use Rapsys\PackBundle\Util\MapUtil; +use Rapsys\PackBundle\Util\SluggerUtil; + use Psr\Container\ContainerInterface; -use Symfony\Component\HttpFoundation\HeaderUtils; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\Filesystem\Exception\IOExceptionInterface; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\HttpFoundation\BinaryFileResponse; +use Symfony\Component\HttpFoundation\HeaderUtils; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Routing\RequestContext; use Symfony\Contracts\Service\ServiceSubscriberInterface; -use Rapsys\PackBundle\Util\MapUtil; -use Rapsys\PackBundle\Util\SluggerUtil; - /** * {@inheritdoc} */ @@ -54,7 +54,7 @@ class MapController extends AbstractController implements ServiceSubscriberInter 'http' => [ #'header' => ['Referer: https://www.openstreetmap.org/'], 'max_redirects' => $_ENV['RAPSYSPACK_REDIRECT'] ?? 20, - 'timeout' => $_ENV['RAPSYSPACK_TIMEOUT'] ?? (int)ini_get('default_socket_timeout') ?: 60, + 'timeout' => $_ENV['RAPSYSPACK_TIMEOUT'] ?? (($timeout = ini_get('default_socket_timeout')) !== false && $timeout !== "" ? (float)$timeout : 60), 'user_agent' => $_ENV['RAPSYSPACK_AGENT'] ?? (($agent = ini_get('user_agent')) !== false && $agent !== "" ? (string)$agent : RapsysPackBundle::getAlias().'/'.RapsysPackBundle::getVersion()) ] ]