diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-07-12 13:03:32 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-07-12 13:03:32 +0200 |
| commit | 4cd9b938800f7b6a7d84615d2ce494c869d9c0d7 (patch) | |
| tree | 487517c80e2d9db667a6e672ce38583da629d7ba /data | |
| parent | 4f7493be7bb81abe114acc9a5782a0777aeaa032 (diff) | |
| parent | 26ed0e5c9571dfdaac22f147bda793cc25c9e661 (diff) | |
Merge remote-tracking branch 'origin/curlOptions' into dev
Diffstat (limited to 'data')
| -rw-r--r-- | data/config.default.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/config.default.php b/data/config.default.php index 6a8300872..9a3ec87d7 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -87,10 +87,10 @@ return array( //CURLOPT_SSL_VERIFYPEER => false, # Options to use a proxy for retrieving feeds. - //CURLOPT_PROXYTYPE = CURLPROXY_HTTP, - //CURLOPT_PROXYAUTH = CURLAUTH_BASIC, + //CURLOPT_PROXYTYPE => CURLPROXY_HTTP, //CURLOPT_PROXY => '127.0.0.1', //CURLOPT_PROXYPORT => 8080, + //CURLOPT_PROXYAUTH => CURLAUTH_BASIC, //CURLOPT_PROXYUSERPWD => 'user:password', ), |