Author: ctian Date: Sat Oct 1 07:49:26 2011 New Revision: 675 Log: Merge all changes from branch 0.5.x (r672, 674) before tagging 0.5.4 Modified: usocket/trunk/CHANGES usocket/trunk/backend/sbcl.lisp usocket/trunk/package.lisp usocket/trunk/usocket-test.asd usocket/trunk/usocket.asd Modified: usocket/trunk/CHANGES ============================================================================== --- usocket/trunk/CHANGES Sat Oct 1 07:35:11 2011 (r674) +++ usocket/trunk/CHANGES Sat Oct 1 07:49:26 2011 (r675) @@ -1,3 +1,9 @@ +0.5.4: + +* Bugfix: [ECL] Fixed for ECL's MAKE-BUILD by removing some unecessary code (reported by Juan Jose Garcia-Ripoll, the ECL maintainer) +* Bugfix: [ACL] Fixed for Allegro CL modern mode. +* Bugfix: [SBCL] SOCKET-CONNECT on TCP won't call bind() when keyword arguments LOCAL-HOST or LOCAL-PORT is not set. (reported by Robert Brown) + 0.5.3: * Bugfix: [MCL] Fixed SOCKET-LISTEN on vector addresses like #(0 0 0 0) Modified: usocket/trunk/backend/sbcl.lisp ============================================================================== --- usocket/trunk/backend/sbcl.lisp Sat Oct 1 07:35:11 2011 (r674) +++ usocket/trunk/backend/sbcl.lisp Sat Oct 1 07:49:26 2011 (r675) @@ -269,8 +269,6 @@ :protocol (case protocol (:stream :tcp) (:datagram :udp)))) - (local-host (host-to-vector-quad (or local-host *wildcard-host*))) - (local-port (or local-port *auto-port*)) usocket ok) (unwind-protect (progn @@ -285,7 +283,10 @@ (when (and nodelay-specified sockopt-tcp-nodelay-p) (setf (sb-bsd-sockets::sockopt-tcp-nodelay socket) nodelay)) (when (or local-host local-port) - (sb-bsd-sockets:socket-bind socket local-host local-port)) + (sb-bsd-sockets:socket-bind socket + (host-to-vector-quad + (or local-host *wildcard-host*)) + (or local-port *auto-port*))) (with-mapped-conditions (usocket) #+(and sbcl (not win32)) (labels ((connect () Modified: usocket/trunk/package.lisp ============================================================================== --- usocket/trunk/package.lisp Sat Oct 1 07:35:11 2011 (r674) +++ usocket/trunk/package.lisp Sat Oct 1 07:49:26 2011 (r675) @@ -3,8 +3,6 @@ ;;;; See the LICENSE file for licensing information. -(in-package :usocket-system) - (defpackage :usocket (:use :common-lisp #+abcl :java) (:export #:*wildcard-host* @@ -87,20 +85,3 @@ #:insufficient-implementation ; conditions regarding usocket support level #:unsupported #:unimplemented)) - -(in-package :usocket) - -;;; Logical Pathname Translations, learn from CL-HTTP source code - -(eval-when (:load-toplevel :execute) - (let* ((defaults #+asdf (asdf:component-pathname (asdf:find-system :usocket)) - #-asdf *load-truename*) - (home (make-pathname :name :wild :type :wild - :directory (append (pathname-directory defaults) - '(:wild-inferiors)) - :host (pathname-host defaults) - :defaults defaults - :version :newest))) - (setf (logical-pathname-translations "usocket") - `(("**;*.*.NEWEST" ,home) - ("**;*.*" ,home))))) Modified: usocket/trunk/usocket-test.asd ============================================================================== --- usocket/trunk/usocket-test.asd Sat Oct 1 07:35:11 2011 (r674) +++ usocket/trunk/usocket-test.asd Sat Oct 1 07:49:26 2011 (r675) @@ -4,14 +4,6 @@ ;;;; See the LICENSE file for licensing information. -(in-package :cl-user) - -(unless (find-package ':usocket-system) - (make-package ':usocket-system - :use '(:cl :asdf))) - -(in-package :usocket-system) - (defsystem usocket-test :name "usocket test" :author "Erik Enge" Modified: usocket/trunk/usocket.asd ============================================================================== --- usocket/trunk/usocket.asd Sat Oct 1 07:35:11 2011 (r674) +++ usocket/trunk/usocket.asd Sat Oct 1 07:49:26 2011 (r675) @@ -4,13 +4,6 @@ ;;;; See the LICENSE file for licensing information. -(in-package :cl-user) - -(defpackage usocket-system - (:use :cl :asdf)) - -(in-package :usocket-system) - (defsystem usocket :name "usocket" :author "Erik Enge & Erik Huelsmann"