Merge 3.4 (httplib)

This commit is contained in:
Victor Stinner 2015-02-27 17:47:40 +01:00
commit 69899e6f3f
2 changed files with 4 additions and 0 deletions

View file

@ -1113,6 +1113,7 @@ def test_networked_noverification(self):
context=context)
h.request('GET', '/')
resp = h.getresponse()
h.close()
self.assertIn('nginx', resp.getheader('server'))
@support.system_must_validate_cert
@ -1124,6 +1125,7 @@ def test_networked_trusted_by_default_cert(self):
h.request('GET', '/')
resp = h.getresponse()
content_type = resp.getheader('content-type')
h.close()
self.assertIn('text/html', content_type)
def test_networked_good_cert(self):
@ -1138,6 +1140,7 @@ def test_networked_good_cert(self):
h.request('GET', '/')
resp = h.getresponse()
server_string = resp.getheader('server')
h.close()
self.assertIn('nginx', server_string)
def test_networked_bad_cert(self):

View file

@ -1270,6 +1270,7 @@ Alexander Shigin
Pete Shinners
Michael Shiplett
John W. Shipman
Alex Shkop
Joel Shprentz
Yue Shuaijie
Terrel Shumway