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

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index 428c8032d4bf6f40c85e0cac4c3d290aca29766b,8598c3fddecdeba5d2869852c0b5409ad539eacf..3382cc66f75820485b256f6ed1eba05b0e2cf7ac
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -612,30 -494,6 +612,34 @@@ Documentatio
  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.
 +
 +- Issue #18492: All resources are now allowed when tests are not run by
 +  regrtest.py.
 +
 +- Issue #21634: Fix pystone micro-benchmark: use floor division instead of true
 +  division to benchmark integers instead of floating point numbers. Set pystone
 +  version to 1.2. Patch written by Lennart Regebro.
 +
 +- Issue #21605: Added tests for Tkinter images.
 +
 +- Issue #21493: Added test for ntpath.expanduser().  Original patch by
 +  Claudiu Popa.
 +
 +- Issue #19925: Added tests for the spwd module. Original patch by Vajrasky Kok.
 +
 +- Issue #21522: Added Tkinter tests for Listbox.itemconfigure(),
 +  PanedWindow.paneconfigure(), and Menu.entryconfigure().
 +
 +- Issue #17756: Fix test_code test when run from the installed location.
 +
 +- Issue #17752: Fix distutils tests when run from the installed location.
 +
  - Issue #18604: Consolidated checks for GUI availability.  All platforms now
    at least check whether Tk can be instantiated when the GUI resource is
    requested.