Commit1884878

authored and

committed

[1.26] Properly proxy EOF on the SSLTransport test suite

Previously the proxy was continuously ignoring EOF signals and keepingthe socket open.Signed-off-by: Jorge Lopez Silva <jalopezsilva@gmail.com>

1 parenta891304 commit1884878Copy full SHA for 1884878

File tree

-0

lines changed

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -258,6 +258,7 @@ def proxy_handler(listener):`
`258`	`258`	`)`
`259`	`259`	`self._read_write_loop(client_sock,upstream_sock)`
`260`	`260`	`upstream_sock.close()`
	`261`	`+client_sock.close()`
`261`	`262`
`262`	`263`	`self._start_server(proxy_handler)`
`263`	`264`
`@@ -286,6 +287,10 @@ def _read_write_loop(self, client_sock, server_sock, chunks=65536):`
`286`	`287`	`ifwrite_socketinwritable:`
`287`	`288`	`try:`
`288`	`289`	`b=read_socket.recv(chunks)`
	`290`	`+iflen(b)==0:`
	`291`	`+# One of the sockets has EOFed, we return to close`
	`292`	`+# both.`
	`293`	`+return`
`289`	`294`	`write_socket.send(b)`
`290`	`295`	`exceptssl.SSLEOFError:`
`291`	`296`	`# It's possible, depending on shutdown order, that we'll`
`@@ -335,6 +340,7 @@ def socket_handler(listener):`
`335`	`340`	`request=consume_socket(ssock)`
`336`	`341`	`validate_request(request)`
`337`	`342`	`ssock.send(sample_response())`
	`343`	`+sock.close()`
`338`	`344`
`339`	`345`	`cls._start_server(socket_handler)`
`340`	`346`

Comments

(0)