r11204: 22 Sep 2006 Kevin Rosenberg <kevin@rosenberg.net>

        * Version 1.90
        * sockets.lisp: Commit patch from Joerg Hoehle for CLISP sockets

diff --git a/ChangeLog b/ChangeLog
index 316e9c2ea6876516d48d104c368a43d2d5265257..e7e273905d4ce1323bd22e510b7f407f88505fa2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+22 Sep 2006  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 1.90
+       * sockets.lisp: Commit patch from Joerg Hoehle for CLISP sockets
+
 04 Sep 2006  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 1.89
        * kmrcl.asd, mop.lisp: Add support for CLISP MOP

diff --git a/debian/changelog b/debian/changelog
index 769b903e8a20cc0cb0cbcab5968981e2c0e8eaa3..ca30ad107240539ce31575197349e3ad1f307e9c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-kmrcl (1.90-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Fri, 22 Sep 2006 11:46:17 -0600
+
 cl-kmrcl (1.89-1) unstable; urgency=low
 
   * New upstream

diff --git a/sockets.lisp b/sockets.lisp
index 2d9a8ff0765072e03b5c43d5916f87a90fd7b110..74b4f36a13c042bc6240d9504465f7edb7f41883 100644 (file)
--- a/sockets.lisp
+++ b/sockets.lisp
@@ -104,7 +104,7 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
 
 (defun close-passive-socket (socket)
   #+allegro (close socket)
-  #+clisp (close socket)
+  #+clisp (ext:socket-server-close socket)
   #+cmu (unix:unix-close socket)
   #+sbcl (sb-unix:unix-close
          (sb-bsd-sockets:socket-file-descriptor socket))
@@ -186,6 +186,9 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
     (values
      (sys:make-fd-stream sock :input t :output t :element-type 'base-char)
      sock))
+  #+clisp
+  (let ((sock (ext:socket-connect port server)))
+    (values sock sock))
   #+openmcl
   (let ((sock (ccl:make-socket :remote-host server :remote-port port )))
     (values sock sock))
@@ -203,6 +206,10 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
   #+sbcl (ipaddr-array-to-dotted 
          (nth-value 0 (sb-bsd-sockets:socket-peername socket)))
   #+cmu (nth-value 0 (ext:get-peer-host-and-port socket))
+  #+clisp (let* ((peer (ext:socket-stream-peer socket t))
+                (stop (position #\Space peer)))
+           ;; 2.37-2.39 had do-not-resolve-p backwards
+           (if stop (subseq peer 0 stop) peer))
   #+openmcl (ccl:remote-host socket)
   )