From 761f0d630e62ceb1a847fe7ee35d42ef9be2d0a0 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Fri, 2 Oct 2015 11:12:56 -0700 Subject: [PATCH] Revert "http.server.cgi: fix for the dependency cycle http.server.cgi <=>" This reverts commit 51c5484e24bb8aaebccc22a661e205b2bfd10621. --- basis/http/server/cgi/cgi-docs.factor | 7 +------ basis/http/server/cgi/cgi.factor | 7 ++++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/basis/http/server/cgi/cgi-docs.factor b/basis/http/server/cgi/cgi-docs.factor index 76256f1445..1bd700c873 100644 --- a/basis/http/server/cgi/cgi-docs.factor +++ b/basis/http/server/cgi/cgi-docs.factor @@ -1,9 +1,6 @@ -USING: help.markup help.syntax ; +USING: help.markup help.syntax http.server.static ; 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." } @@ -18,5 +15,3 @@ 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 b8ebc63d30..0299f0118d 100644 --- a/basis/http/server/cgi/cgi.factor +++ b/basis/http/server/cgi/cgi.factor @@ -1,8 +1,9 @@ ! Copyright (C) 2007, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -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 ; +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 ; IN: http.server.cgi : cgi-variables ( script-path -- assoc )