From c4f71c9ddab5d3066948d2b16ba2047ef51cb89c Mon Sep 17 00:00:00 2001 From: Djamil Legato Date: Thu, 22 Sep 2016 17:59:52 -0700 Subject: [PATCH] Fixed verify peer default value and issue with fopen --- system/src/Grav/Common/GPM/Response.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/system/src/Grav/Common/GPM/Response.php b/system/src/Grav/Common/GPM/Response.php index bcbba94fab..87f2cfc84a 100644 --- a/system/src/Grav/Common/GPM/Response.php +++ b/system/src/Grav/Common/GPM/Response.php @@ -114,7 +114,7 @@ public static function get($uri = '', $options = [], $callback = null) // SSL Verify Peer and Proxy Setting $settings = [ 'method' => $config->get('system.gpm.method', self::$method), - 'verify_peer' => $config->get('system.gpm.verify_peer', true), + 'verify_peer' => $config->get('system.gpm.verify_peer'), // `system.proxy_url` is for fallback // introduced with 1.1.0-beta.1 probably safe to remove at some point 'proxy_url' => $config->get('system.gpm.proxy_url', $config->get('system.proxy_url', false)), @@ -261,7 +261,14 @@ private static function getFopen() $options['fopen']['notification'] = ['self', 'progress']; } - $stream = stream_context_create(['http' => $options['fopen']], $options['fopen']); + $ssl = $options['fopen']['ssl']; + unset($options['fopen']['ssl']); + + $stream = stream_context_create([ + 'http' => $options['fopen'], + 'ssl' => $ssl + ], $options['fopen']); + $content = @file_get_contents($uri, false, $stream); if ($content === false) {