Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.291
diff -u -r1.291 socketmodule.c
--- socketmodule.c	3 Jun 2004 09:24:42 -0000	1.291
+++ socketmodule.c	21 Jun 2004 09:34:38 -0000
@@ -676,8 +676,12 @@
 
 	s->errorhandler = &set_error;
 
-	if (defaulttimeout >= 0.0)
-		internal_setblocking(s, 0);
+	/* On some platforms (like Solaris), sockets from accept()
+	   inherits the blocking property from the listening
+	   socket. On other platforms (like Linux), this property is
+	   not inherited. Make sure we set the blocking property
+	   explicitly on all new socket objects. --astrand */
+	internal_setblocking(s, defaulttimeout < 0);
 
 #ifdef RISCOS
 	if (taskwindow)