X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/29dfc0c259f55430229afea599913eeae47f9a30..1d4dcd914fd277aebf242037064612224f4dde54:/lib/init-cmd.php?ds=sidebyside

diff --git a/lib/init-cmd.php b/lib/init-cmd.php
index c36f0e57..274256a6 100644
--- a/lib/init-cmd.php
+++ b/lib/init-cmd.php
@@ -1,9 +1,26 @@
 <?php
-	if (file_exists(getenv('NOMINATIM_SETTINGS')))
-	{
-		echo 'Using local config: '.getenv('NOMINATIM_SETTINGS');
-		require_once(getenv('NOMINATIM_SETTINGS'));
-	}
-
 	require_once('init.php');
 	require_once('cmd.php');
+
+	// handle http proxy when using file_get_contents
+	if (CONST_HTTP_Proxy) {
+	  $proxy = 'tcp://' . CONST_HTTP_Proxy_Host . ':' . CONST_HTTP_Proxy_Port;
+	  $aHeaders = array();
+	  if(CONST_HTTP_Proxy_Login != null && CONST_HTTP_Proxy_Login != '' && CONST_HTTP_Proxy_Password != null && CONST_HTTP_Proxy_Password != '') {
+	    $auth = base64_encode(CONST_HTTP_Proxy_Login . ':' . CONST_HTTP_Proxy_Password);
+	    $aHeaders = array("Proxy-Authorization: Basic $auth");
+	  }
+	  $aContext = array(
+	    'http' => array(
+	      'proxy' => $proxy,
+	      'request_fulluri' => true,
+	      'header' => $aHeaders
+	    ),
+	    'https' => array(
+	      'proxy' => $proxy,
+	      'request_fulluri' => true,
+	      'header' => $aHeaders
+	    )
+	  );
+	  stream_context_set_default($aContext);
+	}