Merge remote-tracking branch 'upstream/master' into cmake-port

[nominatim.git] / lib / init-cmd.php

diff --git a/lib/init-cmd.php b/lib/init-cmd.php
index e6de0522146fe381770662f78fad11542442ac7b..274256a642e96bd58339dec1f50de75d9ae1e636 100644 (file)
--- a/lib/init-cmd.php
+++ b/lib/init-cmd.php
@@ -1,8 +1,26 @@
 <?php
 <?php

-       if (file_exists(getenv('NOMINATIM_SETTINGS')))
-       {
-               require_once(getenv('NOMINATIM_SETTINGS'));
-       }
-

        require_once('init.php');
        require_once('cmd.php');
        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);
+       }