From 2442e88ab7ec891e760ff8cad550046b4b9cb331 Mon Sep 17 00:00:00 2001 From: sperber Date: Tue, 26 Nov 2002 12:52:39 +0000 Subject: [PATCH] Renamed HTTPD-REQUEST to HTTPD-REQUESTS, now conforming to Scheme 48 convention. --- scheme/httpd/surflets/packages.scm | 2 +- .../surflets/web-server/root/surflets/add.scm | 2 +- .../web-server/root/surflets/add2.scm | 2 +- .../web-server/root/surflets/byte-input.scm | 2 +- .../web-server/root/surflets/calculate-cb.scm | 2 +- .../web-server/root/surflets/calculate.scm | 2 +- .../web-server/root/surflets/spaceship.scm | 2 +- scheme/packages.scm | 28 +++++++++---------- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/scheme/httpd/surflets/packages.scm b/scheme/httpd/surflets/packages.scm index 3a4fbc7..b3102dc 100644 --- a/scheme/httpd/surflets/packages.scm +++ b/scheme/httpd/surflets/packages.scm @@ -106,7 +106,7 @@ (servlet-handler/servlet servlet-handler/servlet-interface) (servlet-handler/admin servlet-handler/admin-interface)) (open httpd-responses - httpd-request + httpd-requests httpd-error uri ;URI-PATH-LIST->PATH tables ;HASH-TABLES diff --git a/scheme/httpd/surflets/web-server/root/surflets/add.scm b/scheme/httpd/surflets/web-server/root/surflets/add.scm index 2bf82e1..3c3d4d2 100644 --- a/scheme/httpd/surflets/web-server/root/surflets/add.scm +++ b/scheme/httpd/surflets/web-server/root/surflets/add.scm @@ -1,6 +1,6 @@ (define-structure servlet servlet-interface (open servlets - httpd-request + httpd-requests httpd-responses url scsh diff --git a/scheme/httpd/surflets/web-server/root/surflets/add2.scm b/scheme/httpd/surflets/web-server/root/surflets/add2.scm index e68c84d..3a6935e 100644 --- a/scheme/httpd/surflets/web-server/root/surflets/add2.scm +++ b/scheme/httpd/surflets/web-server/root/surflets/add2.scm @@ -1,6 +1,6 @@ (define-structure servlet servlet-interface (open servlets - httpd-request + httpd-requests url handle-fatal-error let-opt diff --git a/scheme/httpd/surflets/web-server/root/surflets/byte-input.scm b/scheme/httpd/surflets/web-server/root/surflets/byte-input.scm index 64ca11e..cae47fa 100644 --- a/scheme/httpd/surflets/web-server/root/surflets/byte-input.scm +++ b/scheme/httpd/surflets/web-server/root/surflets/byte-input.scm @@ -1,6 +1,6 @@ (define-structure servlet servlet-interface (open servlets - httpd-request + httpd-requests handle-fatal-error url scsh diff --git a/scheme/httpd/surflets/web-server/root/surflets/calculate-cb.scm b/scheme/httpd/surflets/web-server/root/surflets/calculate-cb.scm index e83674b..66442d9 100644 --- a/scheme/httpd/surflets/web-server/root/surflets/calculate-cb.scm +++ b/scheme/httpd/surflets/web-server/root/surflets/calculate-cb.scm @@ -1,6 +1,6 @@ (define-structure servlet servlet-interface (open servlets - httpd-request + httpd-requests handle-fatal-error let-opt scsh diff --git a/scheme/httpd/surflets/web-server/root/surflets/calculate.scm b/scheme/httpd/surflets/web-server/root/surflets/calculate.scm index 7fdc159..4b58dd4 100644 --- a/scheme/httpd/surflets/web-server/root/surflets/calculate.scm +++ b/scheme/httpd/surflets/web-server/root/surflets/calculate.scm @@ -1,6 +1,6 @@ (define-structure servlet servlet-interface (open servlets - httpd-request + httpd-requests handle-fatal-error let-opt scsh diff --git a/scheme/httpd/surflets/web-server/root/surflets/spaceship.scm b/scheme/httpd/surflets/web-server/root/surflets/spaceship.scm index 1af5c05..9dff710 100644 --- a/scheme/httpd/surflets/web-server/root/surflets/spaceship.scm +++ b/scheme/httpd/surflets/web-server/root/surflets/spaceship.scm @@ -8,7 +8,7 @@ (subset srfi-13 (string-downcase string-join)) (subset srfi-1 (find filter-map split-at remove)) sunet-utilities - httpd-request) + httpd-requests) (begin ;;; Spaceship components diff --git a/scheme/packages.scm b/scheme/packages.scm index 74571c3..9b15c39 100644 --- a/scheme/packages.scm +++ b/scheme/packages.scm @@ -296,9 +296,9 @@ logging make-logging)) -(define-interface httpd-request-interface - (export make-request ; HTTP request - request? ; record type. +(define-interface httpd-requests-interface + (export make-request ; HTTP request + request? ; record type. request:method request:uri request:url @@ -702,7 +702,7 @@ httpd-read-options httpd-error httpd-logging - httpd-request + httpd-requests httpd-responses sunet-version @@ -719,7 +719,7 @@ (define-structure httpd-access-control httpd-access-control-interface (open big-scheme httpd-responses - httpd-request + httpd-requests httpd-error srfi-13 ; STRING-MAP scsh @@ -737,7 +737,7 @@ receiving ; receive uri ; uri-path-list->path url ; http-url:path - httpd-request ; request record + httpd-requests ; request record formats ; format format-net ; format-internet-host-address srfi-13 ; string-join, string-trim @@ -752,7 +752,7 @@ scheme) (files (httpd logging))) -(define-structure httpd-request httpd-request-interface +(define-structure httpd-requests httpd-requests-interface (open define-record-types ;; define-record-discloser defrec-package ;; define-record scheme) @@ -765,7 +765,7 @@ srfi-9 defenum-package formats - httpd-request + httpd-requests httpd-logging httpd-read-options) (files (httpd response))) @@ -773,7 +773,7 @@ (define-structure httpd-basic-handlers httpd-basic-handlers-interface (open scheme scsh rfc822 - httpd-request ; REQUEST record type, v0.9-request + httpd-requests ; REQUEST record type, v0.9-request srfi-1 ; FOLD-RIGHT srfi-13 ; STRING-TRIM httpd-responses @@ -783,7 +783,7 @@ (define-structure httpd-file-directory-handlers httpd-file-directory-handlers-interface (open scheme scsh httpd-core - httpd-request + httpd-requests httpd-responses httpd-error httpd-basic-handlers @@ -801,7 +801,7 @@ (define-structure seval-handler seval-handler-interface (open scsh ; syscalls & INDEX httpd-error - httpd-request ; v0.9-request + httpd-requests ; v0.9-request httpd-responses httpd-logging ; http-log uri ; UNESCAPE-URI @@ -822,7 +822,7 @@ srfi-13 conditions signals handle htmlout - httpd-request + httpd-requests httpd-responses httpd-error url @@ -834,7 +834,7 @@ (define-structure rman-gateway rman-gateway-interface (open httpd-responses - httpd-request + httpd-requests httpd-error conditions url @@ -856,7 +856,7 @@ uri url ; HTTP-URL record type httpd-logging - httpd-request + httpd-requests httpd-responses httpd-basic-handlers ; HTTP-HOMEDIR, SERVE-ROOTED-FILE-PATH httpd-error ; HTTP-ERROR