[usocket-cvs] r485 - in usocket/branches/0.4.x: . backend

[Chun Tian (binghe)]

Author: ctian
Date: Fri Dec 26 14:31:49 2008
New Revision: 485

Log:
[0.4.x] merge recent fixes (r481, r483) from trunk

Modified:
   usocket/branches/0.4.x/backend/sbcl.lisp
   usocket/branches/0.4.x/condition.lisp

Modified: usocket/branches/0.4.x/backend/sbcl.lisp
==============================================================================
--- usocket/branches/0.4.x/backend/sbcl.lisp	(original)
+++ usocket/branches/0.4.x/backend/sbcl.lisp	Fri Dec 26 14:31:49 2008
@@ -353,7 +353,7 @@
                 (1+ (reduce #'max (wait-list-%wait sockets)
                             :key #'sb-bsd-sockets:socket-file-descriptor))
                 (sb-alien:addr rfds) nil nil
-                (when timeout secs) musecs)
+                (when timeout secs) (when timeout musecs))
 	     (if (null count)
 		 (unless (= err sb-unix:EINTR)
 		   (error (map-errno-error err)))

Modified: usocket/branches/0.4.x/condition.lisp
==============================================================================
--- usocket/branches/0.4.x/condition.lisp	(original)
+++ usocket/branches/0.4.x/condition.lisp	Fri Dec 26 14:31:49 2008
@@ -184,7 +184,7 @@
     ((9) . bad-file-descriptor-error)
     ((61 111) . connection-refused-error)
     ((64 131) . connection-reset-error)
-    ((130) . connection-aborted-error)
+    ((53 103) . connection-aborted-error)
     ((22) . invalid-argument-error)
     ((55 105) . no-buffers-error)
     ((12) . out-of-memory-error)