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

[BKNR Commits]

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

Solidify feature expressions

U   trunk/thirdparty/drakma/CHANGELOG.txt
U   trunk/thirdparty/drakma/request.lisp

Modified: trunk/thirdparty/drakma/CHANGELOG.txt
===================================================================
--- trunk/thirdparty/drakma/CHANGELOG.txt	2009-03-05 10:06:27 UTC (rev 4332)
+++ trunk/thirdparty/drakma/CHANGELOG.txt	2009-03-05 22:30:49 UTC (rev 4333)
@@ -1,3 +1,4 @@
+Solidify feature expressions (thanks to Joshua Taylor)
 Make SEND-COOKIE-P work for pathless URIs (thanks to Tomo Matsumoto)
 
 Version 1.0.0

Modified: trunk/thirdparty/drakma/request.lisp
===================================================================
--- trunk/thirdparty/drakma/request.lisp	2009-03-05 10:06:27 UTC (rev 4332)
+++ trunk/thirdparty/drakma/request.lisp	2009-03-05 22:30:49 UTC (rev 4333)
@@ -157,8 +157,8 @@
                      (when textp
                        (setf result
                              (octets-to-string result :external-format (flexi-stream-external-format stream))
-                             #+:clisp #+:clisp
-                             (flexi-stream-element-type stream) element-type))
+                             #+:clisp (flexi-stream-element-type stream)
+                             #+:clisp element-type))
                      result))
                   ((or chunkedp must-close)
                    ;; no content length, read until EOF (or end of chunking)
@@ -204,7 +204,7 @@
                               #+:lispworks (read-timeout 20)
                               #+(and :lispworks (not :lw-does-not-have-write-timeout))
                               (write-timeout 20 write-timeout-provided-p)
-                              #+openmcl
+                              #+:openmcl
                               deadline)
   "Sends an HTTP request to a web server and returns its reply.  URI
 is where the request is sent to, and it is either a string denoting a
@@ -446,17 +446,18 @@
                                                           :timeout connection-timeout
                                                           :read-timeout read-timeout
                                                           #-:lw-does-not-have-write-timeout
+                                                          :write-timeout
                                                           #-:lw-does-not-have-write-timeout
-                                                          :write-timeout write-timeout
+                                                          write-timeout
                                                           :errorp t)
                                     #-:lispworks
                                     (usocket:socket-stream
                                      (usocket:socket-connect host port
                                                              :element-type 'octet
-                                                             #+openmcl #+openmcl
-                                                             :deadline deadline
+                                                             #+:openmcl :deadline
+                                                             #+:openmcl deadline
                                                              :nodelay t))))
-              #+openmcl
+              #+:openmcl
               (when deadline
                 ;; it is correct to set the deadline here even though
                 ;; it may have been initialized by SOCKET-CONNECT