[usocket-cvs] r470 - usocket/branches/0.4.x/backend

[Chun Tian (binghe)]

Author: ctian
Date: Tue Oct 28 12:02:01 2008
New Revision: 470

Log:
[bugfix] merge from trunk (r469)

Modified:
   usocket/branches/0.4.x/backend/cmucl.lisp
   usocket/branches/0.4.x/backend/scl.lisp

Modified: usocket/branches/0.4.x/backend/cmucl.lisp
==============================================================================
--- usocket/branches/0.4.x/backend/cmucl.lisp	(original)
+++ usocket/branches/0.4.x/backend/cmucl.lisp	Tue Oct 28 12:02:01 2008
@@ -69,7 +69,9 @@
     (setf socket
 	  (let ((args (list (host-to-hbo host) port :stream)))
 	    (when (and local-bind-p (or local-host-p local-port-p))
-	      (nconc args (list :local-host local-host :local-port local-port)))
+	      (nconc args (list :local-host (when local-host
+					      (host-to-hbo local-host))
+				:local-port local-port)))
 	    (with-mapped-conditions (socket)
 	      (apply #'ext:connect-to-inet-socket args))))
     (if socket

Modified: usocket/branches/0.4.x/backend/scl.lisp
==============================================================================
--- usocket/branches/0.4.x/backend/scl.lisp	(original)
+++ usocket/branches/0.4.x/backend/scl.lisp	Tue Oct 28 12:02:01 2008
@@ -22,11 +22,11 @@
 
 (defun handle-condition (condition &optional (socket nil))
   "Dispatch correct usocket condition."
-  (etypecase condition
+  (typecase condition
     (ext::socket-error
      (scl-map-socket-error (ext::socket-errno condition)
-               :socket socket
-               :condition condition))))
+			   :socket socket
+			   :condition condition))))
 
 (defun socket-connect (host port &key (element-type 'character)
                        timeout deadline (nodelay t nodelay-specified)
@@ -45,7 +45,8 @@
 
   (let* ((socket (let ((args (list (host-to-hbo host) port :kind :stream)))
 		   (when (and patch-udp-p (or local-host-p local-port-p))
-		     (nconc args (list :local-host (host-to-hbo local-host)
+		     (nconc args (list :local-host (when local-host
+						     (host-to-hbo local-host))
 				       :local-port local-port)))
 		   (with-mapped-conditions ()
 		     (apply #'ext:connect-to-inet-socket args))))