Commite00e2f0

committed

fix issuepython#6589: cleanup asyncore.socket_map if smtpd.SMTPServer constructor raises an exception

1 parent10947a6 commite00e2f0Copy full SHA for e00e2f0

File tree

+18

-9

lines changed

+18

-9

lines changed

Lines changed: 15 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -274,15 +274,21 @@ def __init__(self, localaddr, remoteaddr):`
`274`	`274`	`self._localaddr=localaddr`
`275`	`275`	`self._remoteaddr=remoteaddr`
`276`	`276`	`asyncore.dispatcher.__init__(self)`
`277`		`-self.create_socket(socket.AF_INET,socket.SOCK_STREAM)`
`278`		`-# try to re-use a server port if possible`
`279`		`-self.set_reuse_addr()`
`280`		`-self.bind(localaddr)`
`281`		`-self.listen(5)`
`282`		`-print>>DEBUGSTREAM, \`
`283`		`-'%s started at %s\n\tLocal addr: %s\n\tRemote addr:%s'% (`
`284`		`-self.__class__.__name__,time.ctime(time.time()),`
`285`		`-localaddr,remoteaddr)`
	`277`	`+try:`
	`278`	`+self.create_socket(socket.AF_INET,socket.SOCK_STREAM)`
	`279`	`+# try to re-use a server port if possible`
	`280`	`+self.set_reuse_addr()`
	`281`	`+self.bind(localaddr)`
	`282`	`+self.listen(5)`
	`283`	`+except:`
	`284`	`+# cleanup asyncore.socket_map before raising`
	`285`	`+self.close()`
	`286`	`+raise`
	`287`	`+else:`
	`288`	`+print>>DEBUGSTREAM, \`
	`289`	`+'%s started at %s\n\tLocal addr: %s\n\tRemote addr:%s'% (`
	`290`	`+self.__class__.__name__,time.ctime(time.time()),`
	`291`	`+localaddr,remoteaddr)`
`286`	`292`
`287`	`293`	`defhandle_accept(self):`
`288`	`294`	`conn,addr=self.accept()`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,9 @@ Build`
`51`	`51`	`Library`
`52`	`52`	`-------`
`53`	`53`
	`54`	`+- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor`
	`55`	`+ raises an exception.`
	`56`	`+`
`54`	`57`	`- Issue #8959: fix regression caused by using unmodified libffi`
`55`	`58`	`library on Windows. ctypes does now again check the stack before`
`56`	`59`	`and after calling foreign functions.`

Comments

(0)