valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

undocumenting the proxy settings [see #36] 

in response to https://git.tt-rss.org/git/tt-rss/pulls/36#issuecomment-119
This commit is contained in:
martin scharm 2018-01-18 08:48:53 +01:00
parent 213c01d459
commit 32dc9ec854
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.php-dist
View File

@ -196,9 +196,4 @@
// Expected config version. Please update this option in config.php // Expected config version. Please update this option in config.php
// if necessary (after migrating all new options from this file). // 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 // vim:ft=php

8
include/functions.php
View File

@ -402,8 +402,8 @@
curl_setopt($ch, CURLOPT_COOKIEJAR, "/dev/null"); curl_setopt($ch, CURLOPT_COOKIEJAR, "/dev/null");
} }
if (defined('PROXY')) { if (defined('_HTTP_PROXY')) {
curl_setopt($ch, CURLOPT_PROXY, PROXY); curl_setopt($ch, CURLOPT_PROXY, _HTTP_PROXY);
} }
if ($post_query) { if ($post_query) {
@ -495,9 +495,9 @@
$context_options['http']['header'] = "If-Modified-Since: $last_modified\r\n"; $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']['request_fulluri'] = true;
$context_options['http']['proxy'] = PROXY; $context_options['http']['proxy'] = _HTTP_PROXY;
} }
$context = stream_context_create($context_options); $context = stream_context_create($context_options);