Issue #26657: Merge http.server fix from 3.5

author Martin Panter <vadmium+py@gmail.com>

Mon, 18 Apr 2016 07:16:17 +0000 (07:16 +0000)

committer Martin Panter <vadmium+py@gmail.com>

Mon, 18 Apr 2016 07:16:17 +0000 (07:16 +0000)
author Martin Panter <vadmium+py@gmail.com>
Mon, 18 Apr 2016 07:16:17 +0000 (07:16 +0000)
committer Martin Panter <vadmium+py@gmail.com>
Mon, 18 Apr 2016 07:16:17 +0000 (07:16 +0000)
diff --cc Lib/http/server.py
Simple merge
diff --cc Lib/test/test_httpservers.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Martin Panter <vadmium+py@gmail.com>
	Mon, 18 Apr 2016 07:16:17 +0000 (07:16 +0000)
committer	Martin Panter <vadmium+py@gmail.com>
	Mon, 18 Apr 2016 07:16:17 +0000 (07:16 +0000)
		1	2
Lib/http/server.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_httpservers.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history