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."