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

[bknr-cvs] edi changed trunk/thirdparty/chunga/input.lisp
by BKNR Commits 09 Feb '09

09 Feb '09

Revision: 4213 Author: edi URL: http://bknr.net/trac/changeset/4213 And this file as well U trunk/thirdparty/chunga/input.lisp Modified: trunk/thirdparty/chunga/input.lisp =================================================================== --- trunk/thirdparty/chunga/input.lisp 2009-02-09 14:50:22 UTC (rev 4212) +++ trunk/thirdparty/chunga/input.lisp 2009-02-09 14:52:07 UTC (rev 4213) @@ -54,8 +54,10 @@ chunk-extensions nil chunk-trailers nil)) (t (when (< input-index input-limit) - (error "Not all chunks from ~S have been read completely." - stream)))))) + (error 'parameter-error + :stream stream + :format-control "Not all chunks from ~S have been read completely." + :format-arguments (list stream))))))) (setf (slot-value stream 'input-chunking-p) new-value)) (defmethod stream-clear-input ((stream chunked-input-stream)) @@ -96,7 +98,10 @@ "Reads chunk extensions \(if there are any) and stores them into the corresponding slot of the stream." (when-let (extensions (read-name-value-pairs inner-stream)) - (warn "Adding uninterpreted extensions to stream ~S." stream) + (warn 'chunga-warning + :stream stream + :format-control "Adding uninterpreted extensions to stream ~S." + :format-arguments (list stream)) (setf (slot-value stream 'chunk-extensions) (append (chunked-input-stream-extensions stream) extensions))) (assert-crlf inner-stream))

1 0

[bknr-cvs] edi changed trunk/thirdparty/chunga/
by BKNR Commits 09 Feb '09

09 Feb '09

Revision: 4212 Author: edi URL: http://bknr.net/trac/changeset/4212 Conditions U trunk/thirdparty/chunga/CHANGELOG.txt U trunk/thirdparty/chunga/chunga.asd U trunk/thirdparty/chunga/doc/index.html U trunk/thirdparty/chunga/packages.lisp U trunk/thirdparty/chunga/read.lisp U trunk/thirdparty/chunga/streams.lisp Modified: trunk/thirdparty/chunga/CHANGELOG.txt =================================================================== --- trunk/thirdparty/chunga/CHANGELOG.txt 2009-02-09 14:16:22 UTC (rev 4211) +++ trunk/thirdparty/chunga/CHANGELOG.txt 2009-02-09 14:50:22 UTC (rev 4212) @@ -1,6 +1,7 @@ Version 1.0.0 2009-02-10 Switched to binary streams underneath and got rid of FLEXI-STREAMS dependency +Added conditions Exported (an improved version of) AS-KEYWORD Added WITH-CHARACTER-STREAM-SEMANTICS Modified: trunk/thirdparty/chunga/chunga.asd =================================================================== --- trunk/thirdparty/chunga/chunga.asd 2009-02-09 14:16:22 UTC (rev 4211) +++ trunk/thirdparty/chunga/chunga.asd 2009-02-09 14:50:22 UTC (rev 4212) @@ -35,6 +35,7 @@ (:file "specials") (:file "util") (:file "known-words") + (:file "conditions") (:file "read") (:file "streams") (:file "input") Modified: trunk/thirdparty/chunga/doc/index.html =================================================================== --- trunk/thirdparty/chunga/doc/index.html 2009-02-09 14:16:22 UTC (rev 4211) +++ trunk/thirdparty/chunga/doc/index.html 2009-02-09 14:50:22 UTC (rev 4212) @@ -72,6 +72,11 @@ </ol> <li><a href="#conditions">Conditions</a> <ol> + <li><a href="#chunga-condition"><code>chunga-condition</code></a> + <li><a href="#chunga-error"><code>chunga-error</code></a> + <li><a href="#chunga-warning"><code>chunga-warning</code></a> + <li><a href="#syntax-error"><code>syntax-error</code></a> + <li><a href="#parameter-error"><code>parameter-error</code></a> <li><a href="#input-chunking-body-corrupted"><code>input-chunking-body-corrupted</code></a> <li><a href="#input-chunking-unexpected-end-of-file"><code>input-chunking-unexpected-end-of-file</code></a> </ol> @@ -342,9 +347,69 @@ <h4><a name="conditions" class=none>Conditions</a></h4> -Here are two conditions which might be signaled if something bad -happens while reading from a chunked stream: +Here are conditions which might be signalled if something bad happens +with a chunked stream. + + + [Condition] + <a class=none name="chunga-condition">chunga-condition</a> + +<blockquote> +All conditions signalled by Chunga are of this type. This is a subtype of <a href="http://www.lispworks.com/documentation/HyperSpec/Body/e_cnd.htm"><code>CONDITION</code></a>. +</blockquote> + + + + + + [Error] + <a class=none name="chunga-error">chunga-error</a> + +<blockquote> +All errors signalled by Chunga are of this type. This is a subtype of <a href="#chunga-condition"><code>CHUNGA-CONDITION</code></a> and of +<a href="http://www.lispworks.com/documentation/HyperSpec/Body/e_stm_er.htm"><code>STREAM-ERROR</code></a>, +so <a href="http://www.lispworks.com/documentation/HyperSpec/Body/f_stm_er.htm"><code>STREAM-ERROR-STREAM</code></a> +can be used to access the offending stream. +</blockquote> + + + + + + [Warning] + <a class=none name="chunga-warning">chunga-warning</a> + +<blockquote> +All warnings signalled by Chunga are of this type. This is a subtype of <a href="#chunga-condition"><code>CHUNGA-CONDITION</code></a> and of <a href="http://www.lispworks.com/documentation/HyperSpec/Body/e_warnin.htm"><code>WARNING</code></a>. +</blockquote> + + + + + + [Error] + <a class=none name="syntax-error">syntax-error</a> + +<blockquote> An error of this type is signalled if Chunga +encounters wrong or unknown syntax when reading data. This is a +subtype of <a href="#chunga-error"><code>CHUNGA-ERROR</code></a>. +</blockquote> + + + + + + [Error] + <a class=none name="parameter-error">parameter-error</a> + +<blockquote> An error of this type is signalled if a function was +called with inconsistent or illegal parameters. This is a subtype +of <a href="#chunga-error"><code>CHUNGA-ERROR</code></a>. +</blockquote> + + +  [Condition type] <a class=none name='input-chunking-body-corrupted'>input-chunking-body-corrupted</a> @@ -353,11 +418,7 @@ A condition of this type is signaled if an unexpected character (octet) is read while reading from a <a href="#stream">chunked stream</a> with input chunking enabled. This is a subtype of -<a -href="http://www.lispworks.com/documentation/HyperSpec/Body/e_stm_er.htm"><code>STREAM-ERROR</code></a>, -so <a -href="http://www.lispworks.com/documentation/HyperSpec/Body/f_stm_er.htm"><code>STREAM-ERROR-STREAM</code></a> -can be used to access the offending stream. +<a href="#chunga-error"><code>CHUNGA-ERROR</code></a>. </blockquote> @@ -372,11 +433,7 @@ A condition of this type is signaled if we reach an unexpected EOF on a <a href="#stream">chunked stream</a> with input chunking enabled. This is a subtype of -<a -href="http://www.lispworks.com/documentation/HyperSpec/Body/e_stm_er.htm"><code>STREAM-ERROR</code></a>, -so <a -href="http://www.lispworks.com/documentation/HyperSpec/Body/f_stm_er.htm"><code>STREAM-ERROR-STREAM</code></a> -can be used to access the offending stream. +<a href="#chunga-error"><code>CHUNGA-ERROR</code></a>. </blockquote> Modified: trunk/thirdparty/chunga/packages.lisp =================================================================== --- trunk/thirdparty/chunga/packages.lisp 2009-02-09 14:16:22 UTC (rev 4211) +++ trunk/thirdparty/chunga/packages.lisp 2009-02-09 14:50:22 UTC (rev 4212) @@ -39,6 +39,8 @@ :assert-char :as-keyword :as-capitalized-string + :chunga-error + :chunga-warning :chunked-input-stream :chunked-input-stream-extensions :chunked-input-stream-trailers @@ -58,6 +60,7 @@ :read-name-value-pairs :read-token :skip-whitespace + :syntax-error :trim-whitespace :with-character-stream-semantics)) Modified: trunk/thirdparty/chunga/read.lisp =================================================================== --- trunk/thirdparty/chunga/read.lisp 2009-02-09 14:16:22 UTC (rev 4211) +++ trunk/thirdparty/chunga/read.lisp 2009-02-09 14:50:22 UTC (rev 4212) @@ -29,17 +29,23 @@ (in-package :chunga) -(defun signal-unexpected-chars (last-char expected-chars) +(defun signal-unexpected-chars (stream last-char expected-chars) "Signals an error that LAST-CHAR was read although one of -EXPECTED-CHARS was expected. \(Note that EXPECTED-CHARS, -despites its name, can also be a single character instead of a -list). Uses *CURRENT-ERROR-MESSAGE* if it's not NIL, or calls -*CURRENT-ERROR-FUNCTION* otherwise." +EXPECTED-CHARS was expected. \(Note that EXPECTED-CHARS, despites its +name, can also be a single character instead of a list). Calls +*CURRENT-ERROR-FUNCTION* if it's not NIL, or uses +*CURRENT-ERROR-MESSAGE* otherwise." (cond (*current-error-function* (funcall *current-error-function* last-char expected-chars)) - (*current-error-message* - (error "~@[~A~%~]~:[End of file~;Read character ~:*~S~], but expected ~:[a member of ~S~;~S~]." - *current-error-message* last-char (atom expected-chars) expected-chars)))) + (t + (error 'syntax-error + :stream stream + :format-control "~@[~A~%~]~:[End of file~;Read character ~:*~S~], ~ +but expected ~:[a member of ~S~;~S~]." + :format-arguments (list *current-error-message* + last-char + (atom expected-chars) + expected-chars))))) (defun charp (char) "Returns true if the Lisp character CHAR is a CHAR according to RFC 2616." @@ -73,7 +79,7 @@ character EXPECTED-CHAR. Signals an error otherwise." (let ((char (read-char* stream))) (unless (and char (char= char expected-char)) - (signal-unexpected-chars char expected-char)) + (signal-unexpected-chars stream char expected-char)) char)) (defun assert-crlf (stream) @@ -170,7 +176,10 @@ Returns NIL if LINE consists solely of whitespace." (unless (zerop (length (trim-whitespace line))) (let ((colon-pos (or (position #\: line :test #'char=) - (error "Couldn't find colon in header line ~S." line)))) + (error 'syntax-error + :stream stream + :format-control "Couldn't find colon in header line ~S." + :format-arguments (list line))))) (cons (as-keyword (subseq line 0 colon-pos)) (trim-whitespace (subseq line (1+ colon-pos))))))) (add-header (pair) @@ -231,7 +240,7 @@ (#\Return (assert-char stream #\Linefeed) (let ((char (read-char* stream))) (unless (whitespacep char) - (signal-unexpected-chars char '(#\Space #\Tab))))) + (signal-unexpected-chars stream char '(#\Space #\Tab))))) (otherwise (write-char char out)))))) (defun read-cookie-value (stream &key name separators) Modified: trunk/thirdparty/chunga/streams.lisp =================================================================== --- trunk/thirdparty/chunga/streams.lisp 2009-02-09 14:16:22 UTC (rev 4211) +++ trunk/thirdparty/chunga/streams.lisp 2009-02-09 14:50:22 UTC (rev 4212) @@ -110,40 +110,16 @@ (close real-stream :abort abort)) (t nil)))) -(define-condition input-chunking-unexpected-end-of-file (stream-error) - () - (:documentation "A condition of this type is signaled if we -reach an unexpected EOF on a chunked stream with input chunking -enabled. This is a subtype of STREAM-ERROR, so -STREAM-ERROR-STREAM can be used to access the offending -stream.")) - -(define-condition input-chunking-body-corrupted (stream-error) - ((last-char :initarg :last-char - :documentation "The \(unexpected) character which was read.") - (expected-chars :initarg :expected-chars - :documentation "The characters which were -expected. A list of characters or one single character.")) - (:report (lambda (condition stream) - (with-slots (last-char expected-chars) - condition - (format stream "Chunked stream ~S seems to be corrupted. -Read character ~S, but expected ~:[a member of ~S~;~S~]." - (stream-error-stream condition) - last-char (atom expected-chars) expected-chars)))) - (:documentation "A condition of this type is signaled if an -unexpected character \(octet) is read while reading from a -chunked stream with input chunking enabled. This is a subtype of -STREAM-ERROR, so STREAM-ERROR-STREAM can be used to access the -offending stream.")) - (defun make-chunked-stream (stream) "Creates and returns a chunked stream \(a stream of type CHUNKED-STREAM) which wraps STREAM. STREAM must be an open binary stream." (unless (and (streamp stream) (open-stream-p stream)) - (error "~S should have been an open stream." stream)) + (error 'parameter-error + :stream stream + :format-control "~S should have been an open stream." + :format-arguments (list stream))) (make-instance ;; actual type depends on STREAM (cond ((and (input-stream-p stream) (output-stream-p stream))

1 0

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

09 Feb '09

Revision: 4211 Author: edi URL: http://bknr.net/trac/changeset/4211 Tweak here and there U trunk/thirdparty/hunchentoot/CHANGELOG U trunk/thirdparty/hunchentoot/util.lisp Modified: trunk/thirdparty/hunchentoot/CHANGELOG =================================================================== --- trunk/thirdparty/hunchentoot/CHANGELOG 2009-02-09 13:44:09 UTC (rev 4210) +++ trunk/thirdparty/hunchentoot/CHANGELOG 2009-02-09 14:16:22 UTC (rev 4211) @@ -1,3 +1,8 @@ +Version 1.0.0 +2009-02-10 +Architectural redesign (thanks to Hans Hübner) +Lots of small fixes and improvement, too many to enumerate here + Version 0.15.6 2008-04-09 Fixed embarrassingly mis-placed parentheses (thanks to Hans Hübner) Modified: trunk/thirdparty/hunchentoot/util.lisp =================================================================== --- trunk/thirdparty/hunchentoot/util.lisp 2009-02-09 13:44:09 UTC (rev 4210) +++ trunk/thirdparty/hunchentoot/util.lisp 2009-02-09 14:16:22 UTC (rev 4211) @@ -229,59 +229,69 @@ ((#\") (write-string "\\\"" out)) (otherwise (write-char char out))))))) -(defmacro upgrade-vector (vector new-type &key converter (new-length `(array-total-size ,vector))) - `(setf ,vector (loop - with new-vector = (make-array ,new-length - :element-type ,new-type - :fill-pointer (length vector)) - for i from 0 below (length ,vector) - do (setf (aref new-vector i) ,(if converter - `(funcall ,converter (aref ,vector i)) - `(aref ,vector i))) - finally (return new-vector)))) +(defmacro upgrade-vector (vector new-type &key converter) + "Returns a vector with the same length and the same elements as +VECTOR \(a variable holding a vector) but having element type +NEW-TYPE. If CONVERTER is not NIL, it should designate a function +which will be applied to each element of VECTOR before the result is +stored in the new vector. The resulting vector will have a fill +pointer set to its end. +The macro also uses SETQ to store the new vector in VECTOR." + `(setq ,vector + (loop with length = (length ,vector) + with new-vector = (make-array length + :element-type ,new-type + :fill-pointer length) + for i below length + do (setf (aref new-vector i) ,(if converter + `(funcall ,converter (aref ,vector i)) + `(aref ,vector i))) + finally (return new-vector)))) + (defun url-decode (string &optional (external-format *hunchentoot-default-external-format*)) "Decodes a URL-encoded STRING which is assumed to be encoded using the external format EXTERNAL-FORMAT." - (if (zerop (length string)) - "" - (loop - with vector = (make-array (length string) :element-type 'octet :fill-pointer 0) - with i = 0 - with unicode - for char = (aref string i) - do (labels ((decode-hex (length) - (prog1 - (parse-integer string :start i :end (+ i length) :radix 16) - (incf i length))) - (push-integer (integer) - (vector-push integer vector)) - (peek () - (aref string i)) - (advance () - (setf char (peek)) - (incf i))) - (cond - ((char= #\% char) - (advance) - (cond - ((char= #\u (peek)) - (unless unicode - (setf unicode t) - (upgrade-vector vector '(integer 0 65535))) - (advance) - (push-integer (decode-hex 4))) - (t - (push-integer (decode-hex 2))))) - (t - (push-integer (char-code (case char - ((#\+) #\Space) - (otherwise char)))) - (advance)))) - while (< i (length string)) - finally (return (if unicode - (upgrade-vector vector 'character :converter #'code-char) - (octets-to-string vector :external-format external-format)))))) + (when (zerop (length string)) + (return-from url-decode "")) + (let ((vector (make-array (length string) :element-type 'octet :fill-pointer 0)) + (i 0) + unicodep) + (loop + (unless (< i (length string)) + (return)) + (let ((char (aref string i))) + (labels ((decode-hex (length) + (prog1 + (parse-integer string :start i :end (+ i length) :radix 16) + (incf i length))) + (push-integer (integer) + (vector-push integer vector)) + (peek () + (aref string i)) + (advance () + (setq char (peek)) + (incf i))) + (cond + ((char= #\% char) + (advance) + (cond + ((char= #\u (peek)) + (unless unicodep + (setq unicodep t) + (upgrade-vector vector '(integer 0 65535))) + (advance) + (push-integer (decode-hex 4))) + (t + (push-integer (decode-hex 2))))) + (t + (push-integer (char-code (case char + ((#\+) #\Space) + (otherwise char)))) + (advance)))))) + (cond (unicodep + (upgrade-vector vector 'character :converter #'code-char)) + (t (octets-to-string vector :external-format external-format))))) (defun form-url-encoded-list-to-alist (form-url-encoded-list &optional (external-format *hunchentoot-default-external-format*))

1 0

[bknr-cvs] edi changed trunk/thirdparty/chunga/chunga.asd
by BKNR Commits 09 Feb '09

09 Feb '09

Revision: 4210 Author: edi URL: http://bknr.net/trac/changeset/4210 Forgot version string U trunk/thirdparty/chunga/chunga.asd Modified: trunk/thirdparty/chunga/chunga.asd =================================================================== --- trunk/thirdparty/chunga/chunga.asd 2009-02-09 13:43:39 UTC (rev 4209) +++ trunk/thirdparty/chunga/chunga.asd 2009-02-09 13:44:09 UTC (rev 4210) @@ -29,7 +29,7 @@ (asdf:defsystem :chunga :serial t - :version "0.4.3" + :version "1.0.0" :depends-on (:trivial-gray-streams) :components ((:file "packages") (:file "specials")

1 0

[bknr-cvs] edi changed trunk/thirdparty/drakma/drakma.asd
by BKNR Commits 09 Feb '09

09 Feb '09

Revision: 4209 Author: edi URL: http://bknr.net/trac/changeset/4209 Forgot version string U trunk/thirdparty/drakma/drakma.asd Modified: trunk/thirdparty/drakma/drakma.asd =================================================================== --- trunk/thirdparty/drakma/drakma.asd 2009-02-09 12:15:51 UTC (rev 4208) +++ trunk/thirdparty/drakma/drakma.asd 2009-02-09 13:43:39 UTC (rev 4209) @@ -38,7 +38,7 @@ (in-package :drakma-asd) -(defvar *drakma-version-string* "0.11.5" +(defvar *drakma-version-string* "1.0.0" "Drakma's version number as a string.") ;; we export its name so we can import it later

1 0

[bknr-cvs] hans changed ediware/
by BKNR Commits 09 Feb '09

09 Feb '09

1 0

[bknr-cvs] hans changed trunk/thirdparty/cl-ppcre/convert.lisp
by BKNR Commits 09 Feb '09

09 Feb '09

Revision: 4207 Author: hans URL: http://bknr.net/trac/changeset/4207 Specialize some arguments on type T to silence CCL warnings. U trunk/thirdparty/cl-ppcre/convert.lisp Modified: trunk/thirdparty/cl-ppcre/convert.lisp =================================================================== --- trunk/thirdparty/cl-ppcre/convert.lisp 2009-02-09 12:15:01 UTC (rev 4206) +++ trunk/thirdparty/cl-ppcre/convert.lisp 2009-02-09 12:15:29 UTC (rev 4207) @@ -325,7 +325,7 @@ (:documentation "Helper function for CONVERT-AUX which converts parse trees which are conses and dispatches on TOKEN which is the first element of the parse tree.") - (:method (token parse-tree &key) + (:method (token (parse-tree t) &key) (signal-syntax-error "Unknown token ~A in parse-tree." token))) (defmethod convert-compound-parse-tree ((token (eql :sequence)) parse-tree &key)

1 0

[bknr-cvs] hans changed trunk/thirdparty/chunga/
by BKNR Commits 09 Feb '09

09 Feb '09

Revision: 4206 Author: hans URL: http://bknr.net/trac/changeset/4206 Specialize some arguments on type T to silence CCL warnings. U trunk/thirdparty/chunga/input.lisp U trunk/thirdparty/chunga/output.lisp Modified: trunk/thirdparty/chunga/input.lisp =================================================================== --- trunk/thirdparty/chunga/input.lisp 2009-02-09 12:14:17 UTC (rev 4205) +++ trunk/thirdparty/chunga/input.lisp 2009-02-09 12:15:01 UTC (rev 4206) @@ -29,15 +29,15 @@ (in-package :chunga) -(defmethod chunked-input-stream-extensions (object) +(defmethod chunked-input-stream-extensions ((object t)) "The default method which always returns the empty list." nil) -(defmethod chunked-input-stream-trailers (object) +(defmethod chunked-input-stream-trailers ((object t)) "The default method which always returns the empty list." nil) -(defmethod chunked-stream-input-chunking-p (object) +(defmethod chunked-stream-input-chunking-p ((object t)) "The default method for all objects which are not of type CHUNKED-INPUT-STREAM." nil) Modified: trunk/thirdparty/chunga/output.lisp =================================================================== --- trunk/thirdparty/chunga/output.lisp 2009-02-09 12:14:17 UTC (rev 4205) +++ trunk/thirdparty/chunga/output.lisp 2009-02-09 12:15:01 UTC (rev 4206) @@ -29,7 +29,7 @@ (in-package :chunga) -(defmethod chunked-stream-output-chunking-p (object) +(defmethod chunked-stream-output-chunking-p ((object t)) "The default method for all objects which are not of type CHUNKED-OUTPUT-STREAM." nil)

1 0

[bknr-cvs] hans changed trunk/thirdparty/hunchentoot/connection-manager.lisp
by BKNR Commits 09 Feb '09

09 Feb '09

Revision: 4205 Author: hans URL: http://bknr.net/trac/changeset/4205 Specialize method on T to silence "unused variable" warning in CCL. U trunk/thirdparty/hunchentoot/connection-manager.lisp Modified: trunk/thirdparty/hunchentoot/connection-manager.lisp =================================================================== --- trunk/thirdparty/hunchentoot/connection-manager.lisp 2009-02-09 12:13:27 UTC (rev 4204) +++ trunk/thirdparty/hunchentoot/connection-manager.lisp 2009-02-09 12:14:17 UTC (rev 4205) @@ -69,7 +69,7 @@ (defgeneric shutdown (connection-manager) (:documentation "Terminate all threads that are currently associated with the connection manager, if any.") - (:method (manager) + (:method ((manager t)) #+:lispworks (when-let (acceptor (server-acceptor (server manager))) ;; kill the main acceptor process, see LW documentation for

1 0

[bknr-cvs] hans changed trunk/thirdparty/hunchentoot/server.lisp
by BKNR Commits 09 Feb '09

09 Feb '09

Revision: 4204 Author: hans URL: http://bknr.net/trac/changeset/4204 When you don't understand DO, use LOOP U trunk/thirdparty/hunchentoot/server.lisp Modified: trunk/thirdparty/hunchentoot/server.lisp =================================================================== --- trunk/thirdparty/hunchentoot/server.lisp 2009-02-09 11:52:41 UTC (rev 4203) +++ trunk/thirdparty/hunchentoot/server.lisp 2009-02-09 12:13:27 UTC (rev 4204) @@ -395,20 +395,18 @@ (mp:process-unstop (server-acceptor server)) #-:lispworks (usocket:with-server-socket (listener (server-listen-socket server)) - (do ((new-connection-p (usocket:wait-for-input listener :timeout +new-connection-wait-time+) - (usocket:wait-for-input listener :timeout +new-connection-wait-time+))) - ((server-shutdown-p server)) - (when new-connection-p - (handler-case - (let ((client-connection (usocket:socket-accept listener))) - (when client-connection + (loop + until (server-shutdown-p server) + when (usocket:wait-for-input listener :timeout +new-connection-wait-time+) + do (handler-case + (when-let (client-connection (usocket:socket-accept listener)) (set-timeouts client-connection (server-read-timeout server) (server-write-timeout server)) (handle-incoming-connection (server-connection-manager server) - client-connection))) - ;; ignore condition - (usocket:connection-aborted-error ()))))))) + client-connection)) + ;; ignore condition + (usocket:connection-aborted-error ())))))) (defgeneric initialize-connection-stream (server stream) (:documentation "Wraps the given STREAM with all the additional

1 0