From 3573dcc6130c22152879a9a89f9674907f3b4033 Mon Sep 17 00:00:00 2001 From: interp Date: Tue, 14 May 2002 13:53:55 +0000 Subject: [PATCH] * moved files concerning web server to new subdirectory httpd * minor change in inner order of modules.scm * commented out structure in program-modules: source files are missing (?) --- modules.scm | 97 ++++++++++--------- program-modules.scm | 46 +++++---- cgi-server.scm => scheme/httpd/cgi-server.scm | 0 .../httpd/handle-fatal-error.scm | 0 http-top.scm => scheme/httpd/http-top.scm | 0 .../httpd/httpd-access-control.scm | 0 httpd-core.scm => scheme/httpd/httpd-core.scm | 0 .../httpd/httpd-error.scm | 0 .../httpd/httpd-handlers.scm | 0 .../httpd/httpd-options.scm | 0 .../httpd/info-gateway.scm | 0 .../httpd/rman-gateway.scm | 0 .../httpd/scheme-program-server.scm | 0 server.scm => scheme/httpd/server.scm | 0 seval.scm => scheme/httpd/seval.scm | 0 su-httpd.txt => scheme/httpd/su-httpd.txt | 0 16 files changed, 74 insertions(+), 69 deletions(-) rename cgi-server.scm => scheme/httpd/cgi-server.scm (100%) rename handle-fatal-error.scm => scheme/httpd/handle-fatal-error.scm (100%) rename http-top.scm => scheme/httpd/http-top.scm (100%) rename httpd-access-control.scm => scheme/httpd/httpd-access-control.scm (100%) rename httpd-core.scm => scheme/httpd/httpd-core.scm (100%) rename httpd-error.scm => scheme/httpd/httpd-error.scm (100%) rename httpd-handlers.scm => scheme/httpd/httpd-handlers.scm (100%) rename httpd-options.scm => scheme/httpd/httpd-options.scm (100%) rename info-gateway.scm => scheme/httpd/info-gateway.scm (100%) rename rman-gateway.scm => scheme/httpd/rman-gateway.scm (100%) rename scheme-program-server.scm => scheme/httpd/scheme-program-server.scm (100%) rename server.scm => scheme/httpd/server.scm (100%) rename seval.scm => scheme/httpd/seval.scm (100%) rename su-httpd.txt => scheme/httpd/su-httpd.txt (100%) diff --git a/modules.scm b/modules.scm index 88da157..61760c4 100644 --- a/modules.scm +++ b/modules.scm @@ -85,6 +85,45 @@ scheme) (files ecm-utilities)) + +;;; parse-html-forms +;;; For parsing submissions from HTML forms. + +(define-interface parse-html-forms-interface + (export parse-html-form-query unescape-uri+)) + +(define-structure parse-html-forms parse-html-forms-interface + (open scsh + scsh-utilities + let-opt + string-lib + receiving + uri + scheme) + (files parse-forms)) + + +;;; htmlout + +(define-interface htmlout-interface + (export emit-tag + emit-close-tag + + emit-p + emit-title + emit-header ; And so forth... + + with-tag + with-tag* + + escape-html + emit-text)) + +(define-structure htmlout htmlout-interface + (open scsh scsh-utilities string-lib formats ascii receiving scheme) + (files htmlout)) + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Clients / RFC ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -555,7 +594,7 @@ string-lib ; STRING-JOIN i/o ; make-null-output-port scheme) - (files httpd-core)) + (files (httpd httpd-core))) ;;; httpd-make-options @@ -587,7 +626,7 @@ (httpd-read-options httpd-read-options-interface)) (open scheme define-record-types) - (files httpd-options)) + (files (httpd httpd-options))) ;;; httpd-access-control @@ -605,7 +644,7 @@ string-lib ; STRING-MAP scsh scheme) - (files httpd-access-control)) + (files (httpd httpd-access-control))) ;;; httpd-error @@ -618,7 +657,7 @@ (define-structure httpd-error httpd-error-interface (open conditions signals handle scheme) - (files httpd-error)) + (files (httpd httpd-error))) ;;; httpd-fatal-error @@ -628,45 +667,7 @@ (define-structure handle-fatal-error handle-fatal-error-interface (open scheme conditions handle) - (files handle-fatal-error)) - - -;;; parse-html-forms -;;; For parsing submissions from HTML forms. - -(define-interface parse-html-forms-interface - (export parse-html-form-query unescape-uri+)) - -(define-structure parse-html-forms parse-html-forms-interface - (open scsh - scsh-utilities - let-opt - string-lib - receiving - uri - scheme) - (files parse-forms)) - - -;;; htmlout - -(define-interface htmlout-interface - (export emit-tag - emit-close-tag - - emit-p - emit-title - emit-header ; And so forth... - - with-tag - with-tag* - - escape-html - emit-text)) - -(define-structure htmlout htmlout-interface - (open scsh scsh-utilities string-lib formats ascii receiving scheme) - (files htmlout)) + (files (httpd handle-fatal-error))) ;; path-handlers @@ -701,7 +702,7 @@ handle-fatal-error ; WITH-FATAL-ERROR-HANDLER string-lib ; STRING-JOIN scheme) - (files httpd-handlers)) + (files (httpd httpd-handlers))) ;;; seval-handler @@ -725,7 +726,7 @@ parse-html-forms ; PARSE-HTML-FORM-QUERY threads ; SLEEP scheme) - (files seval)) + (files (httpd seval))) @@ -748,7 +749,7 @@ scsh handle-fatal-error scheme) - (files info-gateway)) + (files (httpd info-gateway))) ;;; rman-gateway @@ -776,7 +777,7 @@ let-opt string-lib scheme) - (files rman-gateway)) + (files (httpd rman-gateway))) ;;; CGI Server @@ -803,7 +804,7 @@ sunet-utilities ; host-name-or-empty let-opt ; let-optionals scheme) - (files cgi-server)) + (files (httpd cgi-server))) ;;; FTP server: ftpd diff --git a/program-modules.scm b/program-modules.scm index c0424ac..a8baf69 100644 --- a/program-modules.scm +++ b/program-modules.scm @@ -18,27 +18,31 @@ condhax ; ? is COND switch-syntax ; SWITCHQ scheme) - (files scheme-program-server)) + (files (httpd scheme-program-server))) ;;; package to load scheme programs -(define-structure scheme-programs-package (export testprog - info2www) - (open scsh ; syscalls & INDEX - condhax ; WHEN, ? for COND - switch-syntax ; Conditionals - defrec-package ; Records - htmlout-package ; Formatted HTML output - httpd-core ; REQUEST record type, HTTP-ERROR & reply codes - ; version stuff - uri-package ; UNESCAPE-URI - error-package ; ERROR - pp ; Pretty-printer - strings rfc822 - toothless-eval ; EVAL-SAFELY - handle ; IGNORE-ERROR - strings ; SKIP-WHITESPACE - parse-html-forms ; PARSE-HTML-FORM-QUERY - scheme) - (files testprog - info2www)) \ No newline at end of file +;; +;; source files are missing!? +;; + +;;; cheme-programs-package (export testprog +;;; info2www) +;;; ; syscalls & INDEX +;;; ; WHEN, ? for COND +;;; ax ; Conditionals +;;; age ; Records +;;; kage ; Formatted HTML output +;;; ; REQUEST record type, HTTP-ERROR & reply codes +;;; ; version stuff +;;; ; UNESCAPE-URI +;;; ge ; ERROR +;;; ; Pretty-printer +;;; 822 +;;; val ; EVAL-SAFELY +;;; ; IGNORE-ERROR +;;; ; SKIP-WHITESPACE +;;; forms ; PARSE-HTML-FORM-QUERY +;;; +;;; +;;; \ No newline at end of file diff --git a/cgi-server.scm b/scheme/httpd/cgi-server.scm similarity index 100% rename from cgi-server.scm rename to scheme/httpd/cgi-server.scm diff --git a/handle-fatal-error.scm b/scheme/httpd/handle-fatal-error.scm similarity index 100% rename from handle-fatal-error.scm rename to scheme/httpd/handle-fatal-error.scm diff --git a/http-top.scm b/scheme/httpd/http-top.scm similarity index 100% rename from http-top.scm rename to scheme/httpd/http-top.scm diff --git a/httpd-access-control.scm b/scheme/httpd/httpd-access-control.scm similarity index 100% rename from httpd-access-control.scm rename to scheme/httpd/httpd-access-control.scm diff --git a/httpd-core.scm b/scheme/httpd/httpd-core.scm similarity index 100% rename from httpd-core.scm rename to scheme/httpd/httpd-core.scm diff --git a/httpd-error.scm b/scheme/httpd/httpd-error.scm similarity index 100% rename from httpd-error.scm rename to scheme/httpd/httpd-error.scm diff --git a/httpd-handlers.scm b/scheme/httpd/httpd-handlers.scm similarity index 100% rename from httpd-handlers.scm rename to scheme/httpd/httpd-handlers.scm diff --git a/httpd-options.scm b/scheme/httpd/httpd-options.scm similarity index 100% rename from httpd-options.scm rename to scheme/httpd/httpd-options.scm diff --git a/info-gateway.scm b/scheme/httpd/info-gateway.scm similarity index 100% rename from info-gateway.scm rename to scheme/httpd/info-gateway.scm diff --git a/rman-gateway.scm b/scheme/httpd/rman-gateway.scm similarity index 100% rename from rman-gateway.scm rename to scheme/httpd/rman-gateway.scm diff --git a/scheme-program-server.scm b/scheme/httpd/scheme-program-server.scm similarity index 100% rename from scheme-program-server.scm rename to scheme/httpd/scheme-program-server.scm diff --git a/server.scm b/scheme/httpd/server.scm similarity index 100% rename from server.scm rename to scheme/httpd/server.scm diff --git a/seval.scm b/scheme/httpd/seval.scm similarity index 100% rename from seval.scm rename to scheme/httpd/seval.scm diff --git a/su-httpd.txt b/scheme/httpd/su-httpd.txt similarity index 100% rename from su-httpd.txt rename to scheme/httpd/su-httpd.txt