Revision: 4409 Author: hans URL: http://bknr.net/trac/changeset/4409

Put handler-case for usocket:connection-aborted-error around the right function call.

U trunk/thirdparty/hunchentoot/acceptor.lisp

Modified: trunk/thirdparty/hunchentoot/acceptor.lisp =================================================================== --- trunk/thirdparty/hunchentoot/acceptor.lisp 2009-05-20 13:56:06 UTC (rev 4408) +++ trunk/thirdparty/hunchentoot/acceptor.lisp 2009-05-20 13:57:58 UTC (rev 4409) @@ -368,15 +368,17 @@ (when (acceptor-shutdown-p acceptor) (return)) (when (usocket:wait-for-input listener :ready-only t :timeout +new-connection-wait-time+) - (handler-case - (when-let (client-connection (usocket:socket-accept listener)) - (set-timeouts client-connection - (acceptor-read-timeout acceptor) - (acceptor-write-timeout acceptor)) - (handle-incoming-connection (acceptor-taskmaster acceptor) - client-connection)) - ;; ignore condition - (usocket:connection-aborted-error ())))))) + (when-let (client-connection + (handler-case + (usocket:socket-accept listener) + + ;; ignore condition + (usocket:connection-aborted-error ()))) + (set-timeouts client-connection + (acceptor-read-timeout acceptor) + (acceptor-write-timeout acceptor)) + (handle-incoming-connection (acceptor-taskmaster acceptor) + client-connection))))))

;; LispWorks implementation