merge: #20155: use fake HTTP method names so windows doesn't hang the tests.

3 files changed, 8 insertions, 2 deletions

diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index 493fade..15dec1c 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -125,7 +125,7 @@ class BaseHTTPServerTestCase(BaseTestCase):
 
     def test_request_line_trimming(self):
         self.con._http_vsn_str = 'HTTP/1.1\n'
-        self.con.putrequest('GET', '/')
+        self.con.putrequest('XYZBOGUS', '/')
         self.con.endheaders()
         res = self.con.getresponse()
         self.assertEqual(res.status, 501)
@@ -152,8 +152,9 @@ class BaseHTTPServerTestCase(BaseTestCase):
         self.assertEqual(res.status, 501)
 
     def test_version_none(self):
+        # Test that a valid method is rejected when not HTTP/1.x
         self.con._http_vsn_str = ''
-        self.con.putrequest('PUT', '/')
+        self.con.putrequest('CUSTOM', '/')
         self.con.endheaders()
         res = self.con.getresponse()
         self.assertEqual(res.status, 400)
diff --git a/Misc/ACKS b/Misc/ACKS
index 90e43f6..e9a473e 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -29,6 +29,7 @@ Yaniv Aknin
 Jyrki Alakuijala
 Steve Alexander
 Fred Allen
+Jeff Allen
 Ray Allen
 Billy G. Allie
 Kevin Altis
diff --git a/Misc/NEWS b/Misc/NEWS
index 428c803..3382cc6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -612,6 +612,10 @@ Documentation
 Tests
 -----
 
+- Issue #20155: Changed HTTP method names in failing tests in test_httpservers
+  so that packet filtering software (specifically Windows Base Filtering Engine)
+  does not interfere with the transaction semantics expected by the tests.
+
 - Issue #19493: Refactored the ctypes test package to skip tests explicitly
   rather than silently.