From 8825f12a566f7b3367d9cb9d77743ae2fdf0aa6c Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Sun, 2 Mar 2014 16:58:22 +0000 Subject: [PATCH] fix treatment of zero q values a q value of 0 means "not acceptable", not "less acceptable than 0.1 but still acceptable". --- accept-specializer.lisp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/accept-specializer.lisp b/accept-specializer.lisp index 97311c5..70d8dfc 100644 --- a/accept-specializer.lisp +++ b/accept-specializer.lisp @@ -43,6 +43,10 @@ (and type-node (accept-node-q type-node)) (accept-node-q accept-tree)))) +(defun q-ok (media-type accept-tree) + (let ((q (q media-type accept-tree))) + (and q (> q 0) q))) + (defun insert (range q tree) (labels ((ensure-node (range tree) (cond @@ -117,7 +121,7 @@ ((gf accept-generic-function) (g accept-generalizer)) `(accept-generalizer ,(header g))) (defmethod specializer-accepts-generalizer-p ((gf accept-generic-function) (s accept-specializer) (generalizer accept-generalizer)) - (values (q (media-type s) (tree generalizer)) t)) + (values (q-ok (media-type s) (tree generalizer)) t)) (defmethod specializer-accepts-generalizer-p ((gf accept-generic-function) (s accept-specializer) generalizer) (values nil t)) (defmethod specializer-accepts-generalizer-p ((gf accept-generic-function) (s sb-mop:specializer) (generalizer accept-generalizer)) @@ -126,7 +130,7 @@ (defmethod specializer-accepts-p ((specializer accept-specializer) obj) nil) (defmethod specializer-accepts-p ((specializer accept-specializer) (obj tbnl:request)) - (q (media-type specializer) (parse-accept-string (tbnl:header-in :accept obj)))) + (q-ok (media-type specializer) (parse-accept-string (tbnl:header-in :accept obj)))) (defmethod specializer< ((gf accept-generic-function) (s1 accept-specializer) (s2 accept-specializer) generalizer) (cond @@ -190,7 +194,7 @@ :header s :next (class-of s))) (defmethod specializer-accepts-p ((s accept-specializer) (string string)) - (q (media-type s) (parse-accept-string string))) + (q-ok (media-type s) (parse-accept-string string))) (defmethod handle-content-type ((x tbnl:request)) (setf (tbnl:content-type*) *actual-content-type*)) -- 2.39.5