diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-07-12 15:53:40 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-07-12 15:53:40 +0200 |
| commit | 2c6bc849e09644f62b791ffe4779bfdcc34e5a80 (patch) | |
| tree | 044c74862400db6c44252f894c5f4cc67b9f6fa2 /lib | |
| parent | da51fd97881792acb328e6e2338f53434e2e97cb (diff) | |
| parent | 26ed0e5c9571dfdaac22f147bda793cc25c9e661 (diff) | |
Merge branch 'curlOptions' of https://github.com/Alkarex/FreshRSS into Alkarex-curlOptions
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/SimplePie/SimplePie/File.php | 1 | ||||
| -rw-r--r-- | lib/lib_rss.php | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/SimplePie/SimplePie/File.php b/lib/SimplePie/SimplePie/File.php index 643648ddb..45994d102 100644 --- a/lib/SimplePie/SimplePie/File.php +++ b/lib/SimplePie/SimplePie/File.php @@ -113,7 +113,6 @@ class SimplePie_File curl_setopt($fp, CURLOPT_REFERER, $url); curl_setopt($fp, CURLOPT_USERAGENT, $useragent); curl_setopt($fp, CURLOPT_HTTPHEADER, $headers2); - curl_setopt($fp, CURLOPT_SSL_VERIFYPEER, false); //FreshRSS if (!ini_get('open_basedir') && !ini_get('safe_mode') && version_compare(SimplePie_Misc::get_curl_version(), '7.15.2', '>=')) { curl_setopt($fp, CURLOPT_FOLLOWLOCATION, 1); diff --git a/lib/lib_rss.php b/lib/lib_rss.php index c51b4e6de..0118e0f46 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -143,6 +143,7 @@ function customSimplePie() { $simplePie->set_cache_location(CACHE_PATH); $simplePie->set_cache_duration($limits['cache_duration']); $simplePie->set_timeout($limits['timeout']); + $simplePie->set_curl_options($system_conf->curl_options); $simplePie->strip_htmltags(array( 'base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', |