From d211bee38b9f3f3b88fa5f3887384ecf64a62781 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Wed, 4 Nov 2015 13:06:23 -0800 Subject: [PATCH] cgi: fix for LH{ } changes. --- extra/cgi/cgi-tests.factor | 20 +++++++++----------- extra/cgi/cgi.factor | 6 +++--- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/extra/cgi/cgi-tests.factor b/extra/cgi/cgi-tests.factor index 6940a3c189..8c535bd077 100644 --- a/extra/cgi/cgi-tests.factor +++ b/extra/cgi/cgi-tests.factor @@ -1,19 +1,17 @@ ! Copyright (C) 2009 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: cgi cgi.private kernel tools.test ; +USING: cgi cgi.private kernel linked-assocs tools.test ; -{ t } [ H{ } "" (query-string) = ] unit-test +{ LH{ } } [ "" (query-string) ] unit-test -{ t } [ H{ { "a" { "1" } } { "b" { "2" } } } - "a=1&b=2" (query-string) = ] unit-test +{ LH{ { "a" { "1" } } { "b" { "2" } } } } +[ "a=1&b=2" (query-string) ] unit-test -{ t } [ H{ { "a" { "1" } } { "b" { "2" "3" } } } - "a=1&b=2&b=3" (query-string) = ] unit-test +{ LH{ { "a" { "1" } } { "b" { "2" "3" } } } } +[ "a=1&b=2&b=3" (query-string) ] unit-test -{ t } [ "text/html" (content-type) - [ H{ } = ] [ "text/html" = ] bi* and ] unit-test +{ LH{ } "text/html" } [ "text/html" (content-type) ] unit-test -{ t } [ "text/html; charset=utf-8" (content-type) - [ H{ { "charset" { "utf-8" } } } = ] - [ "text/html" = ] bi* and ] unit-test +{ LH{ { "charset" { "utf-8" } } } "text/html" } +[ "text/html; charset=utf-8" (content-type) ] unit-test diff --git a/extra/cgi/cgi.factor b/extra/cgi/cgi.factor index 10ec32720d..eefe653960 100644 --- a/extra/cgi/cgi.factor +++ b/extra/cgi/cgi.factor @@ -2,8 +2,8 @@ ! See http://factorcode.org/license.txt for BSD license USING: arrays assocs combinators environment io kernel -math.parser regexp sequences splitting strings unicode.case -urls.encoding ; +linked-assocs math.parser regexp sequences splitting strings +unicode.case urls.encoding ; IN: cgi @@ -20,7 +20,7 @@ IN: cgi : (content-type) ( string -- params media/type ) ";" split unclip [ - [ H{ } clone ] [ first (query-string) ] if-empty + [ LH{ } clone ] [ first (query-string) ] if-empty ] dip ; : (multipart) ( -- assoc )