mirror of
				https://github.com/python/cpython.git
				synced 2025-10-30 21:21:22 +00:00 
			
		
		
		
	Issue #13898: test_ssl no longer prints a spurious stack trace on Ubuntu.
This commit is contained in:
		
							parent
							
								
									fed69ba63c
								
							
						
					
					
						commit
						7b39b9b51b
					
				
					 2 changed files with 9 additions and 1 deletions
				
			
		|  | @ -774,7 +774,13 @@ def wrap_conn(self): | |||
|                 try: | ||||
|                     self.sslconn = self.server.context.wrap_socket( | ||||
|                         self.sock, server_side=True) | ||||
|                 except ssl.SSLError as e: | ||||
|                 except (ssl.SSLError, socket.error) as e: | ||||
|                     # Treat ECONNRESET as though it were an SSLError - OpenSSL | ||||
|                     # on Ubuntu abruptly closes the connection when asked to use | ||||
|                     # an unsupported protocol. | ||||
|                     if (not isinstance(e, ssl.SSLError) and | ||||
|                         e.errno != errno.ECONNRESET): | ||||
|                         raise | ||||
|                     # XXX Various errors can have happened here, for example | ||||
|                     # a mismatching protocol version, an invalid certificate, | ||||
|                     # or a low-level bug. This should be made more discriminating. | ||||
|  |  | |||
|  | @ -947,6 +947,8 @@ Extension Modules | |||
| Tests | ||||
| ----- | ||||
| 
 | ||||
| - Issue #13898: test_ssl no longer prints a spurious stack trace on Ubuntu. | ||||
| 
 | ||||
| - Issue #17249: convert a test in test_capi to use unittest and reap threads. | ||||
| 
 | ||||
| - Issue #17041: Fix testing when Python is configured with the | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Nadeem Vawda
						Nadeem Vawda