From: Senthil Kumaran <senthil@uthcode.com>
Date: Tue, 22 Jul 2014 07:16:18 +0000 (-0700)
Subject: Merge 3.4
X-Git-Tag: v3.5.0a1~1245^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=284a4a1bb0496f24e7c0243bbe9fcca7bfa6b2f0;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4

Fix localhost checking in FileHandler. Raised in #21970.
---

284a4a1bb0496f24e7c0243bbe9fcca7bfa6b2f0