bknr-cvs

bknr-cvs@common-lisp.net

1964 discussions

Start a nNew thread

[bknr-cvs] edi changed tags/thirdparty/chunga-1.1.1/
by BKNR Commits 19 May '10

19 May '10

Revision: 4542 Author: edi URL: http://bknr.net/trac/changeset/4542 Tag Chunga 1.1.1 A tags/thirdparty/chunga-1.1.1/

1 0

[bknr-cvs] edi changed trunk/thirdparty/chunga/
by BKNR Commits 19 May '10

19 May '10

Revision: 4541 Author: edi URL: http://bknr.net/trac/changeset/4541 Prepare for 1.1.1 release U trunk/thirdparty/chunga/CHANGELOG.txt U trunk/thirdparty/chunga/chunga.asd U trunk/thirdparty/chunga/conditions.lisp U trunk/thirdparty/chunga/doc/index.html U trunk/thirdparty/chunga/input.lisp U trunk/thirdparty/chunga/known-words.lisp U trunk/thirdparty/chunga/output.lisp U trunk/thirdparty/chunga/packages.lisp U trunk/thirdparty/chunga/read.lisp U trunk/thirdparty/chunga/specials.lisp U trunk/thirdparty/chunga/streams.lisp U trunk/thirdparty/chunga/util.lisp Modified: trunk/thirdparty/chunga/CHANGELOG.txt =================================================================== --- trunk/thirdparty/chunga/CHANGELOG.txt 2010-05-19 15:37:07 UTC (rev 4540) +++ trunk/thirdparty/chunga/CHANGELOG.txt 2010-05-19 15:39:41 UTC (rev 4541) @@ -1,3 +1,5 @@ +Version 1.1.1 +2010-05-19 Read quoted cookie values (Red Daly) Version 1.1.0 Modified: trunk/thirdparty/chunga/chunga.asd =================================================================== --- trunk/thirdparty/chunga/chunga.asd 2010-05-19 15:37:07 UTC (rev 4540) +++ trunk/thirdparty/chunga/chunga.asd 2010-05-19 15:39:41 UTC (rev 4541) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/chunga/chunga.asd,v 1.20 2008/05/24 18:38:30 edi Exp $ -;;; Copyright (c) 2006-2009, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2006-2010, Dr. Edmund Weitz. All rights reserved. ;;; Redistribution and use in source and binary forms, with or without ;;; modification, are permitted provided that the following conditions @@ -29,7 +29,7 @@ (asdf:defsystem :chunga :serial t - :version "1.1.0" + :version "1.1.1" :depends-on (:trivial-gray-streams) :components ((:file "packages") (:file "specials") Modified: trunk/thirdparty/chunga/conditions.lisp =================================================================== --- trunk/thirdparty/chunga/conditions.lisp 2010-05-19 15:37:07 UTC (rev 4540) +++ trunk/thirdparty/chunga/conditions.lisp 2010-05-19 15:39:41 UTC (rev 4541) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: ODD-STREAMS; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/odd-streams/conditions.lisp,v 1.5 2007/12/31 01:08:45 edi Exp $ -;;; Copyright (c) 2008-2009, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2008-2010, Dr. Edmund Weitz. All rights reserved. ;;; Redistribution and use in source and binary forms, with or without ;;; modification, are permitted provided that the following conditions Modified: trunk/thirdparty/chunga/doc/index.html =================================================================== --- trunk/thirdparty/chunga/doc/index.html 2010-05-19 15:37:07 UTC (rev 4540) +++ trunk/thirdparty/chunga/doc/index.html 2010-05-19 15:39:41 UTC (rev 4541) @@ -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.1.0. (This version is not compatible with +current version is 1.1.1. (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 Modified: trunk/thirdparty/chunga/input.lisp =================================================================== --- trunk/thirdparty/chunga/input.lisp 2010-05-19 15:37:07 UTC (rev 4540) +++ trunk/thirdparty/chunga/input.lisp 2010-05-19 15:39:41 UTC (rev 4541) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CHUNGA; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/chunga/input.lisp,v 1.18 2008/05/24 03:06:22 edi Exp $ -;;; Copyright (c) 2006-2009, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2006-2010, Dr. Edmund Weitz. All rights reserved. ;;; Redistribution and use in source and binary forms, with or without ;;; modification, are permitted provided that the following conditions Modified: trunk/thirdparty/chunga/known-words.lisp =================================================================== --- trunk/thirdparty/chunga/known-words.lisp 2010-05-19 15:37:07 UTC (rev 4540) +++ trunk/thirdparty/chunga/known-words.lisp 2010-05-19 15:39:41 UTC (rev 4541) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CHUNGA; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/chunga/known-words.lisp,v 1.3 2008/05/29 22:21:09 edi Exp $ -;;; Copyright (c) 2006-2009, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2006-2010, Dr. Edmund Weitz. All rights reserved. ;;; Redistribution and use in source and binary forms, with or without ;;; modification, are permitted provided that the following conditions Modified: trunk/thirdparty/chunga/output.lisp =================================================================== --- trunk/thirdparty/chunga/output.lisp 2010-05-19 15:37:07 UTC (rev 4540) +++ trunk/thirdparty/chunga/output.lisp 2010-05-19 15:39:41 UTC (rev 4541) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CHUNGA; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/chunga/output.lisp,v 1.14 2008/05/24 03:06:22 edi Exp $ -;;; Copyright (c) 2006-2009, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2006-2010, Dr. Edmund Weitz. All rights reserved. ;;; Redistribution and use in source and binary forms, with or without ;;; modification, are permitted provided that the following conditions Modified: trunk/thirdparty/chunga/packages.lisp =================================================================== --- trunk/thirdparty/chunga/packages.lisp 2010-05-19 15:37:07 UTC (rev 4540) +++ trunk/thirdparty/chunga/packages.lisp 2010-05-19 15:39:41 UTC (rev 4541) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/chunga/packages.lisp,v 1.19 2008/05/24 18:38:30 edi Exp $ -;;; Copyright (c) 2006-2009, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2006-2010, Dr. Edmund Weitz. All rights reserved. ;;; Redistribution and use in source and binary forms, with or without ;;; modification, are permitted provided that the following conditions Modified: trunk/thirdparty/chunga/read.lisp =================================================================== --- trunk/thirdparty/chunga/read.lisp 2010-05-19 15:37:07 UTC (rev 4540) +++ trunk/thirdparty/chunga/read.lisp 2010-05-19 15:39:41 UTC (rev 4541) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CHUNGA; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/chunga/read.lisp,v 1.22 2008/05/26 08:18:00 edi Exp $ -;;; Copyright (c) 2006-2009, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2006-2010, Dr. Edmund Weitz. All rights reserved. ;;; Redistribution and use in source and binary forms, with or without ;;; modification, are permitted provided that the following conditions @@ -247,8 +247,7 @@ "Reads a cookie parameter value from STREAM which is returned as a string. Simply reads until a semicolon is seen \(or an element of SEPARATORS). Also reads quoted strings if the first non-whitespace -character is a quotation mark \(as in RFC 2109) at -http://www.w3.org/Protocols/rfc2109/rfc2109" +character is a quotation mark \(as in RFC 2109)." (if (char= #\" (peek-char* stream)) (read-quoted-string stream) (trim-whitespace Modified: trunk/thirdparty/chunga/specials.lisp =================================================================== --- trunk/thirdparty/chunga/specials.lisp 2010-05-19 15:37:07 UTC (rev 4540) +++ trunk/thirdparty/chunga/specials.lisp 2010-05-19 15:39:41 UTC (rev 4541) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CHUNGA; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/chunga/specials.lisp,v 1.12 2008/05/24 03:06:22 edi Exp $ -;;; Copyright (c) 2006-2009, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2006-2010, Dr. Edmund Weitz. All rights reserved. ;;; Redistribution and use in source and binary forms, with or without ;;; modification, are permitted provided that the following conditions Modified: trunk/thirdparty/chunga/streams.lisp =================================================================== --- trunk/thirdparty/chunga/streams.lisp 2010-05-19 15:37:07 UTC (rev 4540) +++ trunk/thirdparty/chunga/streams.lisp 2010-05-19 15:39:41 UTC (rev 4541) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CHUNGA; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/chunga/streams.lisp,v 1.10 2008/05/24 03:06:22 edi Exp $ -;;; Copyright (c) 2006-2009, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2006-2010, Dr. Edmund Weitz. All rights reserved. ;;; Redistribution and use in source and binary forms, with or without ;;; modification, are permitted provided that the following conditions Modified: trunk/thirdparty/chunga/util.lisp =================================================================== --- trunk/thirdparty/chunga/util.lisp 2010-05-19 15:37:07 UTC (rev 4540) +++ trunk/thirdparty/chunga/util.lisp 2010-05-19 15:39:41 UTC (rev 4541) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CHUNGA; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/chunga/util.lisp,v 1.12 2008/05/25 10:53:48 edi Exp $ -;;; Copyright (c) 2006-2009, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2006-2010, Dr. Edmund Weitz. All rights reserved. ;;; Redistribution and use in source and binary forms, with or without ;;; modification, are permitted provided that the following conditions

1 0

[bknr-cvs] edi changed trunk/thirdparty/chunga/
by BKNR Commits 19 May '10

19 May '10

Revision: 4540 Author: edi URL: http://bknr.net/trac/changeset/4540 Quoted cookie values U trunk/thirdparty/chunga/CHANGELOG.txt U trunk/thirdparty/chunga/read.lisp Modified: trunk/thirdparty/chunga/CHANGELOG.txt =================================================================== --- trunk/thirdparty/chunga/CHANGELOG.txt 2010-05-19 15:31:48 UTC (rev 4539) +++ trunk/thirdparty/chunga/CHANGELOG.txt 2010-05-19 15:37:07 UTC (rev 4540) @@ -1,3 +1,5 @@ +Read quoted cookie values (Red Daly) + Version 1.1.0 2009-12-01 Exported TOKEN-CHAR-P Modified: trunk/thirdparty/chunga/read.lisp =================================================================== --- trunk/thirdparty/chunga/read.lisp 2010-05-19 15:31:48 UTC (rev 4539) +++ trunk/thirdparty/chunga/read.lisp 2010-05-19 15:37:07 UTC (rev 4540) @@ -246,12 +246,16 @@ (defun read-cookie-value (stream &key (separators ";")) "Reads a cookie parameter value from STREAM which is returned as a string. Simply reads until a semicolon is seen \(or an element of -SEPARATORS)." - (trim-whitespace - (with-output-to-string (out) - (loop for char = (peek-char* stream nil) - until (or (null char) (find char separators :test #'char=)) - do (write-char (read-char* stream) out))))) +SEPARATORS). Also reads quoted strings if the first non-whitespace +character is a quotation mark \(as in RFC 2109) at +http://www.w3.org/Protocols/rfc2109/rfc2109" + (if (char= #\" (peek-char* stream)) + (read-quoted-string stream) + (trim-whitespace + (with-output-to-string (out) + (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) "Reads a typical \(in RFC 2616) name/value or attribute/value

1 0

[bknr-cvs] edi changed tags/thirdparty/drakma-1.2.0/
by BKNR Commits 19 May '10

19 May '10

Revision: 4539 Author: edi URL: http://bknr.net/trac/changeset/4539 Tag Drakma 1.2.0 A tags/thirdparty/drakma-1.2.0/

1 0

[bknr-cvs] edi changed trunk/thirdparty/drakma/
by BKNR Commits 19 May '10

19 May '10

Revision: 4538 Author: edi URL: http://bknr.net/trac/changeset/4538 Prepare for 1.2.0 release 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 2010-05-19 15:18:08 UTC (rev 4537) +++ trunk/thirdparty/drakma/CHANGELOG.txt 2010-05-19 15:30:10 UTC (rev 4538) @@ -1,9 +1,11 @@ +Version 1.2.0 +2010-05-19 Introduced *REMOVE-DUPLICATE-COOKIES-P* (Ryan Davis) -Enable https through a proxy (Bill St. Clair and Dave Lambert) +Enabled https through a proxy (Bill St. Clair and Dave Lambert) Bugfix for redirect of a request through a proxy (Bill St. Clair) Export PARSE-COOKIE-DATE Safer method to render URIs -Allow for GET/POST parameters without a value (seen on Lotus webservers) +Allowed for GET/POST parameters without a value (seen on Lotus webservers) Version 1.1.0 2009-12-01 Modified: trunk/thirdparty/drakma/doc/index.html =================================================================== --- trunk/thirdparty/drakma/doc/index.html 2010-05-19 15:18:08 UTC (rev 4537) +++ trunk/thirdparty/drakma/doc/index.html 2010-05-19 15:30:10 UTC (rev 4538) @@ -656,12 +656,12 @@ 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.1.0. Drakma can be installed +The current version is 1.2.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>, +on <a href="http://www.cliki.net/kmrcl">KMRCL</a>), <a href="http://www.cliki.net/Puri">Puri</a> (1.5.5 or higher), <a href="http://weitz.de/flexi-streams/">FLEXI-STREAMS</a>, 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 Modified: trunk/thirdparty/drakma/drakma.asd =================================================================== --- trunk/thirdparty/drakma/drakma.asd 2010-05-19 15:18:08 UTC (rev 4537) +++ trunk/thirdparty/drakma/drakma.asd 2010-05-19 15:30:10 UTC (rev 4538) @@ -38,7 +38,7 @@ (in-package :drakma-asd) -(defvar *drakma-version-string* "1.1.0" +(defvar *drakma-version-string* "1.2.0" "Drakma's version number as a string.") ;; we export its name so we can import it later

1 0

[bknr-cvs] edi changed trunk/thirdparty/drakma/
by BKNR Commits 19 May '10

19 May '10

Revision: 4537 Author: edi URL: http://bknr.net/trac/changeset/4537 Cosmetics again U trunk/thirdparty/drakma/cookies.lisp U trunk/thirdparty/drakma/doc/index.html U trunk/thirdparty/drakma/specials.lisp Modified: trunk/thirdparty/drakma/cookies.lisp =================================================================== --- trunk/thirdparty/drakma/cookies.lisp 2010-05-19 14:53:27 UTC (rev 4536) +++ trunk/thirdparty/drakma/cookies.lisp 2010-05-19 15:18:08 UTC (rev 4537) @@ -258,14 +258,6 @@ (push (list (car name/value) (cdr name/value) parameters) result)))) (nreverse result))) -(defvar *remove-duplicate-cookies-p* T - "Determines how duplicate cookies are handled. Valid values are: - * nil - duplicates will not be removed - * (T :KEEP-LAST) - for duplicates, only the last cookie value will be kept, - based on the order of the response header - * :KEEP-FIRST - for duplicates, only the first cookie value will be kept, - based on the order of the response header") - (defun get-cookies (headers uri) "Returns a list of COOKIE objects corresponding to the `Set-Cookie' header as found in HEADERS \(an alist as returned by Modified: trunk/thirdparty/drakma/doc/index.html =================================================================== --- trunk/thirdparty/drakma/doc/index.html 2010-05-19 14:53:27 UTC (rev 4536) +++ trunk/thirdparty/drakma/doc/index.html 2010-05-19 15:18:08 UTC (rev 4537) @@ -1364,13 +1364,11 @@ Valid values are: <ul> - <li><code>NIL</code> - duplicates will not be removed</li> - <li><code>T</code> - for duplicates, only the last cookie value will - be kept, based on the order of the response header</li> - <li><code>:KEEP-LAST</code> - for duplicates, only the last cookie - value will be kept, based on the order of the response header</li> + <li><code>NIL</code> - duplicates will not be removed,</li> + <li><code>T</code> or <code>:KEEP-LAST</code> - for duplicates, only the last cookie + value will be kept, based on the order of the response header,</li> <li><code>:KEEP-FIRST</code> - for duplicates, only the first cookie - value will be kept, based on the order of the response header</li> + value will be kept, based on the order of the response header.</li> </ul> Misbehaving servers may send duplicate cookies back in the same Modified: trunk/thirdparty/drakma/specials.lisp =================================================================== --- trunk/thirdparty/drakma/specials.lisp 2010-05-19 14:53:27 UTC (rev 4536) +++ trunk/thirdparty/drakma/specials.lisp 2010-05-19 15:18:08 UTC (rev 4537) @@ -82,6 +82,13 @@ variable is NIL \(which is the default), an error will be signalled instead.") +(defvar *remove-duplicate-cookies-p* t + "Determines how duplicate cookies are handled. Valid values are NIL +\(duplicates will not be removed), :KEEP-LAST or T \(for duplicates, +only the last cookie value will be kept based on the order of the +response header), or :KEEP-FIRST (only the first value will be +kept).") + (defvar *text-content-types* '(("text" . nil)) "A list of conses which are used by DETERMINE-BODY-FORMAT to decide whether a `Content-Type' header denotes text content. The car and cdr

1 0

[bknr-cvs] edi changed trunk/thirdparty/drakma/
by BKNR Commits 19 May '10

19 May '10

Revision: 4536 Author: edi URL: http://bknr.net/trac/changeset/4536 Duplicate cookies U trunk/thirdparty/drakma/CHANGELOG.txt U trunk/thirdparty/drakma/cookies.lisp U trunk/thirdparty/drakma/doc/index.html U trunk/thirdparty/drakma/packages.lisp Modified: trunk/thirdparty/drakma/CHANGELOG.txt =================================================================== --- trunk/thirdparty/drakma/CHANGELOG.txt 2010-05-19 14:48:37 UTC (rev 4535) +++ trunk/thirdparty/drakma/CHANGELOG.txt 2010-05-19 14:53:27 UTC (rev 4536) @@ -1,3 +1,4 @@ +Introduced *REMOVE-DUPLICATE-COOKIES-P* (Ryan Davis) Enable https through a proxy (Bill St. Clair and Dave Lambert) Bugfix for redirect of a request through a proxy (Bill St. Clair) Export PARSE-COOKIE-DATE Modified: trunk/thirdparty/drakma/cookies.lisp =================================================================== --- trunk/thirdparty/drakma/cookies.lisp 2010-05-19 14:48:37 UTC (rev 4535) +++ trunk/thirdparty/drakma/cookies.lisp 2010-05-19 14:53:27 UTC (rev 4536) @@ -258,6 +258,14 @@ (push (list (car name/value) (cdr name/value) parameters) result)))) (nreverse result))) +(defvar *remove-duplicate-cookies-p* T + "Determines how duplicate cookies are handled. Valid values are: + * nil - duplicates will not be removed + * (T :KEEP-LAST) - for duplicates, only the last cookie value will be kept, + based on the order of the response header + * :KEEP-FIRST - for duplicates, only the first cookie value will be kept, + based on the order of the response header") + (defun get-cookies (headers uri) "Returns a list of COOKIE objects corresponding to the `Set-Cookie' header as found in HEADERS \(an alist as returned by @@ -281,7 +289,13 @@ (parse-cookie-date expires)) :domain domain :securep (not (not (parameter-present-p "secure" parameters))) - :http-only-p (not (not (parameter-present-p "HttpOnly" parameters)))))) + :http-only-p (not (not (parameter-present-p "HttpOnly" parameters)))) + into new-cookies + finally (return (ccase *remove-duplicate-cookies-p* + ((nil) new-cookies) + ((:keep-last t) (delete-duplicates new-cookies :test #'cookie=)) + (:keep-first (delete-duplicates new-cookies :test #'cookie= + :from-end T)))))) (defun update-cookies (new-cookies cookie-jar) "Updates the cookies in COOKIE-JAR by replacing those which are Modified: trunk/thirdparty/drakma/doc/index.html =================================================================== --- trunk/thirdparty/drakma/doc/index.html 2010-05-19 14:48:37 UTC (rev 4535) +++ trunk/thirdparty/drakma/doc/index.html 2010-05-19 14:53:27 UTC (rev 4536) @@ -86,6 +86,7 @@ <li><a href="#delete-old-cookies"><code>delete-old-cookies</code></a> <li><a href="#*allow-dotless-cookie-domains-p*"><code>*allow-dotless-cookie-domains-p*</code></a> <li><a href="#*ignore-unparseable-cookie-dates-p*"><code>*ignore-unparseable-cookie-dates-p*</code></a> + <li><a href="#*remove-duplicate-cookies-p*"><code>*remove-duplicate-cookies-p*</code></a> <li><a href="#parse-cookie-date"><code>parse-cookie-date</code></a> </ol> <li><a href="#headers">Headers</a> @@ -1352,6 +1353,59 @@  + + + + [Special variable] <a class=none name='*remove-duplicate-cookies-p*'>*remove-duplicate-cookies-p*</a> +<blockquote> +Determines how duplicate cookies in the response are handled, defaults +to <code>T</code>. Cookies are considered duplicate using +<a href="#cookie="><code>COOKIE=</code></a>. + +Valid values are: +<ul> + <li><code>NIL</code> - duplicates will not be removed</li> + <li><code>T</code> - for duplicates, only the last cookie value will + be kept, based on the order of the response header</li> + <li><code>:KEEP-LAST</code> - for duplicates, only the last cookie + value will be kept, based on the order of the response header</li> + <li><code>:KEEP-FIRST</code> - for duplicates, only the first cookie + value will be kept, based on the order of the response header</li> +</ul> + +Misbehaving servers may send duplicate cookies back in the same +<code>Set-Cookie</code> header: +<pre> +HTTP/1.1 200 OK +Server: My-hand-rolled-server +Date: Wed, 07 Apr 2010 15:12:30 GMT +Connection: Close +Content-Type: text/html +Content-Length: 82 +Set-Cookie: a=1; Path=/; Secure, a=2; Path=/; Secure +</pre> + +In this case Drakma has to choose whether cookie "a" has the value +"1" or "2". By default, Drakma will choose the last value specified, +in this case "2". + + +By default, Drakma conforms to <a href="http://www.ietf.org/rfc/rfc2109.txt">RFC2109 HTTP State +Management Mechanism</a>, section 4.3.3 Cookie Management: +<blockquote> +If a user agent receives a Set-Cookie response header whose NAME is +the same as a pre-existing cookie, and whose Domain and Path +attribute values exactly (string) match those of a pre-existing +cookie, the new cookie supersedes the old. +</blockquote> + + +</blockquote> + + + + + <h4><a name="headers" class=none>Headers</a></h4> This section assembles a couple of convenience functions which can be Modified: trunk/thirdparty/drakma/packages.lisp =================================================================== --- trunk/thirdparty/drakma/packages.lisp 2010-05-19 14:48:37 UTC (rev 4535) +++ trunk/thirdparty/drakma/packages.lisp 2010-05-19 14:53:27 UTC (rev 4536) @@ -36,6 +36,7 @@ (:shadow :syntax-error :parameter-error) (:export :*allow-dotless-cookie-domains-p* :*body-format-function* + :*remove-duplicate-cookies-p* :*drakma-default-external-format* :*header-stream* :*ignore-unparseable-cookie-dates-p*

1 0

[bknr-cvs] edi changed trunk/thirdparty/drakma/
by BKNR Commits 19 May '10

19 May '10

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

1 0

[bknr-cvs] edi changed trunk/thirdparty/drakma/
by BKNR Commits 19 May '10

19 May '10

Revision: 4534 Author: edi URL: http://bknr.net/trac/changeset/4534 Cosmetics 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:02:27 UTC (rev 4533) +++ trunk/thirdparty/drakma/request.lisp 2010-05-19 14:23:08 UTC (rev 4534) @@ -430,7 +430,7 @@ (t (setq content (alist-to-url-encoded-string parameters external-format-out) content-type "application/x-www-form-urlencoded"))))) - (let ((proxying-https? (and proxy (not stream) (eq :https (puri:uri-scheme uri)))) + (let ((proxying-https-p (and proxy (not stream) (eq :https (puri:uri-scheme uri)))) http-stream raw-http-stream must-close done) (unwind-protect (progn @@ -439,7 +439,7 @@ (port (cond (proxy (second proxy)) ((uri-port uri)) (t (default-port uri)))) - (use-ssl (and (not proxying-https?) + (use-ssl (and (not proxying-https-p) (or force-ssl (eq (uri-scheme uri) :https))))) #+(and :lispworks5.0 :mswindows @@ -473,7 +473,7 @@ ;; it may have been initialized by SOCKET-CONNECT ;; already - the stream may have been passed in by the ;; user and the user may want to adjust the deadline - ;; for every request. + ;; for every request (setf (ccl:stream-deadline http-stream) deadline)) (labels ((write-http-line (fmt &rest args) (when *header-stream* @@ -481,19 +481,6 @@ (format http-stream "~?~C~C" fmt args #\Return #\Linefeed)) (write-header (name value-fmt &rest value-args) (write-http-line "~A: ~?" name value-fmt value-args)) - (make-ssl-stream (http-stream) - #+:lispworks - (progn - (comm:attach-ssl http-stream :ssl-side :client) - http-stream) - #-:lispworks - #+:allegro - (socket:make-ssl-client-stream http-stream) - #-:allegro - (let ((s http-stream)) - (cl+ssl:make-ssl-client-stream - (cl+ssl:stream-fd s) - :close-callback (lambda () (close s))))) (wrap-stream (http-stream) (make-flexi-stream (make-chunked-stream http-stream) :external-format +latin-1+))) @@ -507,21 +494,20 @@ (flexi-stream-external-format http-stream) +latin-1+)) (t (setq http-stream (wrap-stream http-stream)))) - (when proxying-https? - ;; Setup a tunnel through the proxy server to the - ;; final destination. - (write-http-line "CONNECT ~A:~A HTTP/1.1" (puri:uri-host uri) - (or (puri:uri-port uri) 443)) - (write-http-line "Host: ~A:~A" (puri:uri-host uri) - (or (puri:uri-port uri) 443)) + (when proxying-https-p + ;; set up a tunnel through the proxy server to the + ;; final destination + (write-http-line "CONNECT ~A:~:[443~;~:*~A~] HTTP/1.1" + (uri-host uri) (uri-port uri)) + (write-http-line "Host: ~A:~:[443~;~:*~A~]" + (uri-host uri) (uri-port uri)) (write-http-line "") (force-output http-stream) - ;; Check we get a 200 response before proceeding. - (let ((line (read-status-line http-stream *header-stream*))) - (unless (eq (second line) 200) - (error "Unable to establish HTTPS tunnel through proxy."))) - ;; Got a connection. We have to read a blank line, - ;; turn on SSL, and then we can transmit. + ;; check we get a 200 response before proceeding + (unless (eql (second (read-status-line http-stream *header-stream*)) 200) + (error "Unable to establish HTTPS tunnel through proxy.")) + ;; got a connection; we have to read a blank line, + ;; turn on SSL, and then we can transmit (read-line* http-stream) (setq http-stream (wrap-stream (make-ssl-stream raw-http-stream)))) (when (and (not parameters-used-p) @@ -539,8 +525,8 @@ (write-http-line "~A ~A ~A" (string-upcase method) (render-uri (cond ((and proxy - (not stream) - (not proxying-https?)) uri) + (null stream) + (not proxying-https-p)) uri) (t (copy-uri uri :scheme nil :host nil Modified: trunk/thirdparty/drakma/util.lisp =================================================================== --- trunk/thirdparty/drakma/util.lisp 2010-05-19 14:02:27 UTC (rev 4533) +++ trunk/thirdparty/drakma/util.lisp 2010-05-19 14:23:08 UTC (rev 4534) @@ -325,4 +325,25 @@ (push (trim-whitespace (subseq string cookie-start end-pos)) result) (setq cookie-start (1+ end-pos)) (go next-cookie)))))) - + +#+: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)." + (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)." + (let ((s http-stream)) + (cl+ssl:make-ssl-client-stream + (cl+ssl:stream-fd s) + :close-callback (lambda () (close s))))) \ No newline at end of file

1 0

[bknr-cvs] edi changed trunk/thirdparty/drakma/
by BKNR Commits 19 May '10

19 May '10

Revision: 4533 Author: edi URL: http://bknr.net/trac/changeset/4533 https through proxy U trunk/thirdparty/drakma/CHANGELOG.txt U trunk/thirdparty/drakma/request.lisp Modified: trunk/thirdparty/drakma/CHANGELOG.txt =================================================================== --- trunk/thirdparty/drakma/CHANGELOG.txt 2010-05-18 05:07:49 UTC (rev 4532) +++ trunk/thirdparty/drakma/CHANGELOG.txt 2010-05-19 14:02:27 UTC (rev 4533) @@ -1,3 +1,5 @@ +Enable https through a proxy (Bill St. Clair and Dave Lambert) +Bugfix for redirect of a request through a proxy (Bill St. Clair) Export PARSE-COOKIE-DATE Safer method to render URIs Allow for GET/POST parameters without a value (seen on Lotus webservers) Modified: trunk/thirdparty/drakma/request.lisp =================================================================== --- trunk/thirdparty/drakma/request.lisp 2010-05-18 05:07:49 UTC (rev 4532) +++ trunk/thirdparty/drakma/request.lisp 2010-05-19 14:02:27 UTC (rev 4533) @@ -430,7 +430,8 @@ (t (setq content (alist-to-url-encoded-string parameters external-format-out) content-type "application/x-www-form-urlencoded"))))) - (let (http-stream must-close done) + (let ((proxying-https? (and proxy (not stream) (eq :https (puri:uri-scheme uri)))) + http-stream raw-http-stream must-close done) (unwind-protect (progn (let ((host (or (and proxy (first proxy)) @@ -438,8 +439,9 @@ (port (cond (proxy (second proxy)) ((uri-port uri)) (t (default-port uri)))) - (use-ssl (or force-ssl - (eq (uri-scheme uri) :https)))) + (use-ssl (and (not proxying-https?) + (or force-ssl + (eq (uri-scheme uri) :https))))) #+(and :lispworks5.0 :mswindows (not :lw-does-not-have-write-timeout)) (when use-ssl @@ -463,7 +465,8 @@ :element-type 'octet #+:openmcl :deadline #+:openmcl deadline - :nodelay t)))) + :nodelay t))) + raw-http-stream http-stream) #+:openmcl (when deadline ;; it is correct to set the deadline here even though @@ -472,34 +475,55 @@ ;; user and the user may want to adjust the deadline ;; for every request. (setf (ccl:stream-deadline http-stream) deadline)) - (when (and use-ssl - ;; don't attach SSL to existing streams - (not stream)) - #+:lispworks - (comm:attach-ssl http-stream :ssl-side :client) - #-:lispworks - (setq http-stream - #+:allegro - (socket:make-ssl-client-stream http-stream) - #-:allegro - (let ((s http-stream)) - (cl+ssl:make-ssl-client-stream - (cl+ssl:stream-fd s) - :close-callback (lambda () (close s))))))) - (cond (stream - (setf (flexi-stream-element-type http-stream) - #+:lispworks 'lw:simple-char #-:lispworks 'character - (flexi-stream-external-format http-stream) +latin-1+)) - (t - (setq http-stream - (make-flexi-stream (make-chunked-stream http-stream) - :external-format +latin-1+)))) (labels ((write-http-line (fmt &rest args) (when *header-stream* (format *header-stream* "~?~%" fmt args)) (format http-stream "~?~C~C" fmt args #\Return #\Linefeed)) (write-header (name value-fmt &rest value-args) - (write-http-line "~A: ~?" name value-fmt value-args))) + (write-http-line "~A: ~?" name value-fmt value-args)) + (make-ssl-stream (http-stream) + #+:lispworks + (progn + (comm:attach-ssl http-stream :ssl-side :client) + http-stream) + #-:lispworks + #+:allegro + (socket:make-ssl-client-stream http-stream) + #-:allegro + (let ((s http-stream)) + (cl+ssl:make-ssl-client-stream + (cl+ssl:stream-fd s) + :close-callback (lambda () (close s))))) + (wrap-stream (http-stream) + (make-flexi-stream (make-chunked-stream http-stream) + :external-format +latin-1+))) + (when (and use-ssl + ;; don't attach SSL to existing streams + (not stream)) + (setq http-stream (make-ssl-stream http-stream))) + (cond (stream + (setf (flexi-stream-element-type http-stream) + #+:lispworks 'lw:simple-char #-:lispworks 'character + (flexi-stream-external-format http-stream) +latin-1+)) + (t + (setq http-stream (wrap-stream http-stream)))) + (when proxying-https? + ;; Setup a tunnel through the proxy server to the + ;; final destination. + (write-http-line "CONNECT ~A:~A HTTP/1.1" (puri:uri-host uri) + (or (puri:uri-port uri) 443)) + (write-http-line "Host: ~A:~A" (puri:uri-host uri) + (or (puri:uri-port uri) 443)) + (write-http-line "") + (force-output http-stream) + ;; Check we get a 200 response before proceeding. + (let ((line (read-status-line http-stream *header-stream*))) + (unless (eq (second line) 200) + (error "Unable to establish HTTPS tunnel through proxy."))) + ;; Got a connection. We have to read a blank line, + ;; turn on SSL, and then we can transmit. + (read-line* http-stream) + (setq http-stream (wrap-stream (make-ssl-stream raw-http-stream)))) (when (and (not parameters-used-p) parameters) (setf (uri-query uri) @@ -514,7 +538,9 @@ (uri-query uri) nil)) (write-http-line "~A ~A ~A" (string-upcase method) - (render-uri (cond (proxy uri) + (render-uri (cond ((and proxy + (not stream) + (not proxying-https?)) uri) (t (copy-uri uri :scheme nil :host nil @@ -703,7 +729,7 @@ status-text)))))) (when (eq content :continuation) (return-from http-request #'finish-request)) - (finish-request content)))) + (finish-request content))))) ;; the cleanup form of the UNWIND-PROTECT above (when (and http-stream (or (not done)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

bknr-cvs