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

[bknr-cvs] hans changed trunk/thirdparty/hunchentoot/
by BKNR Commits 30 Nov '09

30 Nov '09

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 @@ </clix:returns> <clix:description> This function is called by <clix:ref>PROCESS-CONNECTION</clix:ref> -after the incoming headers have been read. It selects and calls a -<a href="#handlers">handler</a> and sends the output of this handler -to the client. It also sets up simple error handling for the request -handler. Note that <clix:ref>PROCESS-CONNECTION</clix:ref> is called -once per connection and loops in case of a persistent connection +after the incoming headers have been read. It +calls <clix:ref>DISPATCH-REQUEST</clix:ref> 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. + + </clix:description> + </clix:function> + + <clix:function generic='true' name='dispatch-request'> + <clix:lambda-list>request + </clix:lambda-list> + <clix:returns>nil + </clix:returns> + <clix:description> +This function is called by <clix:ref>PROCESS-REQUEST</clix:ref>. It +selects and calls a +<a href="#handlers">handler</a> 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 <clix:ref>DISPATCH-REQUEST</clix:ref> is called once per +connection and loops in case of a persistent connection, while <clix:ref>PROCESS-REQUEST</clix:ref> is called anew for each request. - -Like <clix:ref>PROCESS-CONNECTION</clix:ref>, 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+))

1 0

[bknr-cvs] edi changed trunk/thirdparty/drakma/specials.lisp
by BKNR Commits 25 Nov '09

25 Nov '09

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)

1 0

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

25 Nov '09

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)

1 0

[bknr-cvs] edi changed tags/thirdparty/cl-gd-0.5.7/
by BKNR Commits 23 Nov '09

23 Nov '09

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/

1 0

[bknr-cvs] edi changed trunk/thirdparty/cl-gd/CHANGELOG
by BKNR Commits 23 Nov '09

23 Nov '09

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

1 0

[bknr-cvs] edi changed trunk/thirdparty/cl-gd/
by BKNR Commits 23 Nov '09

23 Nov '09

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 <a href="http://weitz.de/files/cl-gd.tar.gz">http://weitz.de/files/cl-gd.tar.gz</a>. The -current version is 0.5.6. A <a href="http://packages.debian.org/cgi-bin/search_packages.pl?keywords=cl-gd&se…">Debian package</a> is available thanks to <a href="http://pvaneynd.mailworks.org/">Peter van Eynde</a> and <a href="http://b9.com/">Kevin Rosenberg</a>, 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 <a href="http://packages.debian.org/cgi-bin/search_packages.pl?keywords=cl-gd&se…">Debian package</a> is available thanks to <a href="http://pvaneynd.mailworks.org/">Peter van Eynde</a> and <a href="http://b9.com/">Kevin Rosenberg</a>, so if you're on Debian you should have no problems installing CL-GD. There's also a port for <a href="http://www.gentoo.org/proj/en/common-lisp/index.xml">Gentoo Linux</a> thanks to Matthew Kennedy. Otherwise, proceed like this: <ul> <li>Download and install a recent version of <a href="http://www.cliki.net/asdf">asdf</a>. @@ -618,7 +618,7 @@ </blockquote> [Function] - <a class=none name="color-component">color-component color component <tt>&key</tt> image => component</a> + <a class=none name="color-component">color-component component color <tt>&key</tt> image => component</a> <blockquote> Returns the specified color component of <code>color</code>. <code>component</code> can be @@ -1434,7 +1434,7 @@ Hübner</a> for the GIF patches. Thanks to <a href='http://bl0rg.net/'>Manuel Odendahl</a> 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 $ <a href="http://weitz.de/index.html">BACK TO MY HOMEPAGE</a> </body> 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

1 0

[bknr-cvs] edi changed trunk/thirdparty/cl-webdav/
by BKNR Commits 16 Nov '09

16 Nov '09

Revision: 4471 Author: edi URL: http://bknr.net/trac/changeset/4471 Use abort-request-handler U trunk/thirdparty/cl-webdav/doc/index.html U trunk/thirdparty/cl-webdav/handlers.lisp U trunk/thirdparty/cl-webdav/util.lisp Modified: trunk/thirdparty/cl-webdav/doc/index.html =================================================================== --- trunk/thirdparty/cl-webdav/doc/index.html 2009-11-16 07:04:07 UTC (rev 4470) +++ trunk/thirdparty/cl-webdav/doc/index.html 2009-11-16 07:14:00 UTC (rev 4471) @@ -724,10 +724,9 @@ allowed. If <code>root-name</code> is given, it should be the local name (a string) of a DAV node. In this case, the XML is validated. This function is expected to be called from within a -Hunchentoot request and throws to -the <a -href="http://weitz.de/hunchentoot/#handler-done"><code>HANDLER-DONE</code></a> -tag with a return code of +Hunchentoot request and +calls <a href="http://weitz.de/hunchentoot/#abort-request-handler"><code>ABORT-REQUEST-HANDLER</code></a> +with a return code of <a href="http://weitz.de/hunchentoot/#+http-bad-request+"><code>+HTTP-BAD-REQUEST+</code></a> if a parsing error occurs or if the XML is invalid. 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+)

1 0

[bknr-cvs] edi changed trunk/thirdparty/cl-webdav/
by BKNR Commits 16 Nov '09

16 Nov '09

Revision: 4470 Author: edi URL: http://bknr.net/trac/changeset/4470 Copyright update U trunk/thirdparty/cl-webdav/authorized-file-resources.lisp U trunk/thirdparty/cl-webdav/cl-webdav.asd U trunk/thirdparty/cl-webdav/file-resources.lisp U trunk/thirdparty/cl-webdav/handlers.lisp U trunk/thirdparty/cl-webdav/packages.lisp U trunk/thirdparty/cl-webdav/properties.lisp U trunk/thirdparty/cl-webdav/resources.lisp U trunk/thirdparty/cl-webdav/specials.lisp U trunk/thirdparty/cl-webdav/util.lisp U trunk/thirdparty/cl-webdav/xml.lisp Modified: trunk/thirdparty/cl-webdav/authorized-file-resources.lisp =================================================================== --- trunk/thirdparty/cl-webdav/authorized-file-resources.lisp 2009-11-16 07:03:10 UTC (rev 4469) +++ trunk/thirdparty/cl-webdav/authorized-file-resources.lisp 2009-11-16 07:04:07 UTC (rev 4470) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-WEBDAV; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/cl-webdav/authorized-file-resources.lisp,v 1.7 2007/04/18 19:21:00 edi Exp $ -;;; Copyright (c) 2007-2008, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2007-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-webdav/cl-webdav.asd =================================================================== --- trunk/thirdparty/cl-webdav/cl-webdav.asd 2009-11-16 07:03:10 UTC (rev 4469) +++ trunk/thirdparty/cl-webdav/cl-webdav.asd 2009-11-16 07:04:07 UTC (rev 4470) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/cl-webdav/cl-webdav.asd,v 1.7 2007/10/21 21:20:56 edi Exp $ -;;; Copyright (c) 2007-2008, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2007-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-webdav/file-resources.lisp =================================================================== --- trunk/thirdparty/cl-webdav/file-resources.lisp 2009-11-16 07:03:10 UTC (rev 4469) +++ trunk/thirdparty/cl-webdav/file-resources.lisp 2009-11-16 07:04:07 UTC (rev 4470) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-WEBDAV; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/cl-webdav/file-resources.lisp,v 1.7 2007/04/18 19:21:00 edi Exp $ -;;; Copyright (c) 2007-2008, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2007-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-webdav/handlers.lisp =================================================================== --- trunk/thirdparty/cl-webdav/handlers.lisp 2009-11-16 07:03:10 UTC (rev 4469) +++ trunk/thirdparty/cl-webdav/handlers.lisp 2009-11-16 07:04:07 UTC (rev 4470) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-WEBDAV; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/cl-webdav/handlers.lisp,v 1.13 2007/05/19 22:34:35 edi Exp $ -;;; Copyright (c) 2007-2008, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2007-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-webdav/packages.lisp =================================================================== --- trunk/thirdparty/cl-webdav/packages.lisp 2009-11-16 07:03:10 UTC (rev 4469) +++ trunk/thirdparty/cl-webdav/packages.lisp 2009-11-16 07:04:07 UTC (rev 4470) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/cl-webdav/packages.lisp,v 1.16 2007/04/18 19:49:32 edi Exp $ -;;; Copyright (c) 2007-2008, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2007-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-webdav/properties.lisp =================================================================== --- trunk/thirdparty/cl-webdav/properties.lisp 2009-11-16 07:03:10 UTC (rev 4469) +++ trunk/thirdparty/cl-webdav/properties.lisp 2009-11-16 07:04:07 UTC (rev 4470) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-WEBDAV; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/cl-webdav/properties.lisp,v 1.9 2008/06/25 08:04:25 edi Exp $ -;;; Copyright (c) 2007-2008, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2007-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-webdav/resources.lisp =================================================================== --- trunk/thirdparty/cl-webdav/resources.lisp 2009-11-16 07:03:10 UTC (rev 4469) +++ trunk/thirdparty/cl-webdav/resources.lisp 2009-11-16 07:04:07 UTC (rev 4470) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-WEBDAV; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/cl-webdav/resources.lisp,v 1.12 2007/04/18 19:21:00 edi Exp $ -;;; Copyright (c) 2007-2008, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2007-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-webdav/specials.lisp =================================================================== --- trunk/thirdparty/cl-webdav/specials.lisp 2009-11-16 07:03:10 UTC (rev 4469) +++ trunk/thirdparty/cl-webdav/specials.lisp 2009-11-16 07:04:07 UTC (rev 4470) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-WEBDAV; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/cl-webdav/specials.lisp,v 1.10 2008/06/25 08:02:17 edi Exp $ -;;; Copyright (c) 2007-2008, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2007-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-webdav/util.lisp =================================================================== --- trunk/thirdparty/cl-webdav/util.lisp 2009-11-16 07:03:10 UTC (rev 4469) +++ trunk/thirdparty/cl-webdav/util.lisp 2009-11-16 07:04:07 UTC (rev 4470) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-WEBDAV; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/cl-webdav/util.lisp,v 1.3 2007/04/17 07:42:08 edi Exp $ -;;; Copyright (c) 2007-2008, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2007-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-webdav/xml.lisp =================================================================== --- trunk/thirdparty/cl-webdav/xml.lisp 2009-11-16 07:03:10 UTC (rev 4469) +++ trunk/thirdparty/cl-webdav/xml.lisp 2009-11-16 07:04:07 UTC (rev 4470) @@ -1,7 +1,7 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-WEBDAV; Base: 10 -*- ;;; $Header: /usr/local/cvsrep/cl-webdav/xml.lisp,v 1.10 2007/10/21 21:20:56 edi Exp $ -;;; Copyright (c) 2007-2008, Dr. Edmund Weitz. All rights reserved. +;;; Copyright (c) 2007-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

1 0

[bknr-cvs] edi changed trunk/thirdparty/cl-webdav/CHANGELOG.txt
by BKNR Commits 16 Nov '09

16 Nov '09

Revision: 4469 Author: edi URL: http://bknr.net/trac/changeset/4469 More compatibility changes U trunk/thirdparty/cl-webdav/CHANGELOG.txt Modified: trunk/thirdparty/cl-webdav/CHANGELOG.txt =================================================================== --- trunk/thirdparty/cl-webdav/CHANGELOG.txt 2009-11-15 19:42:18 UTC (rev 4468) +++ trunk/thirdparty/cl-webdav/CHANGELOG.txt 2009-11-16 07:03:10 UTC (rev 4469) @@ -1,3 +1,5 @@ +Changes to make CL-WEBDAV compatible with new Hunchentoot (Cyrus Harmon and Matthew Curry) + Version 0.1.2 2007-10-21 Made compatible with current CXML (patch by David Lichteblau)

1 0

[bknr-cvs] edi changed trunk/thirdparty/hunchentoot/
by BKNR Commits 15 Nov '09

15 Nov '09

Revision: 4468 Author: edi URL: http://bknr.net/trac/changeset/4468 Debugging acceptors (Andreas Fuchs) U trunk/thirdparty/hunchentoot/CHANGELOG U trunk/thirdparty/hunchentoot/acceptor.lisp U trunk/thirdparty/hunchentoot/doc/index.xml U trunk/thirdparty/hunchentoot/packages.lisp U trunk/thirdparty/hunchentoot/request.lisp Modified: trunk/thirdparty/hunchentoot/CHANGELOG =================================================================== --- trunk/thirdparty/hunchentoot/CHANGELOG 2009-11-10 12:19:13 UTC (rev 4467) +++ trunk/thirdparty/hunchentoot/CHANGELOG 2009-11-15 19:42:18 UTC (rev 4468) @@ -1,3 +1,4 @@ +Added debugging acceptors and the corresponding generic methods (Andreas Fuchs) Treat :UNSPECIFIC like NIL in pathname components (reported by Frode Fjeld) Prepare for LispWorks 6 (Nico de Jager) Fix reading of post parameters (Peter Seibel) Modified: trunk/thirdparty/hunchentoot/acceptor.lisp =================================================================== --- trunk/thirdparty/hunchentoot/acceptor.lisp 2009-11-10 12:19:13 UTC (rev 4467) +++ trunk/thirdparty/hunchentoot/acceptor.lisp 2009-11-15 19:42:18 UTC (rev 4468) @@ -174,6 +174,17 @@ active instances of ACCEPTOR \(listening on different ports) at the same time.")) +(defclass debugging-acceptor (acceptor) + ((debug-connection-errors-p :initarg :debug-connection-errors-p + :accessor debug-connection-errors-p + :documentation "A flag that enables +entering the debugger if a connection-related error (e.g. a premature +connection drop by the client) occurs.")) + (:default-initargs + :debug-connection-errors-p nil) + (:documentation "This class provides a Hunchentoot webserver that +enters the debugger if an error handler occurs during request handling.")) + (defmethod print-object ((acceptor acceptor) stream) (print-unreadable-object (acceptor stream :type t) (format stream "\(host ~A, port ~A)" @@ -236,6 +247,19 @@ subclasses of ACCEPTOR must specialize this method to signal that they're using secure connections - see the SSL-ACCEPTOR class.")) +(defgeneric invoke-process-connection-with-error-handling + (acceptor socket continuation) + (:documentation "Handles connection errors on SOCKET for ACCEPTOR +that occur while running CONTINUATION.")) + +(defgeneric invoke-process-request-with-error-handling + (acceptor request continuation) + (:documentation "Handles errors that occur while running +CONTINUATION to process a REQUEST on ACCEPTOR. + +This is useful to specialize if you want to handle errors that occur +only on specific requests.")) + ;; general implementation (defmethod start ((acceptor acceptor)) @@ -271,24 +295,39 @@ (chunked-stream-stream stream)) (t stream))) -(defmethod process-connection :around ((*acceptor* acceptor) (socket t)) - ;; this around method is used for error handling +(defmethod invoke-process-connection-with-error-handling ((*acceptor* acceptor) + socket continuation) (declare (ignore socket)) - ;; note that this method also binds *ACCEPTOR* + ;; Handle connection errors if they occur. (handler-bind ((error ;; abort if there's an error which isn't caught inside (lambda (cond) (log-message *lisp-errors-log-level* "Error while processing connection: ~A" cond) - (return-from process-connection))) + (return-from invoke-process-connection-with-error-handling))) (warning ;; log all warnings which aren't caught inside (lambda (cond) (log-message *lisp-warnings-log-level* "Warning while processing connection: ~A" cond)))) - (with-mapped-conditions () - (call-next-method)))) + (funcall continuation))) +(defmethod invoke-process-connection-with-error-handling ((*acceptor* debugging-acceptor) + socket continuation) + (declare (ignore socket)) + ;; Use the default error handling behavior, which is governed by the + ;; host lisp's *debugger-hook* + (if (debug-connection-errors-p *acceptor*) + (funcall continuation) + (call-next-method))) + +(defmethod process-connection :around ((*acceptor* acceptor) (socket t)) + ;; this around method is used for error handling + (declare (ignore socket)) + ;; note that this method also binds *ACCEPTOR* + (with-mapped-conditions () + (invoke-process-connection-with-error-handling *acceptor* socket #'call-next-method))) + (defmethod process-connection ((*acceptor* acceptor) (socket t)) (let ((*hunchentoot-stream* (initialize-connection-stream *acceptor* (make-socket-stream socket *acceptor*)))) @@ -297,44 +336,44 @@ ;; *CLOSE-HUNCHENTOOT-STREAM* has been set to T by the ;; handler, or the peer fails to send a request (loop - (let ((*close-hunchentoot-stream* t)) - (when (acceptor-shutdown-p *acceptor*) - (return)) - (multiple-value-bind (headers-in method url-string protocol) - (get-request-data *hunchentoot-stream*) - ;; check if there was a request at all - (unless method - (return)) - ;; bind per-request special variables, then process the - ;; request - note that *ACCEPTOR* was bound above already - (let ((*reply* (make-instance (acceptor-reply-class *acceptor*))) - (*session* nil) - (transfer-encodings (cdr (assoc* :transfer-encoding headers-in)))) - (when transfer-encodings - (setq transfer-encodings - (split "\\s*,\\*" transfer-encodings)) - (when (member "chunked" transfer-encodings :test #'equalp) - (cond ((acceptor-input-chunking-p *acceptor*) - ;; turn chunking on before we read the request body - (setf *hunchentoot-stream* (make-chunked-stream *hunchentoot-stream*) - (chunked-stream-input-chunking-p *hunchentoot-stream*) t)) - (t (hunchentoot-error "Client tried to use ~ + (let ((*close-hunchentoot-stream* t)) + (when (acceptor-shutdown-p *acceptor*) + (return)) + (multiple-value-bind (headers-in method url-string protocol) + (get-request-data *hunchentoot-stream*) + ;; check if there was a request at all + (unless method + (return)) + ;; bind per-request special variables, then process the + ;; request - note that *ACCEPTOR* was bound above already + (let ((*reply* (make-instance (acceptor-reply-class *acceptor*))) + (*session* nil) + (transfer-encodings (cdr (assoc* :transfer-encoding headers-in)))) + (when transfer-encodings + (setq transfer-encodings + (split "\\s*,\\*" transfer-encodings)) + (when (member "chunked" transfer-encodings :test #'equalp) + (cond ((acceptor-input-chunking-p *acceptor*) + ;; turn chunking on before we read the request body + (setf *hunchentoot-stream* (make-chunked-stream *hunchentoot-stream*) + (chunked-stream-input-chunking-p *hunchentoot-stream*) t)) + (t (hunchentoot-error "Client tried to use ~ chunked encoding, but acceptor is configured to not use it."))))) - (multiple-value-bind (remote-addr remote-port) - (get-peer-address-and-port socket) - (process-request (make-instance (acceptor-request-class *acceptor*) - :acceptor *acceptor* - :remote-addr remote-addr - :remote-port remote-port - :headers-in headers-in - :content-stream *hunchentoot-stream* - :method method - :uri url-string - :server-protocol protocol)))) - (force-output *hunchentoot-stream*) - (setq *hunchentoot-stream* (reset-connection-stream *acceptor* *hunchentoot-stream*)) - (when *close-hunchentoot-stream* - (return))))) + (multiple-value-bind (remote-addr remote-port) + (get-peer-address-and-port socket) + (process-request (make-instance (acceptor-request-class *acceptor*) + :acceptor *acceptor* + :remote-addr remote-addr + :remote-port remote-port + :headers-in headers-in + :content-stream *hunchentoot-stream* + :method method + :uri url-string + :server-protocol protocol)))) + (force-output *hunchentoot-stream*) + (setq *hunchentoot-stream* (reset-connection-stream *acceptor* *hunchentoot-stream*)) + (when *close-hunchentoot-stream* + (return))))) (when *hunchentoot-stream* ;; as we are at the end of the request here, we ignore all ;; errors that may occur while flushing and/or closing the @@ -425,3 +464,51 @@ when action return (funcall action) finally (setf (return-code *reply*) +http-not-found+))) +;;; Handling errors that occur in request handling: + +(defmethod invoke-process-request-with-error-handling ((*acceptor* acceptor) + *request* continuation) + "Standard error handling mechanism for the request processor. Logs +errors if *LOG-LISP-ERRORS-P* is set and logs warnings for +*LOG-LISP-WARNINGS-P*." + (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))))) + (funcall continuation))) + +(defmethod invoke-process-request-with-error-handling ((*acceptor* + debugging-acceptor) + *request* continuation) + "Mechanism for entering the debugger if an unhandled error occurs +while handling a request." + (let* ((aborted t)) + (unwind-protect + (let ((*debugger-hook* + (lambda (cond prev-hook) + (setf aborted cond) + (let ((*debugger-hook* prev-hook)) + (invoke-debugger cond))))) + (with-simple-restart (abort "Abort handling ~A ~A" + (request-method *request*) + (request-uri *request*)) + (multiple-value-prog1 + (funcall continuation) + ;; When execution continues, close the stream only if so + ;; desired: + (setq aborted nil)))) + (when aborted + (when *headers-sent* + (setq *close-hunchentoot-stream* t)) + (throw 'handler-done (values nil aborted)))))) \ No newline at end of file Modified: trunk/thirdparty/hunchentoot/doc/index.xml =================================================================== --- trunk/thirdparty/hunchentoot/doc/index.xml 2009-11-10 12:19:13 UTC (rev 4467) +++ trunk/thirdparty/hunchentoot/doc/index.xml 2009-11-15 19:42:18 UTC (rev 4468) @@ -350,7 +350,14 @@ same time. </clix:description> </clix:class> - + + <clix:class name='debugging-acceptor'> + <clix:description>The default Hunchentoot webserver behavior is to catch errors and + log them (see <clix:ref>*log-lisp-errors-p*</clix:ref> and + <clix:ref>*log-lisp-warnings-p*</clix:ref>). If you prefer to open a debugger window instead (e.g., for development), you can use this class instead of <clix:ref>acceptor</clix:ref>. + </clix:description> + </clix:class> + <clix:class name='ssl-acceptor'> <clix:description>Create and <clix:ref>START</clix:ref> an instance of this class (instead of <clix:ref>ACCEPTOR</clix:ref>) if you want an https server. There are two @@ -655,6 +662,23 @@ </clix:description> </clix:function> + <clix:function generic='true' name='invoke-process-request-with-error-handling'> + <clix:lambda-list>acceptor request continuation</clix:lambda-list> + <clix:description>Can be used to override the error handling behavior of an acceptor. +The default method of <clix:ref>ACCEPTOR</clix:ref> logs errors if +<clix:ref>*log-lisp-errors-p*</clix:ref> is set. + </clix:description> + </clix:function> + + <clix:function generic='true' name='invoke-process-connection-with-error-handling'> + <clix:lambda-list>acceptor socket continuation</clix:lambda-list> + <clix:description>Can be used to override the error handling behavior for connection +handling. The default method of <clix:ref>ACCEPTOR</clix:ref> logs connection errors +as they occur, while <clix:ref>DEBUGGING-ACCEPTOR</clix:ref> invokes the debugger if +debug-connection-errors-p is set. + </clix:description> + </clix:function> + </clix:subchapter> <clix:subchapter name="taskmasters" title="Taskmasters"> 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 "<pre>~A</pre>" - (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 "<pre>~A</pre>" + (escape-for-html (format nil "~A" error)))) + (error + "An error has occured.") + (t body)))))) (dolist (path *tmp-files*) (when (and (pathnamep path) (probe-file path)) ;; the handler may have chosen to (re)move the uploaded

1 0

[bknr-cvs] edi changed trunk/thirdparty/hunchentoot/
by BKNR Commits 10 Nov '09

10 Nov '09

Revision: 4467 Author: edi URL: http://bknr.net/trac/changeset/4467 Treat :UNSPECIFIC like NIL U trunk/thirdparty/hunchentoot/CHANGELOG U trunk/thirdparty/hunchentoot/misc.lisp Modified: trunk/thirdparty/hunchentoot/CHANGELOG =================================================================== --- trunk/thirdparty/hunchentoot/CHANGELOG 2009-11-10 09:08:55 UTC (rev 4466) +++ trunk/thirdparty/hunchentoot/CHANGELOG 2009-11-10 12:19:13 UTC (rev 4467) @@ -1,3 +1,4 @@ +Treat :UNSPECIFIC like NIL in pathname components (reported by Frode Fjeld) Prepare for LispWorks 6 (Nico de Jager) Fix reading of post parameters (Peter Seibel) Fix STOP by supplying the :READY-ONLY keyword to USOCKET:WAIT-FOR-INPUT Modified: trunk/thirdparty/hunchentoot/misc.lisp =================================================================== --- trunk/thirdparty/hunchentoot/misc.lisp 2009-11-10 09:08:55 UTC (rev 4466) +++ trunk/thirdparty/hunchentoot/misc.lisp 2009-11-10 12:19:13 UTC (rev 4467) @@ -194,9 +194,11 @@ (plusp (length uri-prefix)) (char= (char uri-prefix (1- (length uri-prefix))) #\/)) (parameter-error "~S must be string ending with a slash." uri-prefix)) - (when (or (pathname-name base-path) - (pathname-type base-path)) - (parameter-error "~S is supposed to denote a directory." base-path)) + (let ((name (pathname-name base-path)) + (type (pathname-type base-path))) + (when (or (and name (not (eq name :unspecific))) + (and type (not (eq type :unspecific)))) + (parameter-error "~S is supposed to denote a directory." base-path))) (flet ((handler () (let* ((script-name (url-decode (script-name*))) (script-path (enough-url (regex-replace-all "\\\\" script-name "/")

1 0

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

10 Nov '09

Revision: 4466 Author: edi URL: http://bknr.net/trac/changeset/4466 Don't add GET parameters to redirects U trunk/thirdparty/drakma/CHANGELOG.txt U trunk/thirdparty/drakma/request.lisp Modified: trunk/thirdparty/drakma/CHANGELOG.txt =================================================================== --- trunk/thirdparty/drakma/CHANGELOG.txt 2009-11-09 21:01:43 UTC (rev 4465) +++ trunk/thirdparty/drakma/CHANGELOG.txt 2009-11-10 09:08:55 UTC (rev 4466) @@ -1,3 +1,4 @@ +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/request.lisp =================================================================== --- trunk/thirdparty/drakma/request.lisp 2009-11-09 21:01:43 UTC (rev 4465) +++ trunk/thirdparty/drakma/request.lisp 2009-11-10 09:08:55 UTC (rev 4466) @@ -654,6 +654,8 @@ (t redirect)) :stream (and re-use-stream http-stream) :additional-headers additional-headers + ;; don't send GET parameters again in redirect + :parameters (and (not (eq method :get)) parameters) args))))) (let ((transfer-encodings (header-value :transfer-encoding headers))) (when transfer-encodings

1 0

[bknr-cvs] hans changed deployed/bos/projects/bos/payment-website/infosystem/
by BKNR Commits 09 Nov '09

09 Nov '09

Revision: 4465 Author: hans URL: http://bknr.net/trac/changeset/4465 Further edits. U deployed/bos/projects/bos/payment-website/infosystem/de/satellitenkarte.htm U deployed/bos/projects/bos/payment-website/infosystem/en/satellitenkarte.htm Modified: deployed/bos/projects/bos/payment-website/infosystem/de/satellitenkarte.htm =================================================================== --- deployed/bos/projects/bos/payment-website/infosystem/de/satellitenkarte.htm 2009-11-09 20:28:04 UTC (rev 4464) +++ deployed/bos/projects/bos/payment-website/infosystem/de/satellitenkarte.htm 2009-11-09 21:01:43 UTC (rev 4465) @@ -443,7 +443,7 @@ </div> </div> <div id="Ueberschrift" style="position:absolute; width:290px; height:20px; z-index:5; left: 169px; top: 80px;">Samboja Lestari im Überblick</div> - <div id="Untertitel" style="position:absolute; width:350px; height:20px; z-index:5; left: 169px; top: 469px;" align="right">Über 17 Millionen Quadratmeter für die Ewigkeit</div> + <div id="Untertitel" style="position:absolute; width:350px; height:20px; z-index:5; left: 169px; top: 469px;" align="right">18,5 Millionen Quadratmeter neuen Lebenswald schaffen!</div> <div class="Links" style="position:absolute; width:178px; height:132px; z-index:3; top: 482px; left: 550px;"> <img src="/images/pfeil_link_on.gif" border="0" /> Modified: deployed/bos/projects/bos/payment-website/infosystem/en/satellitenkarte.htm =================================================================== --- deployed/bos/projects/bos/payment-website/infosystem/en/satellitenkarte.htm 2009-11-09 20:28:04 UTC (rev 4464) +++ deployed/bos/projects/bos/payment-website/infosystem/en/satellitenkarte.htm 2009-11-09 21:01:43 UTC (rev 4465) @@ -444,7 +444,7 @@ </div> </div> <div id="Ueberschrift" style="position:absolute; width:290px; height:20px; z-index:5; left: 169px; top: 80px;">Samboja Lestari - Overview</div> - <div id="Untertitel" style="position:absolute; width:350px; height:20px; z-index:5; left: 169px; top: 469px;" align="right">More than 17 million square metres for eternity.</div> + <div id="Untertitel" style="position:absolute; width:350px; height:20px; z-index:5; left: 169px; top: 469px;" align="right">Creating 18.5 million square meters new rainforest.</div> <div class="Links" style="position:absolute; width:178px; height:132px; z-index:3; top: 482px; left: 550px;"> <img src="/images/pfeil_link_on.gif" border="0" />

1 0

[bknr-cvs] hans changed deployed/bos/projects/bos/payment-website/templates/en/
by BKNR Commits 09 Nov '09

09 Nov '09

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 @@ </td> </tr> <tr> - <td>On these webpages you will also find links to our BOS partner organisations worldwide. + <td>On these webpages you will also find links to the BOS supporting organisations worldwide. </td> </tr> </table> 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 @@ Disclaimer -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. </bknr:toplevel> Modified: deployed/bos/projects/bos/payment-website/templates/en/headline2.xml =================================================================== --- deployed/bos/projects/bos/payment-website/templates/en/headline2.xml 2009-11-03 10:20:18 UTC (rev 4463) +++ deployed/bos/projects/bos/payment-website/templates/en/headline2.xml 2009-11-09 20:28:04 UTC (rev 4464) @@ -37,7 +37,8 @@ <td valign="top"> Nature conservation and the needs of the population must not be in conflict with each other. - The nature reserve Samboja Lestari offers a safe income, health and education to the local population. The people will be included into all phases of the project. Agriculture, nursery, production of compost, reforestation and the creation of infrastructure provide safe workplaces. + The nature reserve Samboja Lestari offers a safe income, health and education to the local population. +Agriculture, nursery, production of compost, reforestation and the creation of infrastructure provide safe workplaces. </td> <td align="right" colspan="2"><img src="../images/pic_headline2_big.jpg" width="256" height="150" border="0" alt="" /></td> @@ -76,7 +77,8 @@ </tr> <tr> <td colspan="3"> - The safety of the nature reserve is guaranteed by the acceptance through the Indonesian population. The success of the project guarantees a better standard of living and vice versa. + The safety of the nature reserve can be guaranteed in the long run only by the acceptance through the local people. +The success of the project guarantees a better standard of living and vice versa. </td> </tr> <tr><td height="16"></td></tr> Modified: deployed/bos/projects/bos/payment-website/templates/en/headline3.xml =================================================================== --- deployed/bos/projects/bos/payment-website/templates/en/headline3.xml 2009-11-03 10:20:18 UTC (rev 4463) +++ deployed/bos/projects/bos/payment-website/templates/en/headline3.xml 2009-11-09 20:28:04 UTC (rev 4464) @@ -40,9 +40,9 @@ great apes serves at the same time to preserve the rainforest's eco system. Nowadays, orangutans live only on Sumatra and Borneo. Massive rainforest destruction and unscrupulous pet trade could - mean the end of their species. Malaysian bears are also in danger of losing their natural habitat. The nature reserve Samboja Lestari - represents the last refuge for several animals - a last chance for their survival. Malaysian bears are already living in the reserve, in - a specially set aside area. In a few years time also orangutans will be able to live there in freedom. + mean the end of their species. Sunbears are also in danger of losing their natural habitat. The nature reserve Samboja Lestari represents +refuge for several species of animals - a chance for their survival. 52 sunbears are already living in a specially confined area. Infected orang-utans, unfit for realease, +live on artificial islands. In the forest school young orang-utans train for their future release Rare species such as the Rhinoceros bird, the dwarf deer and the king cobra can already be observed in Samboja Lestari nowadays. </td> Modified: deployed/bos/projects/bos/payment-website/templates/en/idea.xml =================================================================== --- deployed/bos/projects/bos/payment-website/templates/en/idea.xml 2009-11-03 10:20:18 UTC (rev 4463) +++ deployed/bos/projects/bos/payment-website/templates/en/idea.xml 2009-11-09 20:28:04 UTC (rev 4464) @@ -18,7 +18,7 @@ Samboja Lestari - Creative reforestation - A sanctuary for Borneo + A sancutary for endangered species. </td> <td align="center"><img src="/images/pfeil_back.gif" width="10" height="9" alt="" /> @@ -35,8 +35,9 @@ <tr><td height="6"></td></tr> <tr> <td colspan="3"> - 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. + BOS regenerates rainforest through an unique concept of afforestation and at the same time creates a sanctuary for +orangutans, sunbears and other endangered species on Borneo. +Satellite pictures here on the internet make it possible to observe the progress of this concept on this website and in Google Earth During the last decades the once species-rich rainforest of <a href="/en/satmap" class="titlegreen"> @@ -44,7 +45,11 @@ </a> was cleared and burnt down relentlessly. Nutrient-consuming elephant grass took over completely. What remained was an ecological waste land. -Nowadays it is already visible that this doesn't have to stay - since 2001 BOS is creating new rainforest. An innovative concept of reforestation and protection is changing this area of over 16 mio sqm into a natural habitat again. In tropical Borneo plants grow much faster than in Europe. Already within a few years the first orangutans can be released to share their freedom with other animals. A nature reserve is being created for the permanent use of humans, animals and plants in Samboja Lestari ("eternal Samboja"). +Nowadays it is already visible that this doesn't have to stay - since 2001 BOS is creating new rainforest. +In the long term an innovative concept of reforestation and protection is converting this area of more than 18.5 mio sqm into a natural habitat again. +In tropical Borneo plants grow much faster than in Europe. +Already after a few years the first orangutans enjoy their new freedom on artificial islands. Young orang-utans train in the forest school of Samboja-Lestari for their future release. +A nature reserve is being created for the permanent use of humans, animals and plants in Samboja Lestari ("eternal Samboja"). </td> <td></td> </tr> Modified: deployed/bos/projects/bos/payment-website/templates/en/idea_subtitle1.xml =================================================================== --- deployed/bos/projects/bos/payment-website/templates/en/idea_subtitle1.xml 2009-11-03 10:20:18 UTC (rev 4463) +++ deployed/bos/projects/bos/payment-website/templates/en/idea_subtitle1.xml 2009-11-09 20:28:04 UTC (rev 4464) @@ -60,13 +60,15 @@ <td colspan="2"> A <img src="/images/pfeil_link_on.gif" width="10" height="9" alt="" /> <a href="javascript:window_ringdetail();" -class="content_green">circle of sugar-palm plantations</a> is being planted all around the nature reserve. Over 650 families will profit from the main product sugar. And - the circle forms a barrier against the much feared forest fires. +class="content_green">circle of sugar-palm plantations</a> is being planted all around the nature reserve. +Sugar as a main product is supposed to support hundreds of families in the future. And - the circle forms a barrier against the much feared forest fires. -A penetration of humans into the nature reserve, as well as the breakout of orangutans is prevented by an inner protection wall of thickly growing, prickly salac palms. Moreover, the fruit of these palms provides pleasant tasting food for humans and animals. +An inner wall of thick thorny salak palms is supposed to prevent the intrusion of cattle into the nature reserve as well as the breakout of orangutans. +Moreover, the fruit of these palms provides pleasant tasting food for humans and animals. </td> </tr> <tr><td colspan="3"> -Ultra-light aeroplanes and modern satellite technique support the permanent surveillance of the BOS projects. Thus, slash-and-burn and illegal logging can be fought much more effectively. + </td> </tr> </table> Modified: deployed/bos/projects/bos/payment-website/templates/en/idea_subtitle2.xml =================================================================== --- deployed/bos/projects/bos/payment-website/templates/en/idea_subtitle2.xml 2009-11-03 10:20:18 UTC (rev 4463) +++ deployed/bos/projects/bos/payment-website/templates/en/idea_subtitle2.xml 2009-11-09 20:28:04 UTC (rev 4464) @@ -35,7 +35,9 @@ </tr> <tr> <td colspan="2"> - You help financing the purchase 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. + You help financing the lease and 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. Contribute to a better future and observe the development of the Samboja Lestari project on the internet. </td> Modified: deployed/bos/projects/bos/payment-website/templates/en/impressum.xml =================================================================== --- deployed/bos/projects/bos/payment-website/templates/en/impressum.xml 2009-11-03 10:20:18 UTC (rev 4463) +++ deployed/bos/projects/bos/payment-website/templates/en/impressum.xml 2009-11-09 20:28:04 UTC (rev 4464) @@ -13,8 +13,7 @@ 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 @@ <tr> <td colspan="3"> <a href="idea" class="titlegreen"> - Samboja Lestari - creative reforestation -A sanctuary for Borneo + Samboja - Lestari creative reforestation. + A sanctuary for endangered species. </a> </td> <td></td> @@ -34,7 +34,8 @@ <tr><td height="6"></td></tr> <tr> <td colspan="3"> -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. <a href="idea" class="more"> ... 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 protection of your personal data via electronic processing is strictly regulated, -and is something BOS Deutschland e.V. takes very seriously.BOS Deutschland e.V. -is a renowned and not-for-profit foundation complying with the Bundesdatenschutzgesetz -(German Privacy Policy Law). BOS is registered under no. 502 VR 4228 at the Amtsgericht (county court) in Kiel; -exemption paper of the Finanzamt (tax office) in Kiel-Nord, no. GL5105. +and is something BOS Deutschland e.V. takes very seriously.BOS Deutschland e.V. (BOS Germany) is an officially registered and eligible +not-for-profit society complying with the Bundesdatenschutzgesetz (German Privacy Policy Law). +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. What happens with your personal data?

1 0

[bknr-cvs] edi changed trunk/thirdparty/hunchentoot/doc/index.xml
by BKNR Commits 03 Nov '09

03 Nov '09

Revision: 4463 Author: edi URL: http://bknr.net/trac/changeset/4463 Rename "server" to "acceptor" in documentation U trunk/thirdparty/hunchentoot/doc/index.xml Modified: trunk/thirdparty/hunchentoot/doc/index.xml =================================================================== --- trunk/thirdparty/hunchentoot/doc/index.xml 2009-10-29 15:01:32 UTC (rev 4462) +++ trunk/thirdparty/hunchentoot/doc/index.xml 2009-11-03 10:20:18 UTC (rev 4463) @@ -908,7 +908,7 @@ <a href="http://www.lispworks.com/documentation/HyperSpec/Body/03_de.htm">destructuring lambda list</a> - <pre>(name &key uri server-names default-parameter-type default-request-type).</pre> + <pre>(name &key uri acceptor-names default-parameter-type default-request-type).</pre> <clix:arg>lambda-list</clix:arg> is a list the elements of which are either a symbol <clix:arg>var</clix:arg> or a list matching the destructuring lambda list @@ -939,14 +939,14 @@ object</a> returns a true value. - <clix:arg>server-names</clix:arg> (which is evaluated) can be a + <clix:arg>acceptor-names</clix:arg> (which is evaluated) can be a list of symbols which means that the handler will only be returned by <clix:ref>DISPATCH-EASY-HANDLERS</clix:ref> in - servers which have one of these names - (see <clix:ref>SERVER-NAME</clix:ref>). <clix:arg>server-names</clix:arg> can also be the + acceptors which have one of these names + (see <clix:ref>ACCEPTOR-NAME</clix:ref>). <clix:arg>acceptor-names</clix:arg> can also be the symbol <code>T</code> which means that the handler will be returned by <clix:ref>DISPATCH-EASY-HANDLERS</clix:ref> - in every server. + in every acceptor. Whether the GET or POST parameter (or both) will be taken into

1 0