Merge branch 'pr1142' into stable

* pr1142: (GH-1141) Fix: Constant Proxy Null Reference Error
chocolatey · Feb 17, 2017 · 9897403 · 9897403
2 parents c873be5 + eb39536
commit 9897403
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/chocolatey.resources/helpers/functions/Get-WebFile.ps1 b/src/chocolatey.resources/helpers/functions/Get-WebFile.ps1
@@ -133,7 +133,7 @@ param(
 	Write-Host "Using explicit proxy server '$explicitProxy'."
     $req.Proxy = $proxy
 
-  } elseif (!$webclient.Proxy.IsBypassed($url))
+  } elseif ($webclient.Proxy -and !$webclient.Proxy.IsBypassed($url))
   {
 	# system proxy (pass through)
     $creds = [net.CredentialCache]::DefaultCredentials

diff --git a/src/chocolatey.resources/helpers/functions/Get-WebFileName.ps1 b/src/chocolatey.resources/helpers/functions/Get-WebFileName.ps1
@@ -130,7 +130,7 @@ param(
     Write-Debug "Using explicit proxy server '$explicitProxy'."
     $request.Proxy = $proxy
 
-  } elseif (!$client.Proxy.IsBypassed($url))
+  } elseif ($client.Proxy -and !$client.Proxy.IsBypassed($url))
   {
     # system proxy (pass through)
     $creds = [Net.CredentialCache]::DefaultCredentials

diff --git a/src/chocolatey.resources/helpers/functions/Get-WebHeaders.ps1 b/src/chocolatey.resources/helpers/functions/Get-WebHeaders.ps1
@@ -87,7 +87,7 @@ param(
     Write-Host "Using explicit proxy server '$explicitProxy'."
     $request.Proxy = $proxy
 
-  } elseif (!$client.Proxy.IsBypassed($url))
+  } elseif ($client.Proxy -and !$client.Proxy.IsBypassed($url))
   {
     # system proxy (pass through)
     $creds = [Net.CredentialCache]::DefaultCredentials