merge 3.4 (#23801)

diff --cc Lib/cgi.py
Simple merge

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

diff --cc Misc/NEWS
index 64026173fb0c8ab9fa513e5bbff8263d561ba405,48d1801b0c1bacb65e1385d27a2627daaa52367a..333f6457ee3f07652d6ed5346d07c673a6983910
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -295,13 -124,14 +295,16 @@@ Librar
  
  - Issue #23361: Fix possible overflow in Windows subprocess creation code.
  
 -- Issue #23801: Fix issue where cgi.FieldStorage did not always ignore the
 -  entire preamble to a multipart body.
 +- logging.handlers.QueueListener now takes a respect_handler_level keyword
 +  argument which, if set to True, will pass messages to handlers taking handler
 +  levels into account.
  
 -Tests
 ------
 +- Issue #19705: turtledemo now has a visual sorting algorithm demo.  Original
 +  patch from Jason Yeo.
  
 -- Issue #23583: Added tests for standard IO streams in IDLE.
++- Issue #23801: Fix issue where cgi.FieldStorage did not always ignore the
++  entire preamble to a multipart body.
+ 
  Build
  -----