@@ -74,7 +74,7 @@ typedef enum {
7474 SOCKET_IS_BLOCKING ,
7575 SOCKET_HAS_TIMED_OUT ,
7676 SOCKET_HAS_BEEN_CLOSED ,
77- SOCKET_INVALID ,
77+ SOCKET_TOO_LARGE_FOR_SELECT ,
7878 SOCKET_OPERATION_OK
7979} timeout_state ;
8080
@@ -273,7 +273,7 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file)
273273 } else if (sockstate == SOCKET_HAS_BEEN_CLOSED ) {
274274 PyErr_SetString (PySSLErrorObject , "Underlying socket has been closed." );
275275 goto fail ;
276- } else if (sockstate == SOCKET_INVALID ) {
276+ } else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT ) {
277277 PyErr_SetString (PySSLErrorObject , "Underlying socket too large for select()." );
278278 goto fail ;
279279 } else if (sockstate == SOCKET_IS_NONBLOCKING ) {
@@ -379,7 +379,7 @@ check_socket_and_wait_for_timeout(PySocketSockObject *s, int writing)
379379 /* Guard against socket too large for select*/
380380#ifndef Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE
381381 if (s -> sock_fd >= FD_SETSIZE )
382- return SOCKET_INVALID ;
382+ return SOCKET_TOO_LARGE_FOR_SELECT ;
383383#endif
384384
385385 /* Construct the arguments to select */
@@ -419,7 +419,7 @@ static PyObject *PySSL_SSLwrite(PySSLObject *self, PyObject *args)
419419 } else if (sockstate == SOCKET_HAS_BEEN_CLOSED ) {
420420 PyErr_SetString (PySSLErrorObject , "Underlying socket has been closed." );
421421 return NULL ;
422- } else if (sockstate == SOCKET_INVALID ) {
422+ } else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT ) {
423423 PyErr_SetString (PySSLErrorObject , "Underlying socket too large for select()." );
424424 return NULL ;
425425 }
@@ -480,7 +480,7 @@ static PyObject *PySSL_SSLread(PySSLObject *self, PyObject *args)
480480 PyErr_SetString (PySSLErrorObject , "The read operation timed out" );
481481 Py_DECREF (buf );
482482 return NULL ;
483- } else if (sockstate == SOCKET_INVALID ) {
483+ } else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT ) {
484484 PyErr_SetString (PySSLErrorObject , "Underlying socket too large for select()." );
485485 return NULL ;
486486 }
0 commit comments