From 790429e2869193be5fe9e3bf7bebbc10ea9f082d Mon Sep 17 00:00:00 2001 From: Djamil Legato Date: Thu, 20 Oct 2016 10:54:05 -0700 Subject: [PATCH] Only pass verify_peer settings to cURL and fopen if the setting is disabled --- CHANGELOG.md | 6 ++++++ system/src/Grav/Common/GPM/Response.php | 22 ++++++++++++---------- user/config/system.yaml | 2 ++ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3326bca53..82ecf3b72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.1.7 +## XX/XX/2016 + +1. [](#bugfix) + * Only pass verify_peer settings to cURL and fopen if the setting is disabled + # v1.1.6 ## 10/19/2016 diff --git a/system/src/Grav/Common/GPM/Response.php b/system/src/Grav/Common/GPM/Response.php index f167451fe..c553dc05f 100644 --- a/system/src/Grav/Common/GPM/Response.php +++ b/system/src/Grav/Common/GPM/Response.php @@ -121,17 +121,19 @@ class Response 'proxy_url' => $config->get('system.gpm.proxy_url', $config->get('system.proxy_url', false)), ]; - $overrides = array_replace_recursive([], $overrides, [ - 'curl' => [ - CURLOPT_SSL_VERIFYPEER => $settings['verify_peer'] - ], - 'fopen' => [ - 'ssl' => [ - 'verify_peer' => $settings['verify_peer'], - 'verify_peer_name' => $settings['verify_peer'], + if (!$settings['verify_peer']) { + $overrides = array_replace_recursive([], $overrides, [ + 'curl' => [ + CURLOPT_SSL_VERIFYPEER => $settings['verify_peer'] + ], + 'fopen' => [ + 'ssl' => [ + 'verify_peer' => $settings['verify_peer'], + 'verify_peer_name' => $settings['verify_peer'], + ] ] - ] - ]); + ]); + } // Proxy Setting if ($settings['proxy_url']) { diff --git a/user/config/system.yaml b/user/config/system.yaml index bbe2a3a3f..e51fc1122 100644 --- a/user/config/system.yaml +++ b/user/config/system.yaml @@ -40,3 +40,5 @@ debugger: twig: true shutdown: close_connection: true +gpm: + verify_peer: false