Merge pull request #143 from bugsnag/security

bugsnag · Jul 18, 2016 · 59cf2da · 59cf2da
2 parents ef5e859 + e9c64a4
commit 59cf2da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/config/bugsnag.php b/config/bugsnag.php
@@ -99,7 +99,6 @@
     */
 
     'proxy' => array_filter([
-        'http' => env('HTTP_PROXY'),
         'https' => env('HTTPS_PROXY'),
         'no' => explode(',', str_replace(' ', '', env('NO_PROXY', ''))) ?: null,
     ]),

diff --git a/src/BugsnagServiceProvider.php b/src/BugsnagServiceProvider.php
@@ -70,6 +70,10 @@ public function register()
             $options = ['base_uri' => isset($config['endpoint']) ? $config['endpoint'] : Client::ENDPOINT];
 
             if (isset($config['proxy']) && $config['proxy']) {
+                if (isset($config['proxy']['http']) && php_sapi_name() != 'cli') {
+                    unset($config['proxy']['http']);
+                }
+
                 $options['proxy'] = $config['proxy'];
             }