r8894: tested good

diff --git a/clsql-classic-tests.asd b/clsql-classic-tests.asd
index 4d04a2c026104ebeacff755ab0c64bf3cf09a86d..74f2dfbc36dcfd9eda0539ea263aa388734e6f67 100644 (file)
--- a/clsql-classic-tests.asd
+++ b/clsql-classic-tests.asd
@@ -23,7 +23,7 @@
 
   :depends-on (clsql #-clisp clsql-mysql 
                     #-clisp clsql-postgresql
-                    #-(or clisp openmcl) clsql-postgresql-socket
+                    #-clisp clsql-postgresql-socket
                     ptester
                     #+(and allegro (not allegro-cl-trial)) clsql-aodbc
                     clsql-sqlite)

diff --git a/db-postgresql-socket/postgresql-socket-api.lisp b/db-postgresql-socket/postgresql-socket-api.lisp
index a1283951c30b0f6afbdc83f6c59517d94d044ab3..40c904fca70e487261b496d3ad4abd46cc081d02 100644 (file)
--- a/db-postgresql-socket/postgresql-socket-api.lisp
+++ b/db-postgresql-socket/postgresql-socket-api.lisp
@@ -386,11 +386,9 @@ socket interface"
                        :connect :active
                        :remote-filename path :local-filename path)))
     (string
-     (socket:with-pending-connect
-        (mp:with-timeout (*postgresql-server-socket-timeout* (error "connect failed"))
-          (ccl:make-socket :type :stream :address-family :internet
-                           :remote-port port :remote-host host
-                           :connect :active :nodelay t))))))
+     (ccl:make-socket :type :stream :address-family :internet
+                     :remote-port port :remote-host host
+                     :connect :active :nodelay t))))
 
 #+lispworks
 (defun open-postgresql-socket-stream (host port)