New Upstream Release - cl-drakma
Ready changes
Summary
Merged new upstream version: 2.0.9 (was: 2.0.8).
Resulting package
Built on 2023-06-10T21:55 (took 11m37s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases cl-drakma
Diff
diff --git a/debian/changelog b/debian/changelog
index 5470d06..77be443 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-cl-drakma (2.0.8-2) UNRELEASED; urgency=medium
+cl-drakma (2.0.9-1) UNRELEASED; urgency=medium
+ [ Sébastien Villemot ]
* Remove myself from Uploaders
- -- Sébastien Villemot <sebastien@debian.org> Sat, 10 Jun 2023 13:46:15 +0200
+ [ Debian Janitor ]
+ * New upstream release.
+
+ -- Sébastien Villemot <sebastien@debian.org> Sat, 10 Jun 2023 21:44:49 -0000
cl-drakma (2.0.8-1) unstable; urgency=medium
diff --git a/drakma.asd b/drakma.asd
index 344aa56..41765e6 100644
--- a/drakma.asd
+++ b/drakma.asd
@@ -43,7 +43,7 @@
:author "Dr. Edi Weitz"
:license "BSD"
:serial t
- :version "2.0.8"
+ :version "2.0.9"
:components ((:file "packages")
(:file "specials")
(:file "conditions")
@@ -59,7 +59,7 @@
:cl-ppcre
#-:drakma-no-chipz :chipz
#-:lispworks :usocket
- #-(or :lispworks (and :allegro (not :allegro-cl-express)) :mocl-ssl :drakma-no-ssl) :cl+ssl)
+ #-(or :lispworks7.1 (and :allegro (not :allegro-cl-express)) :mocl-ssl :drakma-no-ssl) :cl+ssl)
:perform (test-op (o s)
(asdf:load-system :drakma-test)
(asdf:perform 'asdf:test-op :drakma-test)))
diff --git a/request.lisp b/request.lisp
index be75671..2ebc39b 100644
--- a/request.lisp
+++ b/request.lisp
@@ -160,7 +160,7 @@ headers of the chunked stream \(if any) as a second value."
(header-value :content-length headers)))
(parse-integer value)))
(element-type (if textp
- #+:lispworks 'lw:simple-char #-:lispworks 'character
+ #+:lispworks7.1 'lw:simple-char #-:lispworks7.1 'character
'octet)))
(values (cond ((eql content-length 0) nil)
(content-length
@@ -233,8 +233,8 @@ headers of the chunked stream \(if any) as a second value."
decode-content ; default to nil for backwards compatibility
#+(or abcl clisp lispworks mcl openmcl sbcl)
(connection-timeout 20)
- #+:lispworks (read-timeout 20)
- #+(and :lispworks (not :lw-does-not-have-write-timeout))
+ #+:lispworks7.1 (read-timeout 20)
+ #+(and :lispworks7.1 (not :lw-does-not-have-write-timeout))
(write-timeout 20 write-timeout-provided-p)
#+:openmcl
deadline
@@ -483,7 +483,7 @@ decoded according to any encodings specified in the Content-Encoding
header. The actual decoding is done by the DECODE-STREAM generic function,
and you can implement new methods to support additional encodings.
Any encodings in Transfer-Encoding, such as chunking, are always performed."
- #+lispworks
+ #+lispworks7.1
(declare (ignore certificate key certificate-password verify max-depth ca-file ca-directory))
(unless (member protocol '(:http/1.0 :http/1.1) :test #'eq)
(parameter-error "Don't know how to handle protocol ~S." protocol))
@@ -559,7 +559,7 @@ Any encodings in Transfer-Encoding, such as chunking, are always performed."
(drakma-warn "Disabling WRITE-TIMEOUT because it doesn't mix well with SSL."))
(setq write-timeout nil))
(setq http-stream (or stream
- #+:lispworks
+ #+:lispworks7.1
(comm:open-tcp-stream host port
:element-type 'octet
:timeout connection-timeout
@@ -569,7 +569,7 @@ Any encodings in Transfer-Encoding, such as chunking, are always performed."
#-:lw-does-not-have-write-timeout
write-timeout
:errorp t)
- #-:lispworks
+ #-:lispworks7.1
(usocket:socket-stream
(usocket:socket-connect host port
:element-type 'octet
@@ -601,14 +601,14 @@ Any encodings in Transfer-Encoding, such as chunking, are always performed."
(when (and use-ssl
;; don't attach SSL to existing streams
(not stream))
- #+:lispworks
+ #+:lispworks7.1
(comm:attach-ssl http-stream
:ssl-side :client
#-(or lispworks4 lispworks5 lispworks6)
:tlsext-host-name
#-(or lispworks4 lispworks5 lispworks6)
(puri:uri-host uri))
- #-:lispworks
+ #-:lispworks7.1
(setq http-stream (make-ssl-stream http-stream
:hostname (puri:uri-host uri)
:certificate certificate
@@ -620,7 +620,7 @@ Any encodings in Transfer-Encoding, such as chunking, are always performed."
:ca-directory ca-directory)))
(cond (stream
(setf (flexi-stream-element-type http-stream)
- #+:lispworks 'lw:simple-char #-:lispworks 'character
+ #+:lispworks6 'lw:simple-char #-:lispworks6 'character
(flexi-stream-external-format http-stream) +latin-1+))
(t
(setq http-stream (wrap-stream http-stream))))
@@ -642,14 +642,14 @@ Any encodings in Transfer-Encoding, such as chunking, are always performed."
;; got a connection; we have to read a blank line,
;; turn on SSL, and then we can transmit
(read-line* http-stream)
- #+:lispworks
+ #+:lispworks7.1
(comm:attach-ssl raw-http-stream
:ssl-side :client
#-(or lispworks4 lispworks5 lispworks6)
:tlsext-host-name
#-(or lispworks4 lispworks5 lispworks6)
(puri:uri-host uri))
- #-:lispworks
+ #-:lispworks7.1
(setq http-stream (wrap-stream
(make-ssl-stream raw-http-stream
:hostname (puri:uri-host uri)
diff --git a/util.lisp b/util.lisp
index 97949e7..d8bde96 100644
--- a/util.lisp
+++ b/util.lisp
@@ -266,7 +266,7 @@ which are not meant as separators."
(string-length (length string))
search-start
result)
- (tagbody
+ (tagbody
;; at this point we know that COOKIE-START is the start of a new
;; cookie (at the start of the string or behind a comma)
next-cookie
@@ -282,7 +282,7 @@ which are not meant as separators."
(equals-pos (and comma-pos (position #\= string :start comma-pos)))
;; check that (except for whitespace) there's only a token
;; (the name of the next cookie) between #\, and #\=
- (new-cookie-start-p (and equals-pos
+ (new-cookie-start-p (and equals-pos
(every 'token-char-p
(trim-whitespace string
:start (1+ comma-pos)
@@ -295,7 +295,7 @@ which are not meant as separators."
(setq cookie-start (1+ end-pos))
(go next-cookie))))))
-#-:lispworks
+#-:lispworks7.1
(defun make-ssl-stream (http-stream &key certificate key certificate-password verify (max-depth 10) ca-file ca-directory
hostname)
"Attaches SSL to the stream HTTP-STREAM and returns the SSL stream
@@ -334,14 +334,12 @@ which are not meant as separators."
(list ca-file ca-directory))
ca-file ca-directory
:default))))
- (cl+ssl:with-global-context (ctx)
+ (cl+ssl:with-global-context (ctx :auto-free-p t)
(cl+ssl:make-ssl-client-stream
(cl+ssl:stream-fd s)
:verify verify
:hostname hostname
- :close-callback (lambda ()
- (close s)
- (cl+ssl:ssl-ctx-free ctx))
+ :close-callback (lambda () (close s))
:certificate certificate
:key key
:password certificate-password)))
Debdiff
File lists identical (after any substitutions)
No differences were encountered in the control files