diff options
| author | Heiko Adams <[email protected]> | 2015-11-30 10:29:44 +0100 |
|---|---|---|
| committer | Heiko Adams <[email protected]> | 2015-11-30 10:29:44 +0100 |
| commit | 05761788b7b5a8a7e6c14333669acd0793886223 (patch) | |
| tree | 464ccc3d98900e5dcf1a437662056161fa1280a4 /plugins/af_readability | |
| parent | 635ecdb9fa039adb8a0e8ead045bfda023e72bc4 (diff) | |
| parent | 6f5d9c6889b6376527d7598857ac8816cf7980ab (diff) | |
Merge remote-tracking branch 'origin/master' into german-translation
Diffstat (limited to 'plugins/af_readability')
| -rwxr-xr-x[-rw-r--r--] | plugins/af_readability/init.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php index 8914ba43a..675e5c5d5 100644..100755 --- a/plugins/af_readability/init.php +++ b/plugins/af_readability/init.php @@ -100,14 +100,15 @@ class Af_Readability extends Plugin { if (!class_exists("Readability")) require_once(dirname(dirname(__DIR__)). "/lib/readability/Readability.php"); - if (function_exists("curl_init")) { + if (!defined('NO_CURL') && function_exists('curl_init') && !ini_get("open_basedir")) { + $ch = curl_init($article["link"]); + curl_setopt($ch, CURLOPT_TIMEOUT, 5); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_HEADER, true); curl_setopt($ch, CURLOPT_NOBODY, true); - curl_setopt($ch, CURLOPT_FOLLOWLOCATION, - !ini_get("safe_mode") && !ini_get("open_basedir")); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT); @$result = curl_exec($ch); @@ -119,7 +120,7 @@ class Af_Readability extends Plugin { $tmp = fetch_file_contents($article["link"]); - if ($tmp) { + if ($tmp && mb_strlen($tmp) < 65535 * 4) { $tmpdoc = new DOMDocument("1.0", "UTF-8"); if (!$tmpdoc->loadHTML($tmp)) |