summaryrefslogtreecommitdiff
path: root/config.php-dist
diff options
context:
space:
mode:
authormartin scharm <[email protected]>2018-01-14 00:30:22 +0100
committermartin scharm <[email protected]>2018-01-14 00:30:22 +0100
commitea55f2e11c162db8edeac1a39f861d5ad2381a60 (patch)
treef7e843b4fe7a49f6b5f4bf03ef3b68a71fb15e8f /config.php-dist
parentc30f5e18119d1935e8fe6d422053b127e8f4f1b3 (diff)
Add proper support for proxies
There are situations where you want tt-rss to use a proxy (e.g. because of network restrictions, or privacy concerns). tt-rss already comes with an undocumented `_CURL_HTTP_PROXY` variable (see eg https://binfalse.de/2015/05/06/ttrss-with-proxy/), however that won't have an effect when, for example, php-curl is not installed, see https://git.tt-rss.org/git/tt-rss/src/c30f5e18119d1935e8fe6d422053b127e8f4f1b3/include/functions.php#L377 In this case it would use the `file_get_contents` with a stream context without a proxy definition: https://git.tt-rss.org/git/tt-rss/src/c30f5e18119d1935e8fe6d422053b127e8f4f1b3/include/functions.php#L487 Here I propose to properly support proxies, and I introduced a `PROXY` variable, that is respected in both scenarios, with and without curl installed.
Diffstat (limited to 'config.php-dist')
-rw-r--r--config.php-dist5
1 files changed, 5 insertions, 0 deletions
diff --git a/config.php-dist b/config.php-dist
index 7a076d976..f9cc181af 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -196,4 +196,9 @@
// 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