From cef6296735a0baebcd2f25d967c7bdb770ed6b08 Mon Sep 17 00:00:00 2001
From: Jordan Borean <jborean93@gmail.com>
Date: Thu, 2 Apr 2020 07:17:50 +1000
Subject: [PATCH] WebRequest - Fix use_proxy: no on module options (#68603)

* WebRequest - Fix use_proxy: no on module options

* Fix up changelog fragment

(cherry picked from commit ae1cd27b575a759e9d2477042fc5dbbb3275cd84)
---
 changelogs/fragments/win-web-request-no_proxy.yaml            | 2 ++
 .../powershell/Ansible.ModuleUtils.WebRequest.psm1            | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/fragments/win-web-request-no_proxy.yaml

diff --git a/changelogs/fragments/win-web-request-no_proxy.yaml b/changelogs/fragments/win-web-request-no_proxy.yaml
new file mode 100644
index 00000000000..ddec454de41
--- /dev/null
+++ b/changelogs/fragments/win-web-request-no_proxy.yaml
@@ -0,0 +1,2 @@
+bugfixes:
+- 'Ansible.ModuleUtils.WebRequest - actually set no proxy when ``use_proxy: no`` is set on a Windows module - https://github.com/ansible/ansible/issues/68528'
diff --git a/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.WebRequest.psm1 b/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.WebRequest.psm1
index 6e22824510c..68e572cf50f 100644
--- a/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.WebRequest.psm1
+++ b/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.WebRequest.psm1
@@ -272,10 +272,10 @@ Function Get-AnsibleWebRequest {
         } else {
             $proxy.Credentials = $null
         }
-
-        $web_request.Proxy = $proxy
     }
 
+    $web_request.Proxy = $proxy
+
     # Some parameters only apply when dealing with a HttpWebRequest
     if ($web_request -is [System.Net.HttpWebRequest]) {
         if ($Headers) {