- server-names (which is evaluated) can be a + acceptor-names (which is evaluated) can be a list of symbols which means that the handler will only be returned by DISPATCH-EASY-HANDLERS in - servers which have one of these names - (see SERVER-NAME). server-names can also be the + acceptors which have one of these names + (see ACCEPTOR-NAME). acceptor-names can also be the symbol T which means that the handler will be returned by DISPATCH-EASY-HANDLERS - in every server. + in every acceptor.

Whether the GET or POST parameter (or both) will be taken into From bknr at bknr.net Mon Nov 9 20:28:05 2009 From: bknr at bknr.net (BKNR Commits) Date: Mon, 09 Nov 2009 21:28:05 +0100 Subject: [bknr-cvs] hans changed deployed/bos/projects/bos/payment-website/templates/en/ Message-ID: Revision: 4464 Author: hans URL: http://bknr.net/trac/changeset/4464 Update of english version. U deployed/bos/projects/bos/payment-website/templates/en/contact.xml U deployed/bos/projects/bos/payment-website/templates/en/disclaimer.xml U deployed/bos/projects/bos/payment-website/templates/en/headline2.xml U deployed/bos/projects/bos/payment-website/templates/en/headline3.xml U deployed/bos/projects/bos/payment-website/templates/en/idea.xml U deployed/bos/projects/bos/payment-website/templates/en/idea_subtitle1.xml U deployed/bos/projects/bos/payment-website/templates/en/idea_subtitle2.xml U deployed/bos/projects/bos/payment-website/templates/en/impressum.xml U deployed/bos/projects/bos/payment-website/templates/en/index.xml U deployed/bos/projects/bos/payment-website/templates/en/privacy.xml Modified: deployed/bos/projects/bos/payment-website/templates/en/contact.xml =================================================================== --- deployed/bos/projects/bos/payment-website/templates/en/contact.xml 2009-11-03 10:20:18 UTC (rev 4463) +++ deployed/bos/projects/bos/payment-website/templates/en/contact.xml 2009-11-09 20:28:04 UTC (rev 4464) @@ -77,7 +77,7 @@ - On these webpages you will also find links to our BOS partner organisations worldwide. + On these webpages you will also find links to the BOS supporting organisations worldwide. Modified: deployed/bos/projects/bos/payment-website/templates/en/disclaimer.xml =================================================================== --- deployed/bos/projects/bos/payment-website/templates/en/disclaimer.xml 2009-11-03 10:20:18 UTC (rev 4463) +++ deployed/bos/projects/bos/payment-website/templates/en/disclaimer.xml 2009-11-09 20:28:04 UTC (rev 4464) @@ -13,12 +13,12 @@

-Each sponsor of one or more square metres of renewable rainforest of the forestation -and nature protection project Samboja Lestari/Borneo/ Indonesia has no claims or other -rights to the respective land. No one is entitled to resell the land. Sponsors have no -duties whatsoever. This is a mere symbolic act of an informative nature. BOS guarantees -that the land will always be reserved for -the benefit of sustainable nature,- and wildlife protection. +No sponsor of one or more square metres of renewable rainforest of the forestation and nature protection project Samboja Lestari (Borneo, Indonesia) +has any claims or other rights to the respective land. You help financing the lease respectively the concession of land, ecological reforestation, +a nursery, ecological agriculture, sugar palm plantations, wages for Indonesian employees, surveillance and protection of the area, fire fighting, +environmental education, infrastructure, research and arboretum, orangutan islands, and sunbear areas. +With your donation you have no duties whatsoever. This is a mere symbolic act of an informative nature. BOS guarantees that the land will +exclusively be reserved for the benefit of sustainable nature- and wildlife protection.

www.create-rainforest.org is a webpage by:

- The Borneo Orangutan Survival Foundation (BOS) in collaboration with - the partner organisation BOS Deutschland e.V..

+ BOS Deutschland e.V.. in collaboration with the Borneo Orangutan Survival Foundation (BOS)

Postal address:

BOS Deutschland e.V.

@@ -36,7 +35,8 @@

Chairman: Boris Thiemig
Vice chairman: Maik Schaffer

- BOS Deutschland e.V. is registered under no. 24216 Nz. at the Amtsgericht Berlin-Charlottenburg (county court).

+ BOS Germany is officially registered under no. 502 VR 24216 B at the Amtsgericht (county court) Berlin Charlottenburg; +exemption paper of the Finanzamt (tax office) in Kiel-Nord, no. GL5105.

The images on the webpage are protected by copyright, and are not freely available for commercial purposes. If you wish to make use of BOS images, please contact us under the above mentioned contact details.

Modified: deployed/bos/projects/bos/payment-website/templates/en/index.xml =================================================================== --- deployed/bos/projects/bos/payment-website/templates/en/index.xml 2009-11-03 10:20:18 UTC (rev 4463) +++ deployed/bos/projects/bos/payment-website/templates/en/index.xml 2009-11-09 20:28:04 UTC (rev 4464) @@ -16,8 +16,8 @@ - Samboja Lestari - creative reforestation
-A sanctuary for Borneo + Samboja - Lestari creative reforestation.
+ A sanctuary for endangered species. @@ -34,7 +34,8 @@ -By means of a unique reforestation concept BOS is creating a sanctuary for orangutans, sunbears and other endangered species on Borneo -maybe the last one. Satellite pictures here on the internet make it possible to observe the progress of this concept. +By means of a unique reforestation concept BOS is creating a sanctuary for orangutans, sunbears and other endangered species on Borneo. +You can watch the progress on this website and in Google Earth.
... more Modified: deployed/bos/projects/bos/payment-website/templates/en/privacy.xml =================================================================== --- deployed/bos/projects/bos/payment-website/templates/en/privacy.xml 2009-11-03 10:20:18 UTC (rev 4463) +++ deployed/bos/projects/bos/payment-website/templates/en/privacy.xml 2009-11-09 20:28:04 UTC (rev 4464) @@ -13,10 +13,10 @@

- + + + The default Hunchentoot webserver behavior is to catch errors and + log them (see *log-lisp-errors-p* and + *log-lisp-warnings-p*). If you prefer to open a debugger window instead (e.g., for development), you can use this class instead of acceptor. + + + Create and START an instance of this class (instead of ACCEPTOR) if you want an https server. There are two @@ -655,6 +662,23 @@ + + acceptor request continuation + Can be used to override the error handling behavior of an acceptor. +The default method of ACCEPTOR logs errors if +*log-lisp-errors-p* is set. + + + + + acceptor socket continuation + Can be used to override the error handling behavior for connection +handling. The default method of ACCEPTOR logs connection errors +as they occur, while DEBUGGING-ACCEPTOR invokes the debugger if +debug-connection-errors-p is set. + + + Modified: trunk/thirdparty/hunchentoot/packages.lisp =================================================================== --- trunk/thirdparty/hunchentoot/packages.lisp 2009-11-10 12:19:13 UTC (rev 4467) +++ trunk/thirdparty/hunchentoot/packages.lisp 2009-11-15 19:42:18 UTC (rev 4468) @@ -133,6 +133,9 @@ "ACCEPTOR-REPLY-CLASS" "ACCEPTOR-REQUEST-CLASS" "ACCEPTOR-SSL-P" + "DEBUGGING-ACCEPTOR" + "INVOKE-PROCESS-REQUEST-WITH-ERROR-HANDLING" + "INVOKE-PROCESS-CONNECTION-WITH-ERROR-HANDLING" #-:hunchentoot-no-ssl "ACCEPTOR-SSL-CERTIFICATE-FILE" #-:hunchentoot-no-ssl "ACCEPTOR-SSL-PRIVATEKEY-FILE" #-:hunchentoot-no-ssl "ACCEPTOR-SSL-PRIVATEKEY-PASSWORD" Modified: trunk/thirdparty/hunchentoot/request.lisp =================================================================== --- trunk/thirdparty/hunchentoot/request.lisp 2009-11-10 12:19:13 UTC (rev 4467) +++ trunk/thirdparty/hunchentoot/request.lisp 2009-11-15 19:42:18 UTC (rev 4468) @@ -216,39 +216,27 @@ doing." (let (*tmp-files* *headers-sent*) (unwind-protect - (with-mapped-conditions () - (let* ((*request* request) - (*within-request-p* t)) - (multiple-value-bind (body error) - (catch 'handler-done - (handler-bind ((error - (lambda (cond) - (when *log-lisp-errors-p* - (log-message *lisp-errors-log-level* "~A" cond)) - ;; if the headers were already sent - ;; the error happens within the body - ;; and we have to close the stream - (when *headers-sent* - (setq *close-hunchentoot-stream* t)) - (throw 'handler-done - (values nil cond)))) - (warning - (lambda (cond) - (when *log-lisp-warnings-p* - (log-message *lisp-warnings-log-level* "~A" cond))))) + (with-mapped-conditions () + (let* ((*request* request) + (*within-request-p* t)) + (multiple-value-bind (body error) + (catch 'handler-done + (invoke-process-request-with-error-handling + *acceptor* *request* + (lambda () ;; skip dispatch if bad request (when (eql (return-code *reply*) +http-ok+) ;; now do the work - (funcall (acceptor-request-dispatcher *acceptor*) *request*)))) - (when error - (setf (return-code *reply*) - +http-internal-server-error+)) - (start-output :content (cond ((and error *show-lisp-errors-p*) - (format nil "

~A

" - (escape-for-html (format nil "~A" error)))) - (error - "An error has occured.") - (t body)))))) + (funcall (acceptor-request-dispatcher *acceptor*) *request*))))) + (when error + (setf (return-code *reply*) + +http-internal-server-error+)) + (start-output :content (cond ((and error *show-lisp-errors-p*) + (format nil "

~A

Modified: trunk/thirdparty/cl-webdav/handlers.lisp =================================================================== --- trunk/thirdparty/cl-webdav/handlers.lisp 2009-11-16 07:04:07 UTC (rev 4470) +++ trunk/thirdparty/cl-webdav/handlers.lisp 2009-11-16 07:14:00 UTC (rev 4471) @@ -174,12 +174,10 @@ (setf (header-out :etag) etag)) (when content-language (setf (header-out :content-language) content-language)) - (catch 'handler-done - (handle-if-modified-since write-date) - (when (equal etag (header-in* :if-none-match)) - (setf (return-code) +http-not-modified+))) - (when (eql (return-code) +http-not-modified+) - (throw 'handler-done nil)) + (handle-if-modified-since write-date) + (when (equal etag (header-in* :if-none-match)) + (setf (return-code) +http-not-modified+) + (abort-request-handler)) (setf (header-out :last-modified) (rfc-1123-date write-date) (content-length) (resource-length resource)) (unless head-request-p @@ -199,7 +197,7 @@ instead." (unless results (setf (return-code) default-return-code) - (throw 'handler-done nil)) + (abort-request-handler)) (setf (content-type) "text/xml; charset=utf-8" (return-code) +http-multi-status+) ;; use a hash table to group by status code Modified: trunk/thirdparty/cl-webdav/util.lisp =================================================================== --- trunk/thirdparty/cl-webdav/util.lisp 2009-11-16 07:04:07 UTC (rev 4470) +++ trunk/thirdparty/cl-webdav/util.lisp 2009-11-16 07:14:00 UTC (rev 4471) @@ -30,14 +30,14 @@ (in-package :cl-webdav) (defmacro define-return-code-shortcut (name return-code) - "Defines a function called NAME which just sets the HTTP return -code to RETURN-CODE and then ends the current handler by throwing -NIL to the catch tag HANDLER-DONE." + "Defines a function called NAME which just sets the HTTP return code +to RETURN-CODE and then ends the current handler by calling +ABORT-REQUEST-HANDLER." `(defun ,name () - ,(format nil "Sets RETURN-CODE to ~A and then throws NIL to -the HANDLER-DONE catch tag." return-code) + ,(format nil "Sets RETURN-CODE to ~A and then calls ABORT-REQUEST-HANDLER." + return-code) (setf (return-code) ,return-code) - (throw 'handler-done nil))) + (abort-request-handler))) (define-return-code-shortcut not-implemented +http-not-implemented+) (define-return-code-shortcut bad-request +http-bad-request+) From bknr at bknr.net Mon Nov 23 17:16:57 2009 From: bknr at bknr.net (BKNR Commits) Date: Mon, 23 Nov 2009 18:16:57 +0100 Subject: [bknr-cvs] edi changed trunk/thirdparty/cl-gd/ Message-ID: Revision: 4472 Author: edi URL: http://bknr.net/trac/changeset/4472 Changes for 0.5.7 release U trunk/thirdparty/cl-gd/CHANGELOG U trunk/thirdparty/cl-gd/cl-gd-glue.c U trunk/thirdparty/cl-gd/cl-gd-test.asd U trunk/thirdparty/cl-gd/cl-gd-test.lisp U trunk/thirdparty/cl-gd/cl-gd.asd U trunk/thirdparty/cl-gd/colors-aux.lisp U trunk/thirdparty/cl-gd/colors.lisp U trunk/thirdparty/cl-gd/doc/index.html U trunk/thirdparty/cl-gd/drawing.lisp U trunk/thirdparty/cl-gd/gd-uffi.lisp U trunk/thirdparty/cl-gd/images.lisp U trunk/thirdparty/cl-gd/init.lisp U trunk/thirdparty/cl-gd/misc.lisp U trunk/thirdparty/cl-gd/specials.lisp U trunk/thirdparty/cl-gd/strings.lisp U trunk/thirdparty/cl-gd/transform.lisp U trunk/thirdparty/cl-gd/util.lisp Modified: trunk/thirdparty/cl-gd/CHANGELOG =================================================================== --- trunk/thirdparty/cl-gd/CHANGELOG 2009-11-16 07:14:00 UTC (rev 4471) +++ trunk/thirdparty/cl-gd/CHANGELOG 2009-11-23 17:16:56 UTC (rev 4472) @@ -1,10 +1,15 @@ +Version 0.5.7 +2009-11-22 +Changes WITH-TRANSFORMATIONS so that SBCL doesn't complain (Jeff Cunningham) +Fixed typo in documentation (caught by J.P. Larocque) + Version 0.5.6 2007-07-29 -Make WITH-TRANSFORMATIONS thread-safe (thanks to Alain Picard) +Made WITH-TRANSFORMATIONS thread-safe (thanks to Alain Picard) Version 0.5.5 2007-04-24 -Ugh, fix the fix once more (again thanks to Jong-won Choi) +Ugh, fixed the fix once more (again thanks to Jong-won Choi) Version 0.5.4 2007-04-06 @@ -16,7 +21,7 @@ Version 0.5.2 2007-02-28 -Fix CONVERT-TO-CHAR-REFERENCES (bug caught by Luo Yong) +Fixed CONVERT-TO-CHAR-REFERENCES (bug caught by Luo Yong) Documentation fixes (thanks to Yoni Rabkin Katzenell) Version 0.5.1 Modified: trunk/thirdparty/cl-gd/cl-gd-glue.c =================================================================== --- trunk/thirdparty/cl-gd/cl-gd-glue.c 2009-11-16 07:14:00 UTC (rev 4471) +++ trunk/thirdparty/cl-gd/cl-gd-glue.c 2009-11-23 17:16:56 UTC (rev 4472) @@ -1,4 +1,4 @@ -/* Copyright (c) 2003-2007, Dr. Edmund Weitz. All rights reserved. +/* Copyright (c) 2003-2009, 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/cl-gd/cl-gd-test.asd =================================================================== --- trunk/thirdparty/cl-gd/cl-gd-test.asd 2009-11-16 07:14:00 UTC (rev 4471) +++ trunk/thirdparty/cl-gd/cl-gd-test.asd 2009-11-23 17:16:56 UTC (rev 4472) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/gd/cl-gd-test.asd,v 1.11 2007/01/01 23:41:00 edi Exp $ +;;; $Header: /usr/local/cvsrep/gd/cl-gd-test.asd,v 1.12 2009/11/23 17:05:38 edi Exp $ -;;; Copyright (c) 2003-2007, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2003-2009, 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/cl-gd/cl-gd-test.lisp =================================================================== --- trunk/thirdparty/cl-gd/cl-gd-test.lisp 2009-11-16 07:14:00 UTC (rev 4471) +++ trunk/thirdparty/cl-gd/cl-gd-test.lisp 2009-11-23 17:16:56 UTC (rev 4472) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-GD; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/gd/cl-gd-test.lisp,v 1.26 2007/01/01 23:41:00 edi Exp $ +;;; $Header: /usr/local/cvsrep/gd/cl-gd-test.lisp,v 1.27 2009/11/23 17:05:38 edi Exp $ -;;; Copyright (c) 2003-2007, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2003-2009, 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/cl-gd/cl-gd.asd =================================================================== --- trunk/thirdparty/cl-gd/cl-gd.asd 2009-11-16 07:14:00 UTC (rev 4471) +++ trunk/thirdparty/cl-gd/cl-gd.asd 2009-11-23 17:16:56 UTC (rev 4472) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/gd/cl-gd.asd,v 1.18 2007/07/29 16:37:13 edi Exp $ +;;; $Header: /usr/local/cvsrep/gd/cl-gd.asd,v 1.20 2009/11/23 17:05:38 edi Exp $ -;;; Copyright (c) 2003-2007, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2003-2009, 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 @@ -40,7 +40,7 @@ :defaults (parse-namestring *load-truename*))) (defsystem :cl-gd - :version "0.5.6" + :version "0.5.7" :serial t :components ((:file "packages") (:file "util") @@ -54,5 +54,5 @@ (:file "drawing") (:file "strings") (:file "misc")) - :depends-on (#-clisp :uffi - #+clisp :cffi-uffi-compat)) + :depends-on (#-(or :clisp :openmcl) :uffi + #+(or :clisp :openmcl) :cffi-uffi-compat)) Modified: trunk/thirdparty/cl-gd/colors-aux.lisp =================================================================== --- trunk/thirdparty/cl-gd/colors-aux.lisp 2009-11-16 07:14:00 UTC (rev 4471) +++ trunk/thirdparty/cl-gd/colors-aux.lisp 2009-11-23 17:16:56 UTC (rev 4472) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-GD; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/gd/colors-aux.lisp,v 1.12 2007/01/01 23:41:00 edi Exp $ +;;; $Header: /usr/local/cvsrep/gd/colors-aux.lisp,v 1.13 2009/11/23 17:05:38 edi Exp $ -;;; Copyright (c) 2003-2007, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2003-2009, 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/cl-gd/colors.lisp =================================================================== --- trunk/thirdparty/cl-gd/colors.lisp 2009-11-16 07:14:00 UTC (rev 4471) +++ trunk/thirdparty/cl-gd/colors.lisp 2009-11-23 17:16:56 UTC (rev 4472) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-GD; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/gd/colors.lisp,v 1.25 2007/01/01 23:41:00 edi Exp $ +;;; $Header: /usr/local/cvsrep/gd/colors.lisp,v 1.26 2009/11/23 17:05:38 edi Exp $ -;;; Copyright (c) 2003-2007, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2003-2009, 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/cl-gd/doc/index.html =================================================================== --- trunk/thirdparty/cl-gd/doc/index.html 2009-11-16 07:14:00 UTC (rev 4471) +++ trunk/thirdparty/cl-gd/doc/index.html 2009-11-23 17:16:56 UTC (rev 4472) @@ -203,7 +203,7 @@ CL-GD together with this documentation can be downloaded from http://weitz.de/files/cl-gd.tar.gz. The -current version is 0.5.6. A Debian package is available thanks to Peter van Eynde and Kevin Rosenberg, so if you're on Debian you should have no problems installing CL-GD. There's also a port +current version is 0.5.7. A Debian package is available thanks to Peter van Eynde and Kevin Rosenberg, so if you're on Debian you should have no problems installing CL-GD. There's also a port for Gentoo Linux thanks to Matthew Kennedy. Otherwise, proceed like this:

Download and install a recent version of asdf. @@ -618,7 +618,7 @@

[Function] -
color-component color component &key image => component +
color-component component color &key image => component

Returns the specified color component of color. component can be @@ -1434,7 +1434,7 @@ Hübner for the GIF patches. Thanks to Manuel Odendahl for lots of useful patches. Thanks to Luis Oliveira for CLISP/CFFI support and to Bryan O'Connor for OpenMCL support.
-$Header: /usr/local/cvsrep/gd/doc/index.html,v 1.75 2007/07/29 16:37:15 edi Exp $ +$Header: /usr/local/cvsrep/gd/doc/index.html,v 1.77 2009/11/23 17:04:47 edi Exp $
BACK TO MY HOMEPAGE Modified: trunk/thirdparty/cl-gd/drawing.lisp =================================================================== --- trunk/thirdparty/cl-gd/drawing.lisp 2009-11-16 07:14:00 UTC (rev 4471) +++ trunk/thirdparty/cl-gd/drawing.lisp 2009-11-23 17:16:56 UTC (rev 4472) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-GD; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/gd/drawing.lisp,v 1.28 2007/01/01 23:41:00 edi Exp $ +;;; $Header: /usr/local/cvsrep/gd/drawing.lisp,v 1.29 2009/11/23 17:05:38 edi Exp $ -;;; Copyright (c) 2003-2007, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2003-2009, 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/cl-gd/gd-uffi.lisp =================================================================== --- trunk/thirdparty/cl-gd/gd-uffi.lisp 2009-11-16 07:14:00 UTC (rev 4471) +++ trunk/thirdparty/cl-gd/gd-uffi.lisp 2009-11-23 17:16:56 UTC (rev 4472) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-GD; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/gd/gd-uffi.lisp,v 1.32 2007/04/05 23:22:24 edi Exp $ +;;; $Header: /usr/local/cvsrep/gd/gd-uffi.lisp,v 1.33 2009/11/23 17:05:39 edi Exp $ -;;; Copyright (c) 2003-2007, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2003-2009, 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/cl-gd/images.lisp =================================================================== --- trunk/thirdparty/cl-gd/images.lisp 2009-11-16 07:14:00 UTC (rev 4471) +++ trunk/thirdparty/cl-gd/images.lisp 2009-11-23 17:16:56 UTC (rev 4472) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-GD; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/gd/images.lisp,v 1.33 2007/01/01 23:41:00 edi Exp $ +;;; $Header: /usr/local/cvsrep/gd/images.lisp,v 1.34 2009/11/23 17:05:39 edi Exp $ -;;; Copyright (c) 2003-2007, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2003-2009, 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 @@ -86,8 +86,7 @@ FILE-NAME. You are responsible for destroying the image after you're done with it. It is advisable to use WITH-IMAGE-FROM-FILE instead." (check-type file-name (or pathname string)) - (let* ((file-name (truename file-name)) - (pathname-type (pathname-type file-name)) + (let* ((pathname-type (pathname-type file-name)) (%type (or type (cond ((or (string-equal pathname-type "jpg") (string-equal pathname-type "jpeg")) Modified: trunk/thirdparty/cl-gd/init.lisp =================================================================== --- trunk/thirdparty/cl-gd/init.lisp 2009-11-16 07:14:00 UTC (rev 4471) +++ trunk/thirdparty/cl-gd/init.lisp 2009-11-23 17:16:56 UTC (rev 4472) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-GD; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/gd/init.lisp,v 1.12 2007/01/01 23:41:00 edi Exp $ +;;; $Header: /usr/local/cvsrep/gd/init.lisp,v 1.13 2009/11/23 17:05:39 edi Exp $ -;;; Copyright (c) 2003-2007, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2003-2009, 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/cl-gd/misc.lisp =================================================================== --- trunk/thirdparty/cl-gd/misc.lisp 2009-11-16 07:14:00 UTC (rev 4471) +++ trunk/thirdparty/cl-gd/misc.lisp 2009-11-23 17:16:56 UTC (rev 4472) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-GD; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/gd/misc.lisp,v 1.15 2007/01/01 23:41:00 edi Exp $ +;;; $Header: /usr/local/cvsrep/gd/misc.lisp,v 1.16 2009/11/23 17:05:39 edi Exp $ -;;; Copyright (c) 2003-2007, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2003-2009, 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 @@ -220,12 +220,12 @@ (let ((,raw-pixels (get-slot-value ,img 'gd-image 'pixels))) (declare (type pixels-array ,raw-pixels)) (dotimes (,y-var ,height) - (let ((,row (deref-array ,raw-pixels '(:array (* :unsigned-byte)) ,y-var))) + (let ((,row (deref-array ,raw-pixels '(:array (* :unsigned-char)) ,y-var))) (declare (type pixels-row ,row)) (macrolet ((do-pixels-in-row ((,x-var) &body ,inner-body) `(dotimes (,,x-var ,',width) (macrolet ((raw-pixel () - `(deref-array ,',',row '(:array :unsigned-byte) ,',,x-var))) + `(deref-array ,',',row '(:array :unsigned-char) ,',,x-var))) (locally ,@,inner-body))))) (locally Modified: trunk/thirdparty/cl-gd/specials.lisp =================================================================== --- trunk/thirdparty/cl-gd/specials.lisp 2009-11-16 07:14:00 UTC (rev 4471) +++ trunk/thirdparty/cl-gd/specials.lisp 2009-11-23 17:16:56 UTC (rev 4472) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-GD; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/gd/specials.lisp,v 1.29 2007/01/01 23:41:00 edi Exp $ +;;; $Header: /usr/local/cvsrep/gd/specials.lisp,v 1.30 2009/11/23 17:05:39 edi Exp $ -;;; Copyright (c) 2003-2007, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2003-2009, 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/cl-gd/strings.lisp =================================================================== --- trunk/thirdparty/cl-gd/strings.lisp 2009-11-16 07:14:00 UTC (rev 4471) +++ trunk/thirdparty/cl-gd/strings.lisp 2009-11-23 17:16:56 UTC (rev 4472) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-GD; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/gd/strings.lisp,v 1.23 2007/04/24 09:01:39 edi Exp $ +;;; $Header: /usr/local/cvsrep/gd/strings.lisp,v 1.24 2009/11/23 17:05:39 edi Exp $ -;;; Copyright (c) 2003-2007, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2003-2009, 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/cl-gd/transform.lisp =================================================================== --- trunk/thirdparty/cl-gd/transform.lisp 2009-11-16 07:14:00 UTC (rev 4471) +++ trunk/thirdparty/cl-gd/transform.lisp 2009-11-23 17:16:56 UTC (rev 4472) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-GD; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/gd/transform.lisp,v 1.21 2007/07/29 16:37:13 edi Exp $ +;;; $Header: /usr/local/cvsrep/gd/transform.lisp,v 1.23 2009/11/23 17:05:39 edi Exp $ -;;; Copyright (c) 2003-2007, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2003-2009, 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 @@ -72,7 +72,10 @@ "Like ROUND but make sure result isn't longer than 32 bits." (mod (round x) +most-positive-unsigned-byte-32+)) -(defmacro with-transformation ((&key x1 x2 width y1 y2 height reverse-x reverse-y (radians t) (image '*default-image*)) &body body) +(defmacro with-transformation ((&key (x1 0 x1set) (x2 0 x2set) (width 0 wset) + (y1 0 y1set) (y2 0 y2set) (height 0 hset) + reverse-x reverse-y (radians t) (image '*default-image*)) + &body body) "Executes BODY such that all points and width/height data are subject to a simple affine transformation defined by the keyword parameters. The new x-axis of IMAGE will start at X1 and end at X2 and @@ -93,24 +96,19 @@ angle-transformer) ;; rebind for thread safety `(let ((*transformers* *transformers*)) - (unless (<= 2 (count-if #'identity (list ,x1 ,x2 ,width))) - (error "You must provide at least two of X1, X2, and WIDTH.")) - (unless (<= 2 (count-if #'identity (list ,y1 ,y2 ,height))) - (error "You must provide at least two of Y1, Y2, and HEIGHT.")) - (when (and ,x1 ,x2 ,width - (/= ,width (- ,x2 ,x1))) - (error "X1, X2, and WIDTH don't match. Try to provide just two of the three arguments.")) - (when (and ,y1 ,y2 ,height - (/= ,height (- ,y2 ,y1))) - (error "Y1, Y2, and HEIGHT don't match. Try to provide just two of the three arguments.")) - ;; kludgy code to keep SBCL quiet - (unless ,x1 (setq ,x1 (- ,x2 ,width))) - (unless ,x2 (setq ,x2 (+ ,x1 ,width))) - (unless ,width (setq ,width (- ,x2 ,x1))) - (unless ,y1 (setq ,y1 (- ,y2 ,height))) - (unless ,y2 (setq ,y2 (+ ,y1 ,height))) - (unless ,height (setq ,height (- ,y2 ,y1))) - (multiple-value-bind (,image-width ,image-height) + (macrolet ((checkargs (a1 a1set a2 a2set aspan aspanset c lbl) + `(progn + (cond ((and ,a1set ,a2set) (setq ,aspan (- ,a2 ,a1))) + ((and ,a1set ,aspanset) (setq ,a2 (+ ,a1 ,aspan))) + ((and ,a2set ,aspanset) (setq ,a1 (- ,a2 ,aspan))) + (t (error "Two of ~c1, ~:*~c2, or ~a must be provided." ,c ,lbl))) + (unless (> ,aspan 0) + (error "~c1 must be smaller than ~:*~c2." ,c)) + (unless (< (abs (/ (- ,a2 (+ ,a1 ,aspan)) ,aspan)) 1.e-5) + (error "~c1, ~:*~c2, and ~a don't match. Try to provide just two of the three arguments." ,c ,lbl))))) + (checkargs ,x1 ,x1set ,x2 ,x2set ,width ,wset #\x "width") + (checkargs ,y1 ,y1set ,y2 ,y2set ,height ,hset #\y "height")) + (multiple-value-bind (,image-width ,image-height) (without-transformations (image-size ,image)) (let* ((,stretch-x (/ ,image-width ,width)) Modified: trunk/thirdparty/cl-gd/util.lisp =================================================================== --- trunk/thirdparty/cl-gd/util.lisp 2009-11-16 07:14:00 UTC (rev 4471) +++ trunk/thirdparty/cl-gd/util.lisp 2009-11-23 17:16:56 UTC (rev 4472) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-GD; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/gd/util.lisp,v 1.15 2007/02/28 15:47:58 edi Exp $ +;;; $Header: /usr/local/cvsrep/gd/util.lisp,v 1.16 2009/11/23 17:05:39 edi Exp $ -;;; Copyright (c) 2003-2007, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2003-2009, 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 From bknr at bknr.net Mon Nov 23 17:18:47 2009 From: bknr at bknr.net (BKNR Commits) Date: Mon, 23 Nov 2009 18:18:47 +0100 Subject: [bknr-cvs] edi changed trunk/thirdparty/cl-gd/CHANGELOG Message-ID: Revision: 4473 Author: edi URL: http://bknr.net/trac/changeset/4473 Typo U trunk/thirdparty/cl-gd/CHANGELOG Modified: trunk/thirdparty/cl-gd/CHANGELOG =================================================================== --- trunk/thirdparty/cl-gd/CHANGELOG 2009-11-23 17:16:56 UTC (rev 4472) +++ trunk/thirdparty/cl-gd/CHANGELOG 2009-11-23 17:18:47 UTC (rev 4473) @@ -1,6 +1,6 @@ Version 0.5.7 2009-11-22 -Changes WITH-TRANSFORMATIONS so that SBCL doesn't complain (Jeff Cunningham) +Changed WITH-TRANSFORMATIONS so that SBCL doesn't complain (Jeff Cunningham) Fixed typo in documentation (caught by J.P. Larocque) Version 0.5.6 From bknr at bknr.net Mon Nov 23 20:10:30 2009 From: bknr at bknr.net (BKNR Commits) Date: Mon, 23 Nov 2009 21:10:30 +0100 Subject: [bknr-cvs] edi changed tags/thirdparty/cl-gd-0.5.7/ Message-ID: Revision: 4474 Author: edi URL: http://bknr.net/trac/changeset/4474 Tag cl-gd 0.5.7 A tags/thirdparty/cl-gd-0.5.7/ From bknr at bknr.net Wed Nov 25 17:03:08 2009 From: bknr at bknr.net (BKNR Commits) Date: Wed, 25 Nov 2009 18:03:08 +0100 Subject: [bknr-cvs] edi changed trunk/thirdparty/drakma/ Message-ID: Revision: 4475 Author: edi URL: http://bknr.net/trac/changeset/4475 Add patch method U trunk/thirdparty/drakma/CHANGELOG.txt U trunk/thirdparty/drakma/specials.lisp Modified: trunk/thirdparty/drakma/CHANGELOG.txt =================================================================== --- trunk/thirdparty/drakma/CHANGELOG.txt 2009-11-23 20:10:30 UTC (rev 4474) +++ trunk/thirdparty/drakma/CHANGELOG.txt 2009-11-25 17:03:07 UTC (rev 4475) @@ -1,3 +1,4 @@ +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) Make SEND-COOKIE-P work for pathless URIs (thanks to Tomo Matsumoto) Modified: trunk/thirdparty/drakma/specials.lisp =================================================================== --- trunk/thirdparty/drakma/specials.lisp 2009-11-23 20:10:30 UTC (rev 4474) +++ trunk/thirdparty/drakma/specials.lisp 2009-11-25 17:03:07 UTC (rev 4475) @@ -56,7 +56,8 @@ :proppatch :put :trace - :unlock) + :unlock + :patch) "The HTTP methods \(including WebDAV methods) Drakma knows.") (defconstant +buffer-size+ 8192) From bknr at bknr.net Wed Nov 25 17:03:40 2009 From: bknr at bknr.net (BKNR Commits) Date: Wed, 25 Nov 2009 18:03:40 +0100 Subject: [bknr-cvs] edi changed trunk/thirdparty/drakma/specials.lisp Message-ID: Revision: 4476 Author: edi URL: http://bknr.net/trac/changeset/4476 Clean up the patch U trunk/thirdparty/drakma/specials.lisp Modified: trunk/thirdparty/drakma/specials.lisp =================================================================== --- trunk/thirdparty/drakma/specials.lisp 2009-11-25 17:03:07 UTC (rev 4475) +++ trunk/thirdparty/drakma/specials.lisp 2009-11-25 17:03:40 UTC (rev 4476) @@ -51,13 +51,13 @@ :move :options :options* + :patch :post :propfind :proppatch :put :trace - :unlock - :patch) + :unlock) "The HTTP methods \(including WebDAV methods) Drakma knows.") (defconstant +buffer-size+ 8192) From bknr at bknr.net Mon Nov 30 13:24:18 2009 From: bknr at bknr.net (BKNR Commits) Date: Mon, 30 Nov 2009 14:24:18 +0100 Subject: [bknr-cvs] hans changed trunk/thirdparty/hunchentoot/ Message-ID: Revision: 4477 Author: hans URL: http://bknr.net/trac/changeset/4477 New API for extending request processing without interferring with Hunchentoot's internal variable binding, provided by Frode V. Fjeld. U trunk/thirdparty/hunchentoot/doc/index.xml U trunk/thirdparty/hunchentoot/packages.lisp U trunk/thirdparty/hunchentoot/request.lisp Modified: trunk/thirdparty/hunchentoot/doc/index.xml =================================================================== --- trunk/thirdparty/hunchentoot/doc/index.xml 2009-11-25 17:03:40 UTC (rev 4476) +++ trunk/thirdparty/hunchentoot/doc/index.xml 2009-11-30 13:24:17 UTC (rev 4477) @@ -1594,17 +1594,33 @@ This function is called by PROCESS-CONNECTION -after the incoming headers have been read. It selects and calls a -handler and sends the output of this handler -to the client. It also sets up simple error handling for the request -handler. Note that PROCESS-CONNECTION is called -once per connection and loops in case of a persistent connection +after the incoming headers have been read. It +calls DISPATCH-REQUEST and sends its output to +the client. It also sets up simple error handling for the request +handler. +
+The return value of this function is ignored. +
+ + + + + request + + nil + + +This function is called by PROCESS-REQUEST. It +selects and calls a +handler to process the request. +
+This might be a good place to introduce around methods which bind +special variables or do other interesting things that are relevant to +the particular request. Note +that DISPATCH-REQUEST is called once per +connection and loops in case of a persistent connection, while PROCESS-REQUEST is called anew for each request. -
-Like PROCESS-CONNECTION, this might be a good -place to introduce around methods which bind special variables or do -other interesting things.

The return value of this function is ignored. Modified: trunk/thirdparty/hunchentoot/packages.lisp =================================================================== --- trunk/thirdparty/hunchentoot/packages.lisp 2009-11-25 17:03:40 UTC (rev 4476) +++ trunk/thirdparty/hunchentoot/packages.lisp 2009-11-30 13:24:17 UTC (rev 4477) @@ -168,6 +168,7 @@ "DELETE-AUX-REQUEST-VALUE" "DELETE-SESSION-VALUE" "DISPATCH-EASY-HANDLERS" + "DISPATCH-REQUEST" "ESCAPE-FOR-HTML" "EXECUTE-ACCEPTOR" "GET-PARAMETER" Modified: trunk/thirdparty/hunchentoot/request.lisp =================================================================== --- trunk/thirdparty/hunchentoot/request.lisp 2009-11-25 17:03:40 UTC (rev 4476) +++ trunk/thirdparty/hunchentoot/request.lisp 2009-11-30 13:24:17 UTC (rev 4477) @@ -95,21 +95,22 @@ can subclass REQUEST in order to implement your own behaviour. See the REQUEST-CLASS slot of the ACCEPTOR class.")) +(defgeneric dispatch-request (request) + (:documentation "This function is called by PROCESS-REQUEST. It +selects and calls a handler to process the request. + +This might be a good place to introduce around methods which bind +special variables or do other interesting things that are relevant to +the particular request. Note that DISPATCH-REQUEST is called once per +connection and loops in case of a persistent connection, while +PROCESS-REQUEST is called anew for each request.")) + (defgeneric process-request (request) (:documentation "This function is called by PROCESS-CONNECTION after -the incoming headers have been read. It selects and calls a handler -and sends the output of this handler to the client using START-OUTPUT. -It also sets up simple error handling for the request handler. Note -that PROCESS-CONNECTION is called once per connection and loops in -case of a persistent connection while PROCESS-REQUEST is called anew -for each request. +the incoming headers have been read. It calls DISPATCH-REQUEST and +sends its output to the client. It also sets up simple error handling +for the request handler.")) -Like PROCESS-CONNECTION, this might be a good place to introduce -around methods which bind special variables or do other interesting -things. - -The return value of this function is ignored.")) - (defun convert-hack (string external-format) "The rfc2388 package is buggy in that it operates on a character stream and thus only accepts encodings which are 8 bit transparent. @@ -210,6 +211,12 @@ ;; we assume it's not our fault... (setf (return-code*) +http-bad-request+))))) +(defmethod dispatch-request (request) + "Standard implementation of dispatching a request to the appropriate +handler." + (funcall (acceptor-request-dispatcher *acceptor*) + request)) + (defmethod process-request (request) "Standard implementation for processing a request. You should not change or replace this functionality unless you know what you're @@ -227,7 +234,7 @@ ;; skip dispatch if bad request (when (eql (return-code *reply*) +http-ok+) ;; now do the work - (funcall (acceptor-request-dispatcher *acceptor*) *request*))))) + (dispatch-request request))))) (when error (setf (return-code *reply*) +http-internal-server-error+))