NotificationsYou must be signed in to change notification settings
Fork34.1k
Star71.6k

Commit2a60f7b

committed

add method get_proxy_response_headers

1 parentde7f694 commit2a60f7bCopy full SHA for 2a60f7b

File tree

2 files changed

+19

-9

lines changed

Lib
- http
  - client.py
- test
  - test_httplib.py

2 files changed

+19

-9

lines changed

`‎Lib/http/client.py‎`

Lines changed: 18 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -221,8 +221,8 @@ def _read_headers(fp):`
`221`	`221`	`break`
`222`	`222`	`returnheaders`
`223`	`223`
`224`		`-defparse_headers(fp,_class=HTTPMessage):`
`225`		`-"""Parses only RFC2822 headers froma file pointer.`
	`224`	`+def_parse_header_lines(header_lines,_class=HTTPMessage):`
	`225`	`+"""Parses only RFC2822 headers fromheader lines.`
`226`	`226`
`227`	`227`	`email Parser wants to see strings rather than bytes.`
`228`	`228`	`But a TextIOWrapper around self.rfile would buffer too many bytes`
`@@ -231,10 +231,13 @@ def parse_headers(fp, _class=HTTPMessage):`
`231`	`231`	`to parse.`
`232`	`232`
`233`	`233`	`"""`
`234`		`-headers=_read_headers(fp)`
`235`		`-hstring=b''.join(headers).decode('iso-8859-1')`
	`234`	`+hstring=b''.join(header_lines).decode('iso-8859-1')`
`236`	`235`	`returnemail.parser.Parser(_class=_class).parsestr(hstring)`
`237`	`236`
	`237`	`+defparse_headers(fp,_class=HTTPMessage):`
	`238`	`+headers=_read_headers(fp)`
	`239`	`+return_parse_header_lines(headers,_class)`
	`240`	`+`
`238`	`241`
`239`	`242`	`classHTTPResponse(io.BufferedIOBase):`
`240`	`243`
`@@ -858,7 +861,7 @@ def __init__(self, host, port=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,`
`858`	`861`	`self._tunnel_host=None`
`859`	`862`	`self._tunnel_port=None`
`860`	`863`	`self._tunnel_headers= {}`
`861`		`-self._proxy_response_headers=None`
	`864`	`+self._raw_proxy_headers=None`
`862`	`865`
`863`	`866`	`(self.host,self.port)=self._get_hostport(host,port)`
`864`	`867`
`@@ -945,11 +948,11 @@ def _tunnel(self):`
`945`	`948`	`try:`
`946`	`949`	`(version,code,message)=response._read_status()`
`947`	`950`
`948`		`-self._proxy_response_headers=parse_headers(response.fp)`
	`951`	`+self._raw_proxy_headers=_read_headers(response.fp)`
`949`	`952`
`950`	`953`	`ifself.debuglevel>0:`
`951`		`-forhdr,valinself._proxy_response_headers.items():`
`952`		`-print("header:",hdr+":",val)`
	`954`	`+forheaderinself._raw_proxy_headers:`
	`955`	`+print('header:',header.decode())`
`953`	`956`
`954`	`957`	`ifcode!=http.HTTPStatus.OK:`
`955`	`958`	`self.close()`
`@@ -958,6 +961,13 @@ def _tunnel(self):`
`958`	`961`	`finally:`
`959`	`962`	`response.close()`
`960`	`963`
	`964`	`+defget_proxy_response_headers(self):`
	`965`	`+return (`
	`966`	`+_parse_header_lines(self._raw_proxy_headers)`
	`967`	`+ifself._raw_proxy_headersisnotNone`
	`968`	`+elseNone`
	`969`	`+ )`
	`970`	`+`
`961`	`971`	`defconnect(self):`
`962`	`972`	`"""Connect to the host and port specified in __init__."""`
`963`	`973`	`sys.audit("http.client.connect",self,self.host,self.port)`

`‎Lib/test/test_httplib.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2401,7 +2401,7 @@ def test_proxy_response_headers(self):`
`2401`	`2401`	`self.conn.set_tunnel('destination.com')`
`2402`	`2402`
`2403`	`2403`	`self.conn.request('PUT','/','')`
`2404`		`-headers=self.conn._proxy_response_headers`
	`2404`	`+headers=self.conn.get_proxy_response_headers()`
`2405`	`2405`	`self.assertIn(expected_header,headers.items())`
`2406`	`2406`
`2407`	`2407`	`deftest_tunnel_leak(self):`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2a60f7b

File tree

2 files changed

2 files changed

`‎Lib/http/client.py‎`

`‎Lib/test/test_httplib.py‎`

0 commit comments