summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authormartin scharm <[email protected]>2018-01-18 08:48:53 +0100
committermartin scharm <[email protected]>2018-01-18 08:48:53 +0100
commit32dc9ec854f9c317266584ecb33127f469d4bd80 (patch)
tree18dc45c8cee92010ec620ebd8963bd8fab3d1db8 /include
parent213c01d459455d0c9062e228e5bc581c92fcda69 (diff)
undocumenting the proxy settings [see #36]
in response to https://git.tt-rss.org/git/tt-rss/pulls/36#issuecomment-119
Diffstat (limited to 'include')
-rw-r--r--include/functions.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/functions.php b/include/functions.php
index 2c6b51337..dfa78a8ac 100644
--- 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);