[bknr-cvs] edi changed trunk/thirdparty/drakma/

[BKNR Commits]

Revision: 4535
Author: edi
URL: http://bknr.net/trac/changeset/4535

More finetuning

U   trunk/thirdparty/drakma/request.lisp
U   trunk/thirdparty/drakma/util.lisp

Modified: trunk/thirdparty/drakma/request.lisp
===================================================================
--- trunk/thirdparty/drakma/request.lisp	2010-05-19 14:23:08 UTC (rev 4534)
+++ trunk/thirdparty/drakma/request.lisp	2010-05-19 14:48:37 UTC (rev 4535)
@@ -509,6 +509,9 @@
                 ;; got a connection; we have to read a blank line,
                 ;; turn on SSL, and then we can transmit
                 (read-line* http-stream)
+                #+:lispworks
+                (comm:attach-ssl raw-http-stream :ssl-side :client)
+                #-:lispworks
                 (setq http-stream (wrap-stream (make-ssl-stream raw-http-stream))))
               (when (and (not parameters-used-p)
                          parameters)

Modified: trunk/thirdparty/drakma/util.lisp
===================================================================
--- trunk/thirdparty/drakma/util.lisp	2010-05-19 14:23:08 UTC (rev 4534)
+++ trunk/thirdparty/drakma/util.lisp	2010-05-19 14:48:37 UTC (rev 4535)
@@ -326,24 +326,14 @@
          (setq cookie-start (1+ end-pos))
          (go next-cookie))))))
 
-#+:lispworks
+#-:lispworks
 (defun make-ssl-stream (http-stream)
   "Attaches SSL to the stream HTTP-STREAM and returns the SSL stream
-\(which might not be equal to HTTP-STREAM)."
-  (comm:attach-ssl http-stream :ssl-side :client)
-  http-stream)
-
-#+:allegro
-(defun make-ssl-stream (http-stream)
-  "Attaches SSL to the stream HTTP-STREAM and returns the SSL stream
-\(which might not be equal to HTTP-STREAM)."
+\(which will not be equal to HTTP-STREAM)."
+  #+:allegro
   (socket:make-ssl-client-stream http-stream))
-
-#-(or :lispworks :allegro)
-(defun make-ssl-stream (http-stream)
-  "Attaches SSL to the stream HTTP-STREAM and returns the SSL stream
-\(which might not be equal to HTTP-STREAM)."
+  #-:allegro
   (let ((s http-stream))
-    (cl+ssl:make-ssl-client-stream 
+    (cl+ssl:make-ssl-client-stream
      (cl+ssl:stream-fd s)
      :close-callback (lambda () (close s)))))
\ No newline at end of file