make HTTP proxy setup explicit

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

diff --git a/lib/init-cmd.php b/lib/init-cmd.php
index e0fd3d40d44af3323650b8517c8f09f830a395cc..b7645cd553ff9e68b69d259116f7bac63473fcf1 100644 (file)
--- a/lib/init-cmd.php
+++ b/lib/init-cmd.php
@@ -2,26 +2,4 @@
 
 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);
-}
+require_once('DebugNone.php');