December 2009 - bknr-cvs@common-lisp.net - mailman3.common-lisp.net

[bknr-cvs] edi changed trunk/thirdparty/chunga/doc/index.html
by BKNR Commits 01 Dec '09

01 Dec '09

Revision: 4485 Author: edi URL: http://bknr.net/trac/changeset/4485 Typo U trunk/thirdparty/chunga/doc/index.html Modified: trunk/thirdparty/chunga/doc/index.html =================================================================== --- trunk/thirdparty/chunga/doc/index.html 2009-12-01 22:45:24 UTC (rev 4484) +++ trunk/thirdparty/chunga/doc/index.html 2009-12-01 22:48:48 UTC (rev 4485) @@ -548,7 +548,7 @@ [Function] <a class=none name='token-char-p'>token-char-p char => generalized-boolean</a> <blockquote> -Returns a true value if the Lisp character CHAR is a token constituent +Returns a true value if the Lisp character <code>CHAR</code> is a token constituent according to <a href="http://www.rfc.net/rfc2616.html">RFC 2616</a>.

1 0

[bknr-cvs] edi changed tags/thirdparty/drakma-1.1.0/
by BKNR Commits 01 Dec '09

01 Dec '09

Revision: 4484 Author: edi URL: http://bknr.net/trac/changeset/4484 Tag drakma 1.1.0 A tags/thirdparty/drakma-1.1.0/

1 0

[bknr-cvs] edi changed trunk/thirdparty/drakma/
by BKNR Commits 01 Dec '09

01 Dec '09

Revision: 4483 Author: edi URL: http://bknr.net/trac/changeset/4483 Release 1.1.0 U trunk/thirdparty/drakma/CHANGELOG.txt U trunk/thirdparty/drakma/doc/index.html U trunk/thirdparty/drakma/drakma.asd Modified: trunk/thirdparty/drakma/CHANGELOG.txt =================================================================== --- trunk/thirdparty/drakma/CHANGELOG.txt 2009-12-01 22:41:49 UTC (rev 4482) +++ trunk/thirdparty/drakma/CHANGELOG.txt 2009-12-01 22:44:55 UTC (rev 4483) @@ -1,3 +1,5 @@ +Version 1.1.0 +2009-12-01 Allowed additional headers to be function designators (suggested by Xiangjun Wu) Be more liberal when parsing cookies (thanks to Andrei Stebakov) Added HTTP method PATCH (thanks to Xiangjun Wu) Modified: trunk/thirdparty/drakma/doc/index.html =================================================================== --- trunk/thirdparty/drakma/doc/index.html 2009-12-01 22:41:49 UTC (rev 4482) +++ trunk/thirdparty/drakma/doc/index.html 2009-12-01 22:44:55 UTC (rev 4483) @@ -654,13 +654,13 @@ Drakma together with this documentation can be downloaded from <a href="http://weitz.de/files/drakma.tar.gz">http://weitz.de/files/drakma.tar.gz</a>. -The current version is 1.0.0. Drakma can be installed +The current version is 1.1.0. Drakma can be installed via <a href="http://www.cliki.net/asdf">ASDF</a> and depends on the open source libraries <a href="http://www.cliki.net/cl-base64">CL-BASE64</a> (use 3.3.2 or higher to avoid an unneeded dependency on <a href="http://www.cliki.net/kmrcl">KMRCL</a>), <a href="http://www.cliki.net/Puri">Puri</a>, <a href="http://weitz.de/flexi-streams/">FLEXI-STREAMS</a>, -and <a href="http://weitz.de/chunga/">Chunga</a> (1.0.0 or higher). +and <a href="http://weitz.de/chunga/">Chunga</a> (1.1.0 or higher). If you're not using LispWorks, you'll also need <a href="http://www.cliki.net/usocket">usocket</a> (0.3.2 or newer) and (except Modified: trunk/thirdparty/drakma/drakma.asd =================================================================== --- trunk/thirdparty/drakma/drakma.asd 2009-12-01 22:41:49 UTC (rev 4482) +++ trunk/thirdparty/drakma/drakma.asd 2009-12-01 22:44:55 UTC (rev 4483) @@ -38,7 +38,7 @@ (in-package :drakma-asd) -(defvar *drakma-version-string* "1.0.0" +(defvar *drakma-version-string* "1.1.0" "Drakma's version number as a string.") ;; we export its name so we can import it later

1 0

[bknr-cvs] edi changed tags/thirdparty/chunga-1.1.0/
by BKNR Commits 01 Dec '09

01 Dec '09

Revision: 4482 Author: edi URL: http://bknr.net/trac/changeset/4482 Tag chunga 1.1.0 A tags/thirdparty/chunga-1.1.0/

1 0

[bknr-cvs] edi changed trunk/thirdparty/chunga/
by BKNR Commits 01 Dec '09

01 Dec '09

Revision: 4481 Author: edi URL: http://bknr.net/trac/changeset/4481 Release 1.1.0 U trunk/thirdparty/chunga/CHANGELOG.txt U trunk/thirdparty/chunga/chunga.asd U trunk/thirdparty/chunga/doc/index.html Modified: trunk/thirdparty/chunga/CHANGELOG.txt =================================================================== --- trunk/thirdparty/chunga/CHANGELOG.txt 2009-12-01 22:36:55 UTC (rev 4480) +++ trunk/thirdparty/chunga/CHANGELOG.txt 2009-12-01 22:41:14 UTC (rev 4481) @@ -1,3 +1,5 @@ +Version 1.1.0 +2009-12-01 Exported TOKEN-CHAR-P Allowed START and END keyword arguments for TRIM-WHITESPACE Simplified cookie value parsing Modified: trunk/thirdparty/chunga/chunga.asd =================================================================== --- trunk/thirdparty/chunga/chunga.asd 2009-12-01 22:36:55 UTC (rev 4480) +++ trunk/thirdparty/chunga/chunga.asd 2009-12-01 22:41:14 UTC (rev 4481) @@ -29,7 +29,7 @@ (asdf:defsystem :chunga :serial t - :version "1.0.0" + :version "1.1.0" :depends-on (:trivial-gray-streams) :components ((:file "packages") (:file "specials") Modified: trunk/thirdparty/chunga/doc/index.html =================================================================== --- trunk/thirdparty/chunga/doc/index.html 2009-12-01 22:36:55 UTC (rev 4480) +++ trunk/thirdparty/chunga/doc/index.html 2009-12-01 22:41:14 UTC (rev 4481) @@ -108,7 +108,7 @@ Chunga together with this documentation can be downloaded from <a href="http://weitz.de/files/chunga.tar.gz">http://weitz.de/files/chunga.tar.gz</a>. The -current version is 1.0.0. (This version is not compatible with +current version is 1.1.0. (This version is not compatible with pre-2009 releases of <a href="http://weitz.de/hunchentoot/">Hunchentoot</a> or <a href="http://weitz.de/drakma/">Drakma</a>.) Chunga will only

1 0

[bknr-cvs] edi changed trunk/thirdparty/drakma/
by BKNR Commits 01 Dec '09

01 Dec '09

Revision: 4480 Author: edi URL: http://bknr.net/trac/changeset/4480 Allow additional headers to be functions U trunk/thirdparty/drakma/CHANGELOG.txt U trunk/thirdparty/drakma/doc/index.html U trunk/thirdparty/drakma/request.lisp Modified: trunk/thirdparty/drakma/CHANGELOG.txt =================================================================== --- trunk/thirdparty/drakma/CHANGELOG.txt 2009-12-01 22:06:56 UTC (rev 4479) +++ trunk/thirdparty/drakma/CHANGELOG.txt 2009-12-01 22:36:55 UTC (rev 4480) @@ -1,3 +1,4 @@ +Allowed additional headers to be function designators (suggested by Xiangjun Wu) Be more liberal when parsing cookies (thanks to Andrei Stebakov) Added HTTP method PATCH (thanks to Xiangjun Wu) Don't send GET parameters again when redirecting (reported by Eugene Ossintsev) Modified: trunk/thirdparty/drakma/doc/index.html =================================================================== --- trunk/thirdparty/drakma/doc/index.html 2009-12-01 22:06:56 UTC (rev 4479) +++ trunk/thirdparty/drakma/doc/index.html 2009-12-01 22:36:55 UTC (rev 4480) @@ -935,11 +935,15 @@ <a class=none name="proxy-basic-authorization"><code>proxy-basic-authorization</code></a> is used like <code>basic-authorization</code>, but for the proxy, and only if <code>proxy</code> is true. -<a class=none name="additional-headers"><code>additional-headers</code></a> is a -name/value <a -href="http://www.lispworks.com/documentation/HyperSpec/Body/26_glo_a.htm#alist">alist</a> -(like <code>parameters</code>) of additional HTTP headers which -should be sent with the request. +<a class=none +name="additional-headers"><code>additional-headers</code></a> +is a +name/value <a href="http://www.lispworks.com/documentation/HyperSpec/Body/26_glo_a.htm#alist">alist</a> +of additional HTTP headers which should be sent with the request. +Unlike in <code>parameters</code>, the cdrs can not only be +strings but also designators for unary functions (which should in turn +return a string) in which case the function is called each time the +header is written. If <a name="redirect" class=none><code>redirect</code></a> is not <code>NIL</code>, it must be a non-negative integer Modified: trunk/thirdparty/drakma/request.lisp =================================================================== --- trunk/thirdparty/drakma/request.lisp 2009-12-01 22:06:56 UTC (rev 4479) +++ trunk/thirdparty/drakma/request.lisp 2009-12-01 22:36:55 UTC (rev 4480) @@ -321,8 +321,11 @@ BASIC-AUTHORIZATION, but for the proxy, and only if PROXY is true. -ADDITIONAL-HEADERS is a name/value alist \(like PARAMETERS) of -additional HTTP headers which should be sent with the request. +ADDITIONAL-HEADERS is a name/value alist of additional HTTP headers +which should be sent with the request. Unlike in PARAMETERS, the cdrs +can not only be strings but also designators for unary functions +\(which should in turn return a string) in which case the function is +called each time the header is written. If REDIRECT is not NIL, it must be a non-negative integer or T. If REDIRECT is true, Drakma will follow redirects \(return codes @@ -543,7 +546,10 @@ (setq must-close close) (write-header "Connection" "close")) (loop for (name . value) in additional-headers - do (write-header name "~A" value)) + do (write-header name "~A" + (cond ((or (functionp value) (symbolp value)) + (funcall value)) + (t value)))) (when content (when content-type (write-header "Content-Type" "~A" content-type))

1 0

[bknr-cvs] edi changed trunk/thirdparty/drakma/
by BKNR Commits 01 Dec '09

01 Dec '09

Revision: 4479 Author: edi URL: http://bknr.net/trac/changeset/4479 Be more liberal when parsing cookies U trunk/thirdparty/drakma/CHANGELOG.txt U trunk/thirdparty/drakma/cookies.lisp U trunk/thirdparty/drakma/util.lisp Modified: trunk/thirdparty/drakma/CHANGELOG.txt =================================================================== --- trunk/thirdparty/drakma/CHANGELOG.txt 2009-12-01 21:58:01 UTC (rev 4478) +++ trunk/thirdparty/drakma/CHANGELOG.txt 2009-12-01 22:06:56 UTC (rev 4479) @@ -1,3 +1,4 @@ +Be more liberal when parsing cookies (thanks to Andrei Stebakov) Added HTTP method PATCH (thanks to Xiangjun Wu) Don't send GET parameters again when redirecting (reported by Eugene Ossintsev) Solidify feature expressions (thanks to Joshua Taylor) Modified: trunk/thirdparty/drakma/cookies.lisp =================================================================== --- trunk/thirdparty/drakma/cookies.lisp 2009-12-01 21:58:01 UTC (rev 4478) +++ trunk/thirdparty/drakma/cookies.lisp 2009-12-01 22:06:56 UTC (rev 4479) @@ -249,20 +249,14 @@ of three-element lists where each one contains the name of the cookie, the value of the cookie, and an attribute/value list for the optional cookie parameters." - (with-sequence-from-string (stream string) - (loop with *current-error-message* = (format nil "While parsing cookie header ~S:" string) - for first = t then nil - for next = (and (skip-whitespace stream) - (or first (assert-char stream #\,)) - (skip-whitespace stream) - (skip-more-commas stream)) - for name/value = (and next (read-name-value-pair stream - :cookie-syntax t)) - for parameters = (and name/value (read-name-value-pairs stream - :value-required-p nil - :cookie-syntax t)) - while name/value - collect (list (car name/value) (cdr name/value) parameters)))) + (let ((*current-error-message* (format nil "While parsing cookie header ~S:" string)) + result) + (dolist (substring (split-set-cookie-string string)) + (with-sequence-from-string (stream substring) + (let* ((name/value (read-name-value-pair stream :cookie-syntax t)) + (parameters (read-name-value-pairs stream :value-required-p nil :cookie-syntax t))) + (push (list (car name/value) (cdr name/value) parameters) result)))) + (nreverse result))) (defun get-cookies (headers uri) "Returns a list of COOKIE objects corresponding to the Modified: trunk/thirdparty/drakma/util.lisp =================================================================== --- trunk/thirdparty/drakma/util.lisp 2009-12-01 21:58:01 UTC (rev 4478) +++ trunk/thirdparty/drakma/util.lisp 2009-12-01 22:06:56 UTC (rev 4479) @@ -279,4 +279,49 @@ WITH-INPUT-FROM-STRING, but creates a sequence of octets that works with CHUNGA::PEEK-CHAR* and friends." `(flex:with-input-from-sequence (,stream (map 'list #'char-code ,string)) - ,@body)) \ No newline at end of file + ,@body)) + +(defun split-set-cookie-string (string) + "Splits the string STRING which is assumed to be the value of a +`Set-Cookie' into parts corresponding to individual cookies and +returns a list of these parts \(substrings). + +The string /should/ be split at commas, but heuristical approach is +used instead which doesn't split at commas which are followed by what +cannot be recognized as the start of the next cookie. This is +necessary because servers send headers containing unquoted commas +which are not meant as separators." + ;; this would of course be a lot easier with CL-PPCRE's SPLIT + (let ((cookie-start 0) + (string-length (length string)) + search-start + result) + (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 + (setq search-start cookie-start) + ;; we reach this point if the last comma didn't separate two + ;; cookies or if there was no previous comma + skip-comma + (unless (< search-start string-length) + (return-from split-set-cookie-string (nreverse result))) + ;; look is there's a comma + (let* ((comma-pos (position #\, string :start search-start)) + ;; and if so, look for a #\= behind the comma + (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 + (every 'token-char-p + (trim-whitespace string + :start (1+ comma-pos) + :end equals-pos))))) + (when (and comma-pos (not new-cookie-start-p)) + (setq search-start (1+ comma-pos)) + (go skip-comma)) + (let ((end-pos (or comma-pos string-length))) + (push (trim-whitespace (subseq string cookie-start end-pos)) result) + (setq cookie-start (1+ end-pos)) + (go next-cookie)))))) +

1 0

[bknr-cvs] edi changed trunk/thirdparty/chunga/
by BKNR Commits 01 Dec '09

01 Dec '09

Revision: 4478 Author: edi URL: http://bknr.net/trac/changeset/4478 Changes for cookie parsing U trunk/thirdparty/chunga/CHANGELOG.txt U trunk/thirdparty/chunga/doc/index.html U trunk/thirdparty/chunga/packages.lisp U trunk/thirdparty/chunga/read.lisp U trunk/thirdparty/chunga/util.lisp Modified: trunk/thirdparty/chunga/CHANGELOG.txt =================================================================== --- trunk/thirdparty/chunga/CHANGELOG.txt 2009-11-30 13:24:17 UTC (rev 4477) +++ trunk/thirdparty/chunga/CHANGELOG.txt 2009-12-01 21:58:01 UTC (rev 4478) @@ -1,3 +1,7 @@ +Exported TOKEN-CHAR-P +Allowed START and END keyword arguments for TRIM-WHITESPACE +Simplified cookie value parsing + Version 1.0.0 2009-02-19 Switched to binary streams underneath and got rid of FLEXI-STREAMS dependency Modified: trunk/thirdparty/chunga/doc/index.html =================================================================== --- trunk/thirdparty/chunga/doc/index.html 2009-11-30 13:24:17 UTC (rev 4477) +++ trunk/thirdparty/chunga/doc/index.html 2009-12-01 21:58:01 UTC (rev 4478) @@ -85,6 +85,7 @@ <li><a href="#with-character-stream-semantics"><code>with-character-stream-semantics</code></a> <li><a href="#read-line*"><code>read-line*</code></a> <li><a href="#read-http-headers"><code>read-http-headers</code></a> + <li><a href="#token-char-p"><code>token-char-p</code></a> <li><a href="#read-token"><code>read-token</code></a> <li><a href="#read-name-value-pair"><code>read-name-value-pair</code></a> <li><a href="#read-name-value-pairs"><code>read-name-value-pairs</code></a> @@ -542,6 +543,19 @@  + + + [Function] <a class=none name='token-char-p'>token-char-p char => generalized-boolean</a> +<blockquote> + +Returns a true value if the Lisp character CHAR is a token constituent +according to +<a href="http://www.rfc.net/rfc2616.html">RFC 2616</a>. + +</blockquote> + + +  [Function] <a class=none name='read-name-value-pair'>read-name-value-pair stream <tt>&key</tt> value-required-p cookie-syntax => pair</a> @@ -662,10 +676,10 @@  - [Function] <a class=none name='trim-whitespace'>trim-whitespace string => string'</a> + [Function] <a class=none name='trim-whitespace'>trim-whitespace string <tt>&key</tt> start end => string'</a> <blockquote> -Returns a version of the string <code>string</code> where spaces and tab +Returns a version of the string <code>string</code> (between <code>start</code> and <code>end</code>) where spaces and tab characters are trimmed from the start and the end. </blockquote> Modified: trunk/thirdparty/chunga/packages.lisp =================================================================== --- trunk/thirdparty/chunga/packages.lisp 2009-11-30 13:24:17 UTC (rev 4477) +++ trunk/thirdparty/chunga/packages.lisp 2009-12-01 21:58:01 UTC (rev 4478) @@ -62,6 +62,7 @@ :read-token :skip-whitespace :syntax-error + :token-char-p :trim-whitespace :with-character-stream-semantics)) Modified: trunk/thirdparty/chunga/read.lisp =================================================================== --- trunk/thirdparty/chunga/read.lisp 2009-11-30 13:24:17 UTC (rev 4477) +++ trunk/thirdparty/chunga/read.lisp 2009-12-01 21:58:01 UTC (rev 4478) @@ -120,10 +120,10 @@ (finish-output log-stream)) result)) -(defun trim-whitespace (string) - "Returns a version of the string STRING where spaces and tab -characters are trimmed from the start and the end. Might return -STRING." +(defun trim-whitespace (string &key (start 0) (end (length string))) + "Returns a version of the string STRING \(between START and END) +where spaces and tab characters are trimmed from the start and the +end. Might return STRING." ;; optimized version to replace STRING-TRIM, suggested by Jason Kantz (declare (optimize speed @@ -133,18 +133,18 @@ (compilation-speed 0) #+:lispworks (hcl:fixnum-safety 0))) (declare (string string)) - (let* ((length (length string)) - (start (loop for i of-type fixnum from 0 below length - while (or (char= #\space (char string i)) - (char= #\tab (char string i))) - finally (return i))) - (end (loop for i of-type fixnum downfrom (1- length) to 0 - while (or (char= #\space (char string i)) - (char= #\tab (char string i))) - finally (return (1+ i))))) - (declare (fixnum start end)) - (cond ((and (zerop start) (= end length)) string) - (t (subseq string start end))))) + (let* ((start% (loop for i of-type fixnum from start below end + while (or (char= #\space (char string i)) + (char= #\tab (char string i))) + finally (return i))) + (end% (loop for i of-type fixnum downfrom (1- end) to start + while (or (char= #\space (char string i)) + (char= #\tab (char string i))) + finally (return (1+ i))))) + (declare (fixnum start% end%)) + (cond ((and (zerop start%) (= end% (length string))) string) + ((> start% end%) "") + (t (subseq string start% end%))))) (defun read-http-headers (stream &optional log-stream) "Reads HTTP header lines from STREAM \(except for the initial @@ -243,24 +243,14 @@ (signal-unexpected-chars stream char '(#\Space #\Tab))))) (otherwise (write-char char out)))))) -(defun read-cookie-value (stream &key name separators) +(defun read-cookie-value (stream &key (separators ";")) "Reads a cookie parameter value from STREAM which is returned as a -string. Simply reads until a comma or a semicolon is seen \(or an -element of SEPARATORS)." - (when (eql #\, (peek-char* stream nil)) - (return-from read-cookie-value "")) +string. Simply reads until a semicolon is seen \(or an element of +SEPARATORS)." (trim-whitespace (with-output-to-string (out) - ;; special case for the `Expires' parameter - maybe skip the first comma - (loop with separators% = (cond (separators) - ((equalp name "Expires") ";") - (t ",;")) - for char = (peek-char* stream nil) - until (or (null char) (find char separators% :test #'char=)) - when (and (null separators) - (or (char= char #\,) - (digit-char-p char))) - do (setq separators% '(#\, #\;)) + (loop for char = (peek-char* stream nil) + until (or (null char) (find char separators :test #'char=)) do (write-char (read-char* stream) out))))) (defun read-name-value-pair (stream &key (value-required-p t) cookie-syntax) @@ -272,7 +262,7 @@ internally." (skip-whitespace stream) (let ((name (if cookie-syntax - (read-cookie-value stream :separators "=,") + (read-cookie-value stream :separators "=") (read-token stream)))) (skip-whitespace stream) (cons name @@ -280,7 +270,7 @@ (eql (peek-char* stream nil) #\=)) (assert-char stream #\=) (skip-whitespace stream) - (cond (cookie-syntax (read-cookie-value stream :name name)) + (cond (cookie-syntax (read-cookie-value stream)) ((char= (peek-char* stream) #\") (read-quoted-string stream)) (t (read-token stream))))))) Modified: trunk/thirdparty/chunga/util.lisp =================================================================== --- trunk/thirdparty/chunga/util.lisp 2009-11-30 13:24:17 UTC (rev 4477) +++ trunk/thirdparty/chunga/util.lisp 2009-12-01 21:58:01 UTC (rev 4478) @@ -90,4 +90,4 @@ READ-CHAR* and friends \(see above) to simulate a character stream although we're reading from a binary stream." `(let ((*char-buffer* nil)) - ,@body)) \ No newline at end of file + ,@body))

1 0