Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-31 05:51:21 +02:00
Code Issues Packages Projects Releases Activity

Better backwards compatibility

Browse Source
This commit is contained in:
Andy Miller
2021-10-01 11:42:41 -06:00
parent 75ef1341eb
commit 07bd1e03d0
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/blueprints/config/system.yaml
View File

@@ -1492,7 +1492,7 @@ form:
options:
1: PLUGIN_ADMIN.YES
0: PLUGIN_ADMIN.NO
default: true
default: false
validate:
type: bool

2
system/config/system.yaml
View File

@@ -188,7 +188,7 @@ gpm:
http:
method: auto # Either 'curl', 'fopen' or 'auto'. 'auto' will try fopen first and if not available cURL
enable_proxy: false # Enabled proxy server
enable_proxy: true # Enable proxy server configuration
proxy_url: # Configure a manual proxy URL for GPM (eg 127.0.0.1:3128)
proxy_cert_path: # Local path to proxy certificate folder containing pem files
concurrent_connections: 5 # Concurrent HTTP connections when multiplexing

23
system/src/Grav/Common/HTTP/Client.php
View File

@@ -37,7 +37,11 @@ class Client
}
$settings = array_merge($options->toArray(), $overrides);
$preferred_method = $config->get('system.http.method', $config->get('system.gpm.method', 'auto'));
$preferred_method = $config->get('system.http.method');
// Try old GPM setting if value is the same as system default
if ($preferred_method === 'auto') {
$preferred_method = $config->get('system.gpm.method', 'auto');
}
switch ($preferred_method) {
case 'curl':
@@ -70,17 +74,18 @@ class Client
$options->setHeaders(array_merge([ 'Referer' => $referer ], self::$headers));
// Disable verify Peer if required
$verify_peer = $config->get('system.http.verify_peer', $config->get('system.gpm.verify_peer', null));
if ($verify_peer !== null) {
$options->verifyPeer($verify_peer);
$verify_peer = $config->get('system.http.verify_peer');
// Try old GPM setting if value is default
if ($verify_peer === true) {
$verify_peer = $config->get('system.gpm.verify_peer', null) ?? $verify_peer;
}
$options->verifyPeer($verify_peer);
// Disable verify Host if required
$verify_host = $config->get('system.http.verify_host', null);
if ($verify_host !== null) {
$options->verifyHost($verify_host);
}
// Set verify Host
$verify_host = $config->get('system.http.verify_host', true);
$options->verifyHost($verify_host);
// New setting and must be enabled for Proxy to work
if ($config->get('system.http.enable_proxy', true)) {
// Set proxy url if provided
$proxy_url = $config->get('system.http.proxy_url', $config->get('system.gpm.proxy_url', null));