bknr-cvs

bknr-cvs@common-lisp.net

1964 discussions

[bknr-cvs] edi changed trunk/thirdparty/cl-webdav/
by BKNR Commits 18 Feb '10

18 Feb '10

Revision: 4512 Author: edi URL: http://bknr.net/trac/changeset/4512 Changes from Matthew Curry (finally...) D trunk/thirdparty/cl-webdav/doc/CVS/ U trunk/thirdparty/cl-webdav/doc/index.html U trunk/thirdparty/cl-webdav/handlers.lisp U trunk/thirdparty/cl-webdav/resources.lisp Modified: trunk/thirdparty/cl-webdav/doc/index.html =================================================================== --- trunk/thirdparty/cl-webdav/doc/index.html 2010-02-17 06:12:43 UTC (rev 4511) +++ trunk/thirdparty/cl-webdav/doc/index.html 2010-02-18 11:02:41 UTC (rev 4512) @@ -1194,7 +1194,7 @@ This documentation was prepared with <a href="http://weitz.de/documentation-template/">DOCUMENTATION-TEMPLATE</a>. -$Header: /usr/local/cvsrep/cl-webdav/doc/index.html,v 1.18 2007/10/21 21:20:59 edi Exp $ +$Header: /usr/local/cvsrep/cl-webdav/doc/index.html,v 1.20 2009/02/17 20:17:30 edi Exp $ <a href="http://weitz.de/index.html">BACK TO MY HOMEPAGE</a> </body> Modified: trunk/thirdparty/cl-webdav/handlers.lisp =================================================================== --- trunk/thirdparty/cl-webdav/handlers.lisp 2010-02-17 06:12:43 UTC (rev 4511) +++ trunk/thirdparty/cl-webdav/handlers.lisp 2010-02-18 11:02:41 UTC (rev 4512) @@ -102,8 +102,8 @@ (not-found)) (multiple-value-bind (properties propname) (parse-propfind (raw-post-data :force-binary t)) - (setf (content-type) "text/xml; charset=utf-8" - (return-code) +http-multi-status+) + (setf (content-type*) "text/xml; charset=utf-8" + (return-code*) +http-multi-status+) (let ((result ;; loop through the resource and its descendants until ;; depth limit is reached @@ -145,8 +145,8 @@ (push (cons +http-conflict+ property) results)) (t (funcall property-handler resource property) (push (cons +http-ok+ property) results)))))) - (setf (content-type) "text/xml; charset=utf-8" - (return-code) +http-multi-status+) + (setf (content-type*) "text/xml; charset=utf-8" + (return-code*) +http-multi-status+) (serialize-xmls-node (dav-node "multistatus" (apply #'dav-node "response" @@ -169,7 +169,7 @@ (let ((etag (resource-etag resource)) (write-date (resource-write-date resource)) (content-language (resource-content-language resource))) - (setf (content-type) (resource-content-type resource)) + (setf (content-type*) (resource-content-type resource)) (when etag (setf (header-out :etag) etag)) (when content-language @@ -179,7 +179,7 @@ (setf (return-code) +http-not-modified+) (abort-request-handler)) (setf (header-out :last-modified) (rfc-1123-date write-date) - (content-length) (resource-length resource)) + (content-length*) (resource-length resource)) (unless head-request-p (send-content resource (send-headers)))))) @@ -196,10 +196,10 @@ response will be generated and DEFAULT-RETURN-CODE will be used instead." (unless results - (setf (return-code) default-return-code) + (setf (return-code*) default-return-code) (abort-request-handler)) - (setf (content-type) "text/xml; charset=utf-8" - (return-code) +http-multi-status+) + (setf (content-type*) "text/xml; charset=utf-8" + (return-code*) +http-multi-status+) ;; use a hash table to group by status code (let ((status-hash (make-hash-table))) (loop for (status . resource) in results @@ -295,8 +295,8 @@ (failed-dependency))) (let ((results (copy-or-move-resource* source destination movep depth-value))) (cond (results (multi-status results)) - (destination-exists (setf (return-code) +http-no-content+ - (content-type) nil) + (destination-exists (setf (return-code*) +http-no-content+ + (content-type*) nil) nil) (t (resource-created destination)))))))) @@ -322,7 +322,7 @@ (error (condition) (warn "While trying to create collection ~S: ~A" (resource-script-name resource) condition) - (setf (return-code) +http-internal-server-error+)) + (setf (return-code*) +http-internal-server-error+)) (:no-error (&rest args) (declare (ignore args)) (resource-created resource))))) \ No newline at end of file Modified: trunk/thirdparty/cl-webdav/resources.lisp =================================================================== --- trunk/thirdparty/cl-webdav/resources.lisp 2010-02-17 06:12:43 UTC (rev 4511) +++ trunk/thirdparty/cl-webdav/resources.lisp 2010-02-18 11:02:41 UTC (rev 4512) @@ -204,9 +204,9 @@ method if you're sitting behind a proxy.") (:method (resource) (format nil "http~:[~;s~]://~A~@[:~A~]/" - (ssl-p) - (ppcre:regex-replace ":\\d+$" (host) "") - (server-port)))) + (acceptor-ssl-p *acceptor*) + (ppcre:regex-replace ":\\d+$" (acceptor-address *acceptor*) "") + (acceptor-port *acceptor*)))) (defgeneric get-dead-properties (resource) (:documentation "This function must return all dead properties @@ -399,9 +399,9 @@ "Utility function which sets up Hunchentoot's *REPLY* object for a +HTTP-CREATED+ response corresponding to the newly-created resource RESOURCE." - (setf (content-type) (get-content-type resource) + (setf (content-type*) (get-content-type resource) (header-out :location) (resource-script-name resource) - (return-code) +http-created+) + (return-code*) +http-created+) (let ((etag (resource-etag resource)) (content-language (resource-content-language resource))) (when etag

1 0

[bknr-cvs] hans changed trunk/thirdparty/hunchentoot/
by BKNR Commits 17 Feb '10

17 Feb '10

Revision: 4511 Author: hans URL: http://bknr.net/trac/changeset/4511 Replace some uses of HANDLER-CASE* with HANDLER-CASE. These are catching specific error conditions which are internal to Hunchentoot and not relevant to a user who is debugging his own handlers. Reported by Allan Dee. U trunk/thirdparty/hunchentoot/acceptor.lisp U trunk/thirdparty/hunchentoot/headers.lisp U trunk/thirdparty/hunchentoot/request.lisp Modified: trunk/thirdparty/hunchentoot/acceptor.lisp =================================================================== --- trunk/thirdparty/hunchentoot/acceptor.lisp 2010-02-16 21:14:38 UTC (rev 4510) +++ trunk/thirdparty/hunchentoot/acceptor.lisp 2010-02-17 06:12:43 UTC (rev 4511) @@ -375,7 +375,7 @@ (return)) (when (usocket:wait-for-input listener :ready-only t :timeout +new-connection-wait-time+) (when-let (client-connection - (handler-case* (usocket:socket-accept listener) + (handler-case (usocket:socket-accept listener) ;; ignore condition (usocket:connection-aborted-error ()))) (set-timeouts client-connection Modified: trunk/thirdparty/hunchentoot/headers.lisp =================================================================== --- trunk/thirdparty/hunchentoot/headers.lisp 2010-02-16 21:14:38 UTC (rev 4510) +++ trunk/thirdparty/hunchentoot/headers.lisp 2010-02-17 06:12:43 UTC (rev 4511) @@ -238,7 +238,7 @@ to close the connection instead, a timeout indicates that the connection timeout established by Hunchentoot has expired and we do not want to wait for another request any longer." - (handler-case* + (handler-case (let ((*current-error-message* "While reading initial request line:")) (with-mapped-conditions () (read-line* stream))) Modified: trunk/thirdparty/hunchentoot/request.lisp =================================================================== --- trunk/thirdparty/hunchentoot/request.lisp 2010-02-16 21:14:38 UTC (rev 4510) +++ trunk/thirdparty/hunchentoot/request.lisp 2010-02-17 06:12:43 UTC (rev 4511) @@ -283,7 +283,7 @@ (parse-content-type (header-in :content-type request)) (let ((external-format (or external-format (when charset - (handler-case* + (handler-case (make-external-format charset :eol-style :lf) (error () (hunchentoot-warn "Ignoring ~ @@ -467,7 +467,7 @@ returned." (when content-type (when-let (charset (nth-value 2 (parse-content-type content-type))) - (handler-case* + (handler-case (make-external-format (as-keyword charset) :eol-style :lf) (error () (hunchentoot-warn "Invalid character set ~S in request has been ignored."

1 0

[bknr-cvs] hans changed deployed/quickhoney/
by BKNR Commits 16 Feb '10

16 Feb '10

Revision: 4510 Author: hans URL: http://bknr.net/trac/changeset/4510 some minor fixes U deployed/quickhoney/bknr/datastore/src/utils/utils.lisp U deployed/quickhoney/bknr/web/src/web/menu.lisp U deployed/quickhoney/libraries/yason/yason.asd Modified: deployed/quickhoney/bknr/datastore/src/utils/utils.lisp =================================================================== --- deployed/quickhoney/bknr/datastore/src/utils/utils.lisp 2010-02-08 20:24:25 UTC (rev 4509) +++ deployed/quickhoney/bknr/datastore/src/utils/utils.lisp 2010-02-16 21:14:38 UTC (rev 4510) @@ -6,7 +6,7 @@ ,@(when doc (list doc)))) ;;; date format -;; Zeitzone fÃŒr Mail-Zeitstempel +;; Zeitzone fuer Mail-Zeitstempel (defparameter *mail-timezone* "+0100") (defun format-date-time (&optional universal-time &key stream Modified: deployed/quickhoney/bknr/web/src/web/menu.lisp =================================================================== --- deployed/quickhoney/bknr/web/src/web/menu.lisp 2010-02-08 20:24:25 UTC (rev 4509) +++ deployed/quickhoney/bknr/web/src/web/menu.lisp 2010-02-16 21:14:38 UTC (rev 4510) @@ -43,8 +43,7 @@ (declare (ignore menu-name)) (let* ((menu (bknr.impex:parse-xml-file #+cmu (ext:unix-namestring (merge-pathnames config *default-pathname-defaults*)) - #+sbcl (sb-int:unix-namestring (merge-pathnames config *default-pathname-defaults*)) - #-(or cmu sbcl) (namestring (probe-file (merge-pathnames config *default-pathname-defaults*))) + #-cmu (namestring (probe-file (merge-pathnames config *default-pathname-defaults*))) *menu-def-classes*))) (html ((:div :class container-class) Modified: deployed/quickhoney/libraries/yason/yason.asd =================================================================== --- deployed/quickhoney/libraries/yason/yason.asd 2010-02-08 20:24:25 UTC (rev 4509) +++ deployed/quickhoney/libraries/yason/yason.asd 2010-02-16 21:14:38 UTC (rev 4510) @@ -1,6 +1,6 @@ ;; This file is part of yason, a Common Lisp JSON parser/encoder ;; -;; Copyright (c) 2008 Hans Hübner +;; Copyright (c) 2008 Hans Huebner ;; All rights reserved. ;; ;; Please see the file LICENSE in the distribution.

1 0

[bknr-cvs] edi changed trunk/thirdparty/hunchentoot/CHANGELOG
by BKNR Commits 28 Dec '09

28 Dec '09

Revision: 4495 Author: edi URL: http://bknr.net/trac/changeset/4495 changelog U trunk/thirdparty/hunchentoot/CHANGELOG Modified: trunk/thirdparty/hunchentoot/CHANGELOG =================================================================== --- trunk/thirdparty/hunchentoot/CHANGELOG 2009-12-28 16:40:26 UTC (rev 4494) +++ trunk/thirdparty/hunchentoot/CHANGELOG 2009-12-28 16:41:17 UTC (rev 4495) @@ -2,10 +2,11 @@ Re-introduced *CATCH-ERRORS-P* and MAYBE-INVOKE-DEBUGGER Integration with trivial-backtrace (see *LOG-LISP-BACKTRACES-P*) 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 and Stephen P. Compall) -Fix STOP by supplying the :READY-ONLY keyword to USOCKET:WAIT-FOR-INPUT -Enable SSL key passwords for Lisps other than LW (Vsevolod) +Fixed RESET-SESSIONS +Prepared for LispWorks 6 (Nico de Jager) +Fixed reading of post parameters (Peter Seibel and Stephen P. Compall) +Fixed STOP by supplying the :READY-ONLY keyword to USOCKET:WAIT-FOR-INPUT +Enabled SSL key passwords for Lisps other than LW (Vsevolod) Version 1.0.0 2009-02-19

1 0

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

28 Dec '09

Revision: 4494 Author: edi URL: http://bknr.net/trac/changeset/4494 Fix reset-sessions U trunk/thirdparty/hunchentoot/doc/index.xml U trunk/thirdparty/hunchentoot/session.lisp Modified: trunk/thirdparty/hunchentoot/doc/index.xml =================================================================== --- trunk/thirdparty/hunchentoot/doc/index.xml 2009-12-27 23:14:59 UTC (rev 4493) +++ trunk/thirdparty/hunchentoot/doc/index.xml 2009-12-28 16:40:26 UTC (rev 4494) @@ -2134,10 +2134,15 @@ <clix:function name='reset-sessions'> <clix:lambda-list> + <clix:lkw>optional + </clix:lkw> acceptor </clix:lambda-list> <clix:returns>| </clix:returns> - <clix:description>Removes all stored sessions. + <clix:description>Removes all stored sessions + of <clix:arg>acceptor</clix:arg>. The default + for <clix:arg>acceptor</clix:arg> + is <clix:ref>*ACCEPTOR*</clix:ref>. </clix:description> </clix:function> Modified: trunk/thirdparty/hunchentoot/session.lisp =================================================================== --- trunk/thirdparty/hunchentoot/session.lisp 2009-12-27 23:14:59 UTC (rev 4493) +++ trunk/thirdparty/hunchentoot/session.lisp 2009-12-28 16:40:26 UTC (rev 4494) @@ -353,10 +353,10 @@ cease to be valid." (setq *session-secret* (create-random-string 10 36))) -(defun reset-sessions () - "Removes ALL stored sessions." - (with-session-lock-held ((session-db-lock *acceptor*)) - (loop for (nil . session) in (session-db *acceptor*) +(defun reset-sessions (&optional (acceptor *acceptor*)) + "Removes ALL stored sessions of ACCEPTOR." + (with-session-lock-held ((session-db-lock acceptor)) + (loop for (nil . session) in (session-db acceptor) do (funcall *session-removal-hook* session)) (setq *session-db* nil)) (values)) \ No newline at end of file

1 0

[bknr-cvs] edi changed trunk/thirdparty/hunchentoot/CHANGELOG
by BKNR Commits 28 Dec '09

28 Dec '09

Revision: 4493 Author: edi URL: http://bknr.net/trac/changeset/4493 Missing changelog entry U trunk/thirdparty/hunchentoot/CHANGELOG Modified: trunk/thirdparty/hunchentoot/CHANGELOG =================================================================== --- trunk/thirdparty/hunchentoot/CHANGELOG 2009-12-27 23:12:39 UTC (rev 4492) +++ trunk/thirdparty/hunchentoot/CHANGELOG 2009-12-27 23:14:59 UTC (rev 4493) @@ -3,7 +3,7 @@ Integration with trivial-backtrace (see *LOG-LISP-BACKTRACES-P*) 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 reading of post parameters (Peter Seibel and Stephen P. Compall) Fix STOP by supplying the :READY-ONLY keyword to USOCKET:WAIT-FOR-INPUT Enable SSL key passwords for Lisps other than LW (Vsevolod)

1 0

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

28 Dec '09

Revision: 4492 Author: edi URL: http://bknr.net/trac/changeset/4492 Backtraces U trunk/thirdparty/hunchentoot/CHANGELOG U trunk/thirdparty/hunchentoot/acceptor.lisp U trunk/thirdparty/hunchentoot/conditions.lisp U trunk/thirdparty/hunchentoot/doc/index.xml U trunk/thirdparty/hunchentoot/hunchentoot.asd U trunk/thirdparty/hunchentoot/packages.lisp U trunk/thirdparty/hunchentoot/specials.lisp U trunk/thirdparty/hunchentoot/util.lisp Modified: trunk/thirdparty/hunchentoot/CHANGELOG =================================================================== --- trunk/thirdparty/hunchentoot/CHANGELOG 2009-12-27 21:53:14 UTC (rev 4491) +++ trunk/thirdparty/hunchentoot/CHANGELOG 2009-12-27 23:12:39 UTC (rev 4492) @@ -1,5 +1,6 @@ Architectural changes - see HANDLE-REQUEST (thanks to Andreas Fuchs and Frode Fjeld) Re-introduced *CATCH-ERRORS-P* and MAYBE-INVOKE-DEBUGGER +Integration with trivial-backtrace (see *LOG-LISP-BACKTRACES-P*) 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-12-27 21:53:14 UTC (rev 4491) +++ trunk/thirdparty/hunchentoot/acceptor.lisp 2009-12-27 23:12:39 UTC (rev 4492) @@ -437,7 +437,10 @@ (handler-bind ((error (lambda (cond) (when *log-lisp-errors-p* - (log-message *lisp-errors-log-level* "~A" cond)) + (log-message *lisp-errors-log-level* + "~A~:[~*~;~%~:*~A~]" + cond + (and *log-lisp-backtraces-p* (get-backtrace)))) ;; if the headers were already sent, the error ;; happened within the body and we have to close ;; the stream @@ -449,4 +452,5 @@ (lambda (cond) (when *log-lisp-warnings-p* (log-message *lisp-warnings-log-level* "~A" cond))))) - (funcall (acceptor-request-dispatcher *acceptor*) *request*))) \ No newline at end of file + (with-debugger + (funcall (acceptor-request-dispatcher *acceptor*) *request*)))) Modified: trunk/thirdparty/hunchentoot/conditions.lisp =================================================================== --- trunk/thirdparty/hunchentoot/conditions.lisp 2009-12-27 21:53:14 UTC (rev 4491) +++ trunk/thirdparty/hunchentoot/conditions.lisp 2009-12-27 23:12:39 UTC (rev 4492) @@ -113,4 +113,13 @@ (defmacro handler-case* (expression &rest clauses) "Like HANDLER-CASE, but observes *CATCH-ERRORS-P*." `(handler-case (with-debugger ,expression) - ,@clauses)) \ No newline at end of file + ,@clauses)) + +(defun get-backtrace () + "Returns a string with a backtrace of what the Lisp system thinks is +the \"current\" error." + (handler-case + (with-output-to-string (s) + (trivial-backtrace:print-backtrace-to-stream s)) + (error (condition) + (format nil "Could not generate backtrace: ~A." condition)))) Modified: trunk/thirdparty/hunchentoot/doc/index.xml =================================================================== --- trunk/thirdparty/hunchentoot/doc/index.xml 2009-12-27 21:53:14 UTC (rev 4491) +++ trunk/thirdparty/hunchentoot/doc/index.xml 2009-12-27 23:12:39 UTC (rev 4492) @@ -85,6 +85,7 @@ <li>Kevin Rosenberg's <a href="http://www.cliki.net/cl-base64">CL-BASE64</a>,</li> <li>Janis Dzerins' <a href="http://common-lisp.net/project/rfc2388/">RFC2388</a>,</li> <li>Peter Seibel's <a href="http://weitz.de/cl-fad/">CL-FAD</a>,</li> + <li>Gary King's <a href="http://common-lisp.net/project/trivial-backtrace/">trivial-backtrace</a>,</li> <li>Erik Huelsmann's <a href="http://common-lisp.net/project/usocket">usocket</a> (unless you're using LispWorks),</li> <li>Greg Pfeil's <a href="http://common-lisp.net/project/bordeaux-threads/">Bordeaux Threads</a> (unless you're using LispWorks), @@ -2588,6 +2589,13 @@ </clix:description> </clix:special-variable> + <clix:special-variable name='*log-lisp-backtraces-p*'> + <clix:description>Whether Lisp backtraces should be logged. Only + has an effect if <clix:ref>*LOG-LISP-ERRORS-P*</clix:ref> is true + as well. + </clix:description> + </clix:special-variable> + <clix:special-variable name='*log-lisp-warnings-p*'> <clix:description>Whether Lisp warnings in request handlers should be logged. </clix:description> Modified: trunk/thirdparty/hunchentoot/hunchentoot.asd =================================================================== --- trunk/thirdparty/hunchentoot/hunchentoot.asd 2009-12-27 21:53:14 UTC (rev 4491) +++ trunk/thirdparty/hunchentoot/hunchentoot.asd 2009-12-27 23:12:39 UTC (rev 4492) @@ -51,6 +51,7 @@ #-(or :lispworks :hunchentoot-no-ssl) :cl+ssl :md5 :rfc2388 + :trivial-backtrace #-:lispworks :usocket #-:lispworks :bordeaux-threads) :components ((:module url-rewrite Modified: trunk/thirdparty/hunchentoot/packages.lisp =================================================================== --- trunk/thirdparty/hunchentoot/packages.lisp 2009-12-27 21:53:14 UTC (rev 4491) +++ trunk/thirdparty/hunchentoot/packages.lisp 2009-12-27 23:12:39 UTC (rev 4492) @@ -59,6 +59,7 @@ "*LISP-ERRORS-LOG-LEVEL*" "*LISP-WARNINGS-LOG-LEVEL*" "*LISTENER*" + "*LOG-LISP-BACKTRACES-P*" "*LOG-LISP-ERRORS-P*" "*LOG-LISP-WARNINGS-P*" "*MESSAGE-LOG-PATHNAME*" @@ -71,6 +72,7 @@ "*SESSION-MAX-TIME*" "*SESSION-REMOVAL-HOOK*" "*SESSION-SECRET*" + "*SHOW-LISP-BACKTRACES-P*" "*SHOW-LISP-ERRORS-P*" "*TMP-DIRECTORY*" "*USE-REMOTE-ADDR-FOR-SESSIONS*" Modified: trunk/thirdparty/hunchentoot/specials.lisp =================================================================== --- trunk/thirdparty/hunchentoot/specials.lisp 2009-12-27 21:53:14 UTC (rev 4491) +++ trunk/thirdparty/hunchentoot/specials.lisp 2009-12-27 23:12:39 UTC (rev 4492) @@ -199,6 +199,10 @@ (defvar *log-lisp-errors-p* t "Whether Lisp errors in request handlers should be logged.") +(defvar *log-lisp-backtraces-p* t + "Whether Lisp backtraces should be logged. Only has an effect if +*LOG-LISP-ERRORS-P* is true as well.") + (defvar *log-lisp-warnings-p* t "Whether Lisp warnings in request handlers should be logged.") Modified: trunk/thirdparty/hunchentoot/util.lisp =================================================================== --- trunk/thirdparty/hunchentoot/util.lisp 2009-12-27 21:53:14 UTC (rev 4491) +++ trunk/thirdparty/hunchentoot/util.lisp 2009-12-27 23:12:39 UTC (rev 4492) @@ -327,4 +327,4 @@ `(progn ,@body) #-:lispworks `(usocket:with-mapped-conditions () - ,@body)) \ No newline at end of file + ,@body))

1 0

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

27 Dec '09

Revision: 4491 Author: edi URL: http://bknr.net/trac/changeset/4491 Documentation U trunk/thirdparty/hunchentoot/doc/index.xml U trunk/thirdparty/hunchentoot/request.lisp Modified: trunk/thirdparty/hunchentoot/doc/index.xml =================================================================== --- trunk/thirdparty/hunchentoot/doc/index.xml 2009-12-27 21:10:34 UTC (rev 4490) +++ trunk/thirdparty/hunchentoot/doc/index.xml 2009-12-27 21:53:14 UTC (rev 4491) @@ -613,18 +613,11 @@ stream object in <clix:arg>socket</clix:arg>. It reads the request headers, sets up the <a href="#requests">request</a> and <a href="#replies">reply</a> objects, and hands over to <clix:ref>PROCESS-REQUEST</clix:ref> which -selects and calls a handler for the request and sends its reply to the -client. This is done in a loop until the stream has to be closed or -until a connection timeout occurs. - - -It is probably not a good idea to re-implement this method until you -really, really know what you're doing, but you can for example write -an around method specialized for your subclass -of <clix:ref>ACCEPTOR</clix:ref> which binds or rebinds special -variables which can then be accessed by -your <a href="#handlers">handlers</a>. - +calls <clix:ref>HANDLE-REQUEST</clix:ref> to select and call a handler +for the request and sends its reply to the client. This is done in a +loop until the stream has to be closed or until a connection timeout +occurs. It is probably not a good idea to re-implement this method +until you really, really know what you're doing. </clix:description> </clix:function> @@ -766,35 +759,41 @@ <clix:subchapter name="request-dispatch" title="Request dispatch and handling"> -The main job of <clix:ref>PROCESS-REQUEST</clix:ref> is to select and +The main job of <clix:ref>HANDLE-REQUEST</clix:ref> is to select and call a function which handles the request, i.e. which looks at the data the client has sent and prepares an appropriate reply to send -back. This is implemented as follows: +back. This is by default implemented as follows: Each acceptor has a <a href="#acceptor-request-dispatcher">request dispatcher</a> which is a unary function that accepts -a <clix:ref>REQUEST</clix:ref> object. This function is called by -<clix:ref>PROCESS-REQUEST</clix:ref>. The idea is that this function -looks at the request object and depending on its contents decides to -call another function which "does the work". This "other" function is -by convention called a <a class="none" name="handlers">request -handler</a>. (Obviously, this is really only a convention as -process-request doesn't "know" what the request dispatcher does. You -could as well say that the request dispatcher and the request handler -have the same job.) +a <clix:ref>REQUEST</clix:ref> object. This function is called by the +default method of <clix:ref>HANDLE-REQUEST</clix:ref>. The idea is +that this function looks at the request object and depending on its +contents decides to call another function which "does the work". This +"other" function is by convention called a <a class="none" +name="handlers">request handler</a>. (Obviously, this is +really only a convention as <clix:ref>HANDLE-REQUEST</clix:ref> +doesn't "know" what the request dispatcher does. You could as well +say that the request dispatcher and the request handler have the same +job.) -The default behaviour, unless you implement your own request +The default behaviour, unless your acceptor has its own request dispatcher, is that Hunchentoot walks through the list -*dispatch-table* which consists of dispatch functions. Each -of these functions accepts the request object as its only argument and -either returns a request handler to handle the request -or <code>NIL</code> which means that the next dispatcher in the list -will be tried. If all dispatch functions return <code>NIL</code>, the -return code +<clix:ref>*DISPATCH-TABLE*</clix:ref> which consists of dispatch +functions. Each of these functions accepts the request object as +its only argument and either returns a request handler to handle the +request or <code>NIL</code> which means that the next dispatcher in +the list will be tried. If all dispatch functions +return <code>NIL</code>, the return code <clix:ref>+HTTP-NOT-FOUND+</clix:ref> will be sent to the client. +The default method of <clix:ref>HANDLE-REQUEST</clix:ref> also sets up +<a href="#logging">standard error handling</a> before it calls the acceptor's request +dispatcher. + + All functions and variables in this section are related to the standard request dispatch mechanism described above and are meaningless if you're using your own request dispatcher. @@ -1570,24 +1569,48 @@ </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 -while <clix:ref>PROCESS-REQUEST</clix:ref> is called anew for each -request. +after the incoming headers have been read. It +calls <clix:ref>HANDLE-REQUEST</clix:ref> (and is more or less just a +thin wrapper around it) to select and call a +<a href="#handlers">handler</a> and send the output of this handler to +the client. Note that <clix:ref>PROCESS-CONNECTION</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. -The return value of this function is ignored. +Like <clix:ref>PROCESS-CONNECTION</clix:ref>, this is another function +the behaviour of which you should only modify if you really, really +know what you're doing. </clix:description> </clix:function> + <clix:function generic='true' name='handle-request'> + <clix:lambda-list>acceptor request + </clix:lambda-list> + <clix:returns>content + </clix:returns> + <clix:description> +This function is called by <clix:ref>PROCESS-REQUEST</clix:ref> once +the request has been read and a <clix:ref>REQUEST</clix:ref> object +has been created. Its job is to actually handle the request, i.e. to +return something to the client. + +The default method calls the +acceptor's <a href="#request-dispatch">request dispatcher</a>, but you +can of course implement a different behaviour. The default method +also sets up <a href="#logging">standard error handling</a> for +the <a href="#handlers">handler</a>. + + +Might be a good place to bind or rebind special variables which can +then be accessed by your <a href="#handlers">handlers</a>. + + </clix:description> + </clix:function> <clix:readers generic='true'> Modified: trunk/thirdparty/hunchentoot/request.lisp =================================================================== --- trunk/thirdparty/hunchentoot/request.lisp 2009-12-27 21:10:34 UTC (rev 4490) +++ trunk/thirdparty/hunchentoot/request.lisp 2009-12-27 21:53:14 UTC (rev 4491) @@ -97,16 +97,14 @@ (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 HANDLE-REQUEST to +select and call a handler and sends the output of this handler to the +client using START-OUTPUT. 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. -Like PROCESS-CONNECTION, this might be a good place to introduce -around methods which bind special variables or do other interesting -things. +Essentially, you can view process-request as a thin wrapper around +HANDLE-REQUEST. The return value of this function is ignored."))

1 0

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

27 Dec '09

Revision: 4490 Author: edi URL: http://bknr.net/trac/changeset/4490 Resurrect *catch-errors-p* and more Some documentation still has to be updated U trunk/thirdparty/hunchentoot/CHANGELOG U trunk/thirdparty/hunchentoot/acceptor.lisp U trunk/thirdparty/hunchentoot/conditions.lisp U trunk/thirdparty/hunchentoot/doc/index.xml U trunk/thirdparty/hunchentoot/easy-handlers.lisp U trunk/thirdparty/hunchentoot/headers.lisp D trunk/thirdparty/hunchentoot/hunchentoot-test.asd U trunk/thirdparty/hunchentoot/hunchentoot.asd U trunk/thirdparty/hunchentoot/lispworks.lisp U trunk/thirdparty/hunchentoot/packages.lisp U trunk/thirdparty/hunchentoot/request.lisp U trunk/thirdparty/hunchentoot/specials.lisp U trunk/thirdparty/hunchentoot/taskmaster.lisp U trunk/thirdparty/hunchentoot/url-rewrite/primitives.lisp Change set too large, please see URL above

1 0

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

22 Dec '09

Revision: 4489 Author: edi URL: http://bknr.net/trac/changeset/4489 Revoke commit 4477 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-12-22 22:14:35 UTC (rev 4488) +++ trunk/thirdparty/hunchentoot/doc/index.xml 2009-12-22 22:28:12 UTC (rev 4489) @@ -1594,33 +1594,17 @@ </clix:returns> <clix:description> This function is called by <clix:ref>PROCESS-CONNECTION</clix:ref> -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, +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 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-12-22 22:14:35 UTC (rev 4488) +++ trunk/thirdparty/hunchentoot/packages.lisp 2009-12-22 22:28:12 UTC (rev 4489) @@ -167,7 +167,6 @@ "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-12-22 22:14:35 UTC (rev 4488) +++ trunk/thirdparty/hunchentoot/request.lisp 2009-12-22 22:28:12 UTC (rev 4489) @@ -95,22 +95,21 @@ 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 calls DISPATCH-REQUEST and -sends its output to the client. It also sets up simple error handling -for the request handler.")) +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. +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. @@ -211,12 +210,6 @@ ;; 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 @@ -233,7 +226,7 @@ ;; skip dispatch if bad request (when (eql (return-code *reply*) +http-ok+) ;; now do the work - (dispatch-request request))))) + (funcall (acceptor-request-dispatcher *acceptor*) *request*))))) (when error (setf (return-code *reply*) +http-internal-server-error+))

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

bknr-cvs