undocumenting the proxy settings [see #36]

in response to https://git.tt-rss.org/git/tt-rss/pulls/36#issuecomment-119

diff --git a/config.php-dist b/config.php-dist
index f9cc181af4287d5ad9cc642b626c61cc1a5b164f..7a076d97693c3b8d125b42536b61d335ffe90bf5 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -196,9 +196,4 @@
        // Expected config version. Please update this option in config.php
        // if necessary (after migrating all new options from this file).
 
-       define('PROXY', '');
-       // Connect to RSS feeds through a PROXY, this way tt-rss won't connect to
-       // webservers directly.
-       // Example format: '127.0.0.1:8123' (polipo proxy running on localhost)
-
        // vim:ft=php

diff --git a/include/functions.php b/include/functions.php
index 2c6b51337b962a17d664eedd28118a5e98b0ff3a..dfa78a8ace9c6ad599c79a48e0506ffdbe63e11c 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -402,8 +402,8 @@
                                curl_setopt($ch, CURLOPT_COOKIEJAR, "/dev/null");
                        }
 
-                       if (defined('PROXY')) {
-                               curl_setopt($ch, CURLOPT_PROXY, PROXY);
+                       if (defined('_HTTP_PROXY')) {
+                               curl_setopt($ch, CURLOPT_PROXY, _HTTP_PROXY);
                        }
 
                        if ($post_query) {
@@ -495,9 +495,9 @@
                 $context_options['http']['header'] = "If-Modified-Since: $last_modified\r\n";
                        }
 
-                       if (defined('PROXY')) {
+                       if (defined('_HTTP_PROXY')) {
                                $context_options['http']['request_fulluri'] = true;
-                               $context_options['http']['proxy'] = PROXY;
+                               $context_options['http']['proxy'] = _HTTP_PROXY;
                        }
 
             $context = stream_context_create($context_options);