From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 15 Jun 2014 01:41:31 +0000 (-0700)
Subject: merge 3.4 (#21766)
X-Git-Tag: v3.5.0a1~1443^2~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff180af0572ce64ea7b4bb99957cf0c216adce36;p=python

merge 3.4 (#21766)
---

ff180af0572ce64ea7b4bb99957cf0c216adce36
diff --cc Misc/NEWS
index 76502f3943,66d9132c7b..dbd16e55ca
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -106,11 -26,11 +106,14 @@@ Librar
    run_forever() and run_until_complete() methods of asyncio.BaseEventLoop now
    raise an exception if the event loop was closed.
  
+ - Issue #21766: Prevent a security hole in CGIHTTPServer by URL unquoting paths
+   before checking for a CGI script at that path.
+ 
  - Issue #21310: Fixed possible resource leak in failed open().
  
 +- Issue #21256: Printout of keyword args should be in deterministic order in
 +  a mock function call. This will help to write better doctests.
 +
  - Issue #21677: Fixed chaining nonnormalized exceptions in io close() methods.
  
  - Issue #11709: Fix the pydoc.help function to not fail when sys.stdin is not a