diff --git a/scheme/httpd/cgi-server.scm b/scheme/httpd/cgi-server.scm index c4f4c36..8b2f30e 100644 --- a/scheme/httpd/cgi-server.scm +++ b/scheme/httpd/cgi-server.scm @@ -3,20 +3,6 @@ ;;; See http://hoohoo.ncsa.uiuc.edu/cgi/interface.html for a sort of "spec". -;;; Imports and non-R4RS'isms -;;; "\r" in string for carriage-return. -;;; format -;;; string hacks -;;; URI, URL record structs, parsers, and unparsers -;;; write-crlf -;;; scsh syscalls -;;; ? for COND -;;; SWITCH conditional -;;; RFC822 header parsing -;;; HTTP request record structure -;;; HTTP-ERROR & status codes -;;; Basic path handler support (for ncsa-handler) - ;;; PROBLEMS: ;;; - The handlers could be made -- closed over their parameters ;;; (e.g., root vars, etc.) diff --git a/scheme/httpd/core.scm b/scheme/httpd/core.scm index dff77da..718826b 100644 --- a/scheme/httpd/core.scm +++ b/scheme/httpd/core.scm @@ -13,19 +13,6 @@ ;;; The RFC detailing the HTTP 1.0 protocol, RFC 1945, can be found at ;;; http://www.w3.org/Protocols/rfc1945/rfc1945 -;;; Imports and non-R4RS'isms -;;; \r \n in strings for cr and lf. -;;; receive values (MV return) -;;; scsh system calls -;;; rfc822 header parsing -;;; crlf-io (read cr/lf terminated lines) -;;; uri, url packages -;;; ignore-errors (HANDLE package) -;;; char-set stuff -;;; format (Formatted output) -;;; httpd error stuff -;;; condition-stuff (S48 error conditions) - ;;; (httpd options) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; The server top-level. PATH-HANDLER is the top-level request path handler -- diff --git a/scheme/httpd/error.scm b/scheme/httpd/error.scm index b65bd86..7decbfc 100644 --- a/scheme/httpd/error.scm +++ b/scheme/httpd/error.scm @@ -6,7 +6,6 @@ ;;; You recognise one with HTTP-ERROR?, and retrieve the pieces with ;;; CONDITION-STUFF. ;;; -;;; ,open conditions signals handle ;;; HTTP error condition ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/scheme/httpd/http-top.scm b/scheme/httpd/http-top.scm index 09f1d26..7990729 100644 --- a/scheme/httpd/http-top.scm +++ b/scheme/httpd/http-top.scm @@ -4,13 +4,6 @@ ;;; This file contains a few example top-level path-handlers and ;;; other useful fragments. -;;; We import procedures from these structures: -;;; httpd-core -;;; cgi-server-package -;;; httpd-basic-handlers -;;; seval-handler-package - - ;;; - /h// => serve from ~user/public_html. ;;; - /seval You may POST Scheme code to this URL, and receive the output. ;;; - Otherwise, serve files from the standard HTTP demon repository. diff --git a/scheme/httpd/seval.scm b/scheme/httpd/seval.scm index e7e13f1..2728856 100644 --- a/scheme/httpd/seval.scm +++ b/scheme/httpd/seval.scm @@ -3,20 +3,6 @@ ;;; into the server. ;;; Copyright (c) 1995 by Olin Shivers. -;;; Imports and non-R4RS'isms -;;; \r and \n in string for cr and lf. -;;; SWITCH conditional, ? for COND -;;; HTTP request record stucture -;;; HTTP-ERROR & status codes -;;; Basic path handler support -;;; scsh syscalls -;;; Pretty-printing P proc. -;;; htmlout stuff -;;; SAFE-EVAL -;;; ERROR -;;; INDEX -;;; URI decoding - ;;; HTML forms ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; This path handler is suitable for receiving code entered into an diff --git a/scheme/lib/cgi-script.scm b/scheme/lib/cgi-script.scm index 0e519fc..1e5b634 100644 --- a/scheme/lib/cgi-script.scm +++ b/scheme/lib/cgi-script.scm @@ -3,13 +3,6 @@ ;;; See http://hoohoo.ncsa.uiuc.edu/cgi/interface.html for a sort of "spec". -;;; Imports and non-R4RS'isms -;;; switch (control structure) -;;; getenv read-string (scsh) -;;; error -;;; parse-html-form-query (parse-html-forms package) - - ;;; This file provides routines to help you write programs in Scheme ;;; that can interface to HTTP servers using the CGI program interface ;;; to carry out HTTP transactions. diff --git a/scheme/lib/crlf-io.scm b/scheme/lib/crlf-io.scm index f2d4445..46e8a02 100644 --- a/scheme/lib/crlf-io.scm +++ b/scheme/lib/crlf-io.scm @@ -1,14 +1,6 @@ ;;; Read cr/lf and lf terminated lines. -*- Scheme -*- ;;; Copyright (c) 1995 by Olin Shivers. -;;; External dependencies and non-R4RS'isms -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; ascii->char (To create a carriage-return) -;;; read-line write-string force-output (scsh I/O procs) -;;; receive values (MV return) -;;; let-optionals -;;; "\r\n" in strings for cr/lf. (Not R4RS) - ;;; (read-crlf-line [fd/port retain-crlf?]) -> string or EOF object ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Read a line terminated by either line-feed or EOF. If RETAIN-CRLF? is #f diff --git a/scheme/lib/htmlout.scm b/scheme/lib/htmlout.scm index afb3d8a..53539f3 100644 --- a/scheme/lib/htmlout.scm +++ b/scheme/lib/htmlout.scm @@ -1,11 +1,6 @@ ;;; Simple code for doing structured html output. -*- Scheme -*- ;;; Copyright (c) 1995 by Olin Shivers. -;;; External dependencies -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; format ; Output -;;; receive values ; Multiple-value return - ;;; - An attribute-quoter, that will map an attribute value to its ;;; HTML text representation -- surrounding it with single or double quotes, ;;; as appropriate, etc. diff --git a/scheme/lib/parse-forms.scm b/scheme/lib/parse-forms.scm index 46f99c8..1ec05c8 100644 --- a/scheme/lib/parse-forms.scm +++ b/scheme/lib/parse-forms.scm @@ -3,14 +3,6 @@ ;;; See http://www.w3.org/hypertext/WWW/MarkUp/html-spec/html-spec_toc.html -;;; Imports and non-R4RS'isms -;;; string-index (string srfi) -;;; let-optionals (let-opt package) -;;; receive (Multiple-value return) -;;; unescape-uri -;;; map-string (strings package) -;;; ? (cond) - ;;; About HTML forms ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; The form's field data are turned into a single string, of the form ;;; The form's field data are turned into a single string, of the form diff --git a/scheme/lib/rfc822.scm b/scheme/lib/rfc822.scm index 10d0868..9729a80 100644 --- a/scheme/lib/rfc822.scm +++ b/scheme/lib/rfc822.scm @@ -2,17 +2,6 @@ ;;; Copyright (c) 1995 by Olin Shivers. ;;; ;;; -;;; Imports and non-R4RS'isms -;;; string conversions -;;; read-crlf-line -;;; let-optionals, :optional -;;; receive values (MV return) -;;; "\r\n" in string for cr/lf -;;; ascii->char (defining the tab char) -;;; index -;;; string-join (reassembling body lines) -;;; error -;;; ? (COND) ;;; RFC 822 is the "Standard for the format of ARPA Internet text messages" ;;; -- the document that essentially tells how the fields in email headers diff --git a/scheme/lib/smtp.scm b/scheme/lib/smtp.scm index fe13a72..74736b9 100644 --- a/scheme/lib/smtp.scm +++ b/scheme/lib/smtp.scm @@ -2,19 +2,7 @@ ;;; Copyright (c) 1995 by Brian D. Carlstrom and Olin Shivers. ;;; , ;;; -;;; See rfc821: /ftp@ftp.internic.net:/rfc/rfc821.txt - -;;; External dependencies and non-R4RS'isms -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; system-name user-login-name (for high-level SENDMAIL proc) -;;; receive values (MV return) -;;; write-string read-string/partial (scsh I/O procs) -;;; force-output -;;; scsh's socket module -;;; :optional -;;; error -;;; read-crlf-line write-crlf -;;; \n \r in strings (Not R5RS) +;;; See rfc821: http://www.ietf.org/rfc/rfc0821.txt ;;; SMTP protocol procedures tend to return two values: ;;; - CODE The integer SMTP reply code returned by server for the transaction. diff --git a/scheme/lib/uri.scm b/scheme/lib/uri.scm index 65c673c..b228c70 100644 --- a/scheme/lib/uri.scm +++ b/scheme/lib/uri.scm @@ -3,20 +3,8 @@ ;;; URI syntax -- [scheme] : path [? search ] [# fragmentid] -;;; Imports and non-R4RS'isms -;;; let-optionals -;;; receive values (MV return) -;;; ascii->char char->ascii -;;; index rindex -;;; char-set-index char-set-rindex -;;; string-reduce -;;; char-set package -;;; bitwise logical funs and arithmetic-shift -;;; join-strings (scsh field-reader code.) - - ;;; References: -;;; - ftp://ftp.internic.net/rfc/rfc1630.txt +;;; - http://www.w3.org/Addressing/rfc1630.txt ;;; Original RFC ;;; - http://www.w3.org/hypertext/WWW/Addressing/URL/URI_Overview.html ;;; General Web page of URI pointers. diff --git a/scheme/lib/url.scm b/scheme/lib/url.scm index 80a27d7..b3dbc55 100644 --- a/scheme/lib/url.scm +++ b/scheme/lib/url.scm @@ -4,7 +4,7 @@ ;;; I'm only implementing http URL's right now. ;;; References: -;;; - ftp://ftp.internic.net/rfc/rfc1738.txt +;;; - http://www.w3.org/Addressing/rfc1738.txt ;;; Original RFC ;;; - http://www.w3.org/hypertext/WWW/Addressing/URL/Overview.html ;;; General Web page of URI pointers. @@ -14,12 +14,6 @@ ;;; - The userhost parser shouldn't substitute default values -- ;;; that should happen in a separate step. -;;; Imports and non-R4RS'isms -;;; define-record Record structures -;;; receive values MV return -;;; URI support -;;; string-index - ;;; The steps in hacking a URL are: ;;; - Take the UID, parse it, and resolve it with the context UID, if any. ;;; - Consult the UID's . Pick the appropriate URL parser and parse.