public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-01-06 16:39:14 +00:00
Code Issues Releases Wiki Activity

undocumenting the proxy settings [see #36]

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
include/functions.php
View File

@@ -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);