aboutsummaryrefslogtreecommitdiff
path: root/app/Models/Entry.php
diff options
context:
space:
mode:
authorGravatar Eris <36680203+printfuck@users.noreply.github.com> 2021-01-16 16:32:18 -0500
committerGravatar GitHub <noreply@github.com> 2021-01-16 22:32:18 +0100
commitee175dd6169a016fc898fac62d046e22c205dec0 (patch)
treec9b1f31f47dac1ec2d12f186e9df8831d5504eca /app/Models/Entry.php
parent5c18c64afbdc8b888fdedf2d7cc45e1930225f02 (diff)
CURLOPT parameters per feed (#3367)
* Working curlopt_params * Examples * curl_params for fetching the article * cleanup * clarification * Remove debugging * Options corrected * Removed Debugging * i18n not needed (right now) * Translations and UI rework * Checks in update.phtml * Unset Proxy&Cookies * remove clutter * minor fuckup * i18n added properly * resolve Errors * linting errors * linting errors, again * Review * Minor revert * Minor i18n: de Co-authored-by: maru <maru@nyx.im> Co-authored-by: Aeris <a3x@eris.cc> Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Diffstat (limited to 'app/Models/Entry.php')
-rw-r--r--app/Models/Entry.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index 2f43c19cd..784576455 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -376,7 +376,13 @@ class FreshRSS_Entry extends Minz_Model {
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_ENCODING => '', //Enable all encodings
]);
+
curl_setopt_array($ch, FreshRSS_Context::$system_conf->curl_options);
+
+ if (isset($attributes['curl_params']) && is_array($attributes['curl_params'])) {
+ curl_setopt_array($ch, $attributes['curl_params']);
+ }
+
if (isset($attributes['ssl_verify'])) {
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $attributes['ssl_verify'] ? 2 : 0);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, $attributes['ssl_verify'] ? true : false);