diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2025-03-08 11:49:05 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2025-03-08 11:49:05 +0100 |
| commit | d80171ebfdddad2b3b873400caf633d160e2fb12 (patch) | |
| tree | d0cec495c90ae53f634fe6452bf806bd02292e2d /app/views | |
| parent | fdc564dd9e85a2f3fbf6087611fd6c7f42fc2ea8 (diff) | |
Back-compatibility cURL 7.51 (#7409)
* Back-compatibility cURL 7.51
fix https://github.com/FreshRSS/FreshRSS/issues/7381
And add cURL version to system info.
Do not require a specific version of cURL for now, but maybe later.
* Fix CI
* make fix-all
* Add TODOs
* Add ssl_version
* Update app/i18n/it/index.php
Co-authored-by: UserRoot-Luca <55756898+UserRoot-Luca@users.noreply.github.com>
---------
Co-authored-by: UserRoot-Luca <55756898+UserRoot-Luca@users.noreply.github.com>
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/helpers/feed/update.phtml | 1 | ||||
| -rw-r--r-- | app/views/index/about.phtml | 8 | ||||
| -rw-r--r-- | app/views/subscription/add.phtml | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml index 54d3e77a0..41d879843 100644 --- a/app/views/helpers/feed/update.phtml +++ b/app/views/helpers/feed/update.phtml @@ -749,6 +749,7 @@ <label class="group-name" for="proxy_type"><?= _t('sub.feed.proxy') ?></label> <div class="group-controls"> <select name="proxy_type" id="proxy_type"><?php + defined('CURLPROXY_HTTPS') or define('CURLPROXY_HTTPS', 2); // Compatibility cURL 7.51 $type = $curlParams[CURLOPT_PROXYTYPE] ?? ''; if ($type === 3) { // Legacy for NONE $type = -1; diff --git a/app/views/index/about.phtml b/app/views/index/about.phtml index 70f9b6641..fc28608f7 100644 --- a/app/views/index/about.phtml +++ b/app/views/index/about.phtml @@ -26,6 +26,14 @@ <dd><?= htmlspecialchars(FRESHRSS_VERSION, ENT_NOQUOTES, 'UTF-8') ?></dd> <dt><?= _t('index.about.bug_reports.environment_information.version_php') ?></dt> <dd><?= htmlspecialchars(PHP_VERSION, ENT_NOQUOTES, 'UTF-8') ?></dd> + <dt><?= _t('index.about.bug_reports.environment_information.version_curl') ?></dt> + <?php + $curlVersion = curl_version() ?: []; + $curlVersionVersion = is_string($curlVersion['version'] ?? null) ? $curlVersion['version'] : ''; + $sslversion = is_string($curlVersion['ssl_version'] ?? null) ? $curlVersion['ssl_version'] : ''; + ?> + <dd><?= htmlspecialchars($curlVersionVersion, ENT_NOQUOTES, 'UTF-8') ?></dd> + <dd><?= htmlspecialchars($sslversion, ENT_NOQUOTES, 'UTF-8') ?></dd> <dt><?= _t('index.about.bug_reports.environment_information.database') ?></dt> <dd><?= htmlspecialchars(FreshRSS_Context::systemConf()->db['type'], ENT_NOQUOTES, 'UTF-8') ?></dd> <?php $databaseDAO = FreshRSS_Factory::createDatabaseDAO(); ?> diff --git a/app/views/subscription/add.phtml b/app/views/subscription/add.phtml index 50d3380a8..382fa5541 100644 --- a/app/views/subscription/add.phtml +++ b/app/views/subscription/add.phtml @@ -315,6 +315,7 @@ <label class="group-name" for="proxy_type"><?= _t('sub.feed.proxy') ?></label> <div class="group-controls"> <select class="number" name="proxy_type" id="proxy_type"><?php + defined('CURLPROXY_HTTPS') or define('CURLPROXY_HTTPS', 2); // Compatibility cURL 7.51 foreach (['' => '', -1 => 'NONE', CURLPROXY_HTTP => 'HTTP', CURLPROXY_HTTPS => 'HTTPS', CURLPROXY_SOCKS4 => 'SOCKS4', CURLPROXY_SOCKS4A => 'SOCKS4A', CURLPROXY_SOCKS5 => 'SOCKS5', CURLPROXY_SOCKS5_HOSTNAME => 'SOCKS5H'] as $k => $v) { |