merge 3.3 (#18574)

diff --cc Lib/http/server.py
Simple merge

diff --cc Lib/test/test_httpservers.py
Simple merge

diff --cc Misc/ACKS
index e2f990e68ba6ccf7b6db211471ced9e36b631fa4,6dfbd49394824be67741f546b9078c551f777735..76cc888c424c49c94e2cc3c5709d5d78e39bae59
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -1050,8 -1003,8 +1050,9 @@@ Jérôme Radi
  Burton Radons
  Jeff Ramnani
  Brodie Rao
 +Senko Rasic
  Antti Rasinen
+ Nikolaus Rath
  Sridhar Ratnakumar
  Ysj Ray
  Eric S. Raymond

diff --cc Misc/NEWS
Simple merge