From 0a27cd413e23463bfec7212712ae4c1a0154f862 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Mon, 30 Nov 2020 11:14:32 +0000
Subject: [PATCH] Issue #3181084 by alexpott, anushrikumari: Remove commented
 out httpoxy rule from web.config

---
 core/assets/scaffold/files/web.config | 12 ------------
 core/misc/cspell/dictionary.txt       |  1 -
 web.config                            | 12 ------------
 3 files changed, 25 deletions(-)

diff --git a/core/assets/scaffold/files/web.config b/core/assets/scaffold/files/web.config
index 8dff0b27e24..79a0433c9d9 100644
--- a/core/assets/scaffold/files/web.config
+++ b/core/assets/scaffold/files/web.config
@@ -33,18 +33,6 @@
             <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
           </conditions>
         </rule>
-     <!-- If running on a PHP version affected by httpoxy vulnerability
-      uncomment the following rule to mitigate it's impact. To make this
-      rule work, you will also need to add HTTP_PROXY to the allowed server
-      variables manually in IIS. See https://www.drupal.org/node/2783079.
-        <rule name="Erase HTTP_PROXY" patternSyntax="Wildcard">
-          <match url="*.*" />
-          <serverVariables>
-            <set name="HTTP_PROXY" value="" />
-          </serverVariables>
-          <action type="None" />
-        </rule>
-    -->
     <!-- To redirect all users to access the site WITH the 'www.' prefix,
      http://example.com/foo will be redirected to http://www.example.com/foo)
      adapt and uncomment the following:   -->
diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt
index d492ebe27af..55448eebd30 100644
--- a/core/misc/cspell/dictionary.txt
+++ b/core/misc/cspell/dictionary.txt
@@ -731,7 +731,6 @@ httpd
 httpheader
 httpkernel
 httponly
-httpoxy
 huhuu
 hurlant
 hustlin
diff --git a/web.config b/web.config
index 8dff0b27e24..79a0433c9d9 100644
--- a/web.config
+++ b/web.config
@@ -33,18 +33,6 @@
             <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
           </conditions>
         </rule>
-     <!-- If running on a PHP version affected by httpoxy vulnerability
-      uncomment the following rule to mitigate it's impact. To make this
-      rule work, you will also need to add HTTP_PROXY to the allowed server
-      variables manually in IIS. See https://www.drupal.org/node/2783079.
-        <rule name="Erase HTTP_PROXY" patternSyntax="Wildcard">
-          <match url="*.*" />
-          <serverVariables>
-            <set name="HTTP_PROXY" value="" />
-          </serverVariables>
-          <action type="None" />
-        </rule>
-    -->
     <!-- To redirect all users to access the site WITH the 'www.' prefix,
      http://example.com/foo will be redirected to http://www.example.com/foo)
      adapt and uncomment the following:   -->