diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-04-30 11:14:53 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-04-30 11:14:53 -0400 |
| commit | 7f77d77d18234382582c8a3a3e2a526841e900ba (patch) | |
| tree | 173b96150578e0dab7fb20847096a6377cff3514 | |
| parent | f74a04a6b710a5c452209474f9f11fbe4f657261 (diff) | |
| parent | 82968e25f30c15565a4bf3993fe21d4f577eac8d (diff) | |
| download | cherrypy-7f77d77d18234382582c8a3a3e2a526841e900ba.tar.gz | |
Merge https://bitbucket.org/cherrypy/cherrypy/pull-requests/117
| -rw-r--r-- | CHANGES.txt | 1 | ||||
| -rw-r--r-- | cherrypy/wsgiserver/wsgiserver2.py | 2 | ||||
| -rw-r--r-- | cherrypy/wsgiserver/wsgiserver3.py | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index d2a369fd..409ebc7c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,6 +4,7 @@ * #1202: Add support for specifying a certificate authority when serving SSL using the built-in SSL support. * Use ssl.create_default_context when available. +* #1392: Catch platform-specific socket errors on OS X. 5.2.0 ----- diff --git a/cherrypy/wsgiserver/wsgiserver2.py b/cherrypy/wsgiserver/wsgiserver2.py index f3ae1f9d..3cc3bd7b 100644 --- a/cherrypy/wsgiserver/wsgiserver2.py +++ b/cherrypy/wsgiserver/wsgiserver2.py @@ -201,6 +201,8 @@ socket_errors_to_ignore = plat_specific_errors( ) socket_errors_to_ignore.append("timed out") socket_errors_to_ignore.append("The read operation timed out") +if sys.platform == 'darwin': + socket_errors_to_ignore.append(plat_specific_errors("EPROTOTYPE")) socket_errors_nonblocking = plat_specific_errors( 'EAGAIN', 'EWOULDBLOCK', 'WSAEWOULDBLOCK') diff --git a/cherrypy/wsgiserver/wsgiserver3.py b/cherrypy/wsgiserver/wsgiserver3.py index eb169d5e..14fe1b5d 100644 --- a/cherrypy/wsgiserver/wsgiserver3.py +++ b/cherrypy/wsgiserver/wsgiserver3.py @@ -186,6 +186,8 @@ socket_errors_to_ignore = plat_specific_errors( ) socket_errors_to_ignore.append("timed out") socket_errors_to_ignore.append("The read operation timed out") +if sys.platform == 'darwin': + socket_errors_to_ignore.append(plat_specific_errors("EPROTOTYPE")) socket_errors_nonblocking = plat_specific_errors( 'EAGAIN', 'EWOULDBLOCK', 'WSAEWOULDBLOCK') |