[Python-checkins] CVS: python/dist/src/Modules socketmodule.c,1.132,1.133

[Jeremy Hylton]

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv31051/Modules

Modified Files:
	socketmodule.c 
Log Message:
An ssl-wrapped socket now returns '' on EOF, just like a regular
socket -- as suggested by Clarence Gardner.

Fix httplib to comply with the new ssl-socket interface.


Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -r1.132 -r1.133
*** socketmodule.c	2001/01/22 15:29:14	1.132
--- socketmodule.c	2001/02/01 23:35:20	1.133
***************
*** 2166,2180 ****
  
  	switch (res) {
! 	case 0:			/* Good return value! */
  		break;
! 	case 6:
! 		PyErr_SetString(SSLErrorObject, "EOF");
! 		Py_DECREF(buf);
! 		return NULL;
  		break;
- 	case 5:
  	default:
  		return PyErr_SetFromErrno(SSLErrorObject);
- 		break;
  	}
    
--- 2166,2177 ----
  
  	switch (res) {
! 	case SSL_ERROR_NONE:
! 		assert(count > 0);
  		break;
! 	case SSL_ERROR_ZERO_RETURN: /* normal EOF */
! 		assert(count == 0);
  		break;
  	default:
  		return PyErr_SetFromErrno(SSLErrorObject);
  	}