From 51c5484e24bb8aaebccc22a661e205b2bfd10621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= Date: Fri, 2 Oct 2015 14:19:47 +0200 Subject: [PATCH] http.server.cgi: fix for the dependency cycle http.server.cgi <=> http.server.static (#1311) --- basis/http/server/cgi/cgi-docs.factor | 7 ++++++- basis/http/server/cgi/cgi.factor | 7 +++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/basis/http/server/cgi/cgi-docs.factor b/basis/http/server/cgi/cgi-docs.factor index 1bd700c873..76256f1445 100644 --- a/basis/http/server/cgi/cgi-docs.factor +++ b/basis/http/server/cgi/cgi-docs.factor @@ -1,6 +1,9 @@ -USING: help.markup help.syntax http.server.static ; +USING: help.markup help.syntax ; IN: http.server.cgi +DEFER: file-responder +DEFER: + HELP: enable-cgi { $values { "responder" file-responder } } { $description "Enables the responder to serve " { $snippet ".cgi" } " scripts by executing them as per the CGI specification." } @@ -15,3 +18,5 @@ HELP: enable-cgi ARTICLE: "http.server.cgi" "Serving CGI scripts" "The " { $vocab-link "http.server.cgi" } " implements CGI support. It is used in conjunction with a " { $link } " responder." { $subsections enable-cgi } ; + +ABOUT: "http.server.cgi" diff --git a/basis/http/server/cgi/cgi.factor b/basis/http/server/cgi/cgi.factor index 0299f0118d..b8ebc63d30 100644 --- a/basis/http/server/cgi/cgi.factor +++ b/basis/http/server/cgi/cgi.factor @@ -1,9 +1,8 @@ ! Copyright (C) 2007, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: namespaces kernel assocs io.files io.streams.duplex -combinators arrays io.launcher io.encodings io.encodings.binary io -http.server.static http.server http accessors sequences strings -math.parser fry urls urls.encoding calendar make ; +USING: accessors arrays assocs calendar fry http http.server io +io.encodings io.encodings.binary io.launcher io.streams.duplex kernel +make math.parser namespaces sequences urls urls.encoding ; IN: http.server.cgi : cgi-variables ( script-path -- assoc )