From 04c0daf5728bee1ff7180f2582e85533ca8a4722 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Tue, 21 Nov 2006 03:57:25 +0000 Subject: [PATCH] ELI svn: r4904 --- collects/web-server/configuration.ss | 18 ++++++++++++------ collects/web-server/private/configuration.ss | 1 + 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/collects/web-server/configuration.ss b/collects/web-server/configuration.ss index 2b760dbafa..04129a3fd1 100644 --- a/collects/web-server/configuration.ss +++ b/collects/web-server/configuration.ss @@ -21,13 +21,17 @@ (define (load-configuration table-file-name) (complete-configuration (directory-part table-file-name) (get-configuration table-file-name))) - ; load-configuration-sexpr : sexp -> configuration - (define/kw (load-configuration-sexpr sexpr + ; load-configuration-sexpr : string? sexp -> configuration + (define/kw (load-configuration-sexpr web-server-root sexpr #:other-keys bct-keys) - (define table (parse-configuration-table sexpr)) + (define table + (parse-configuration-table sexpr)) + (define default-host + (apply-default-functions-to-host-table + web-server-root + (configuration-table-default-host table))) (apply build-configuration table - (lambda (host) - (configuration-table-default-host table)) + (lambda (host) default-host) bct-keys)) ; load-developer-configuration : path -> configuration @@ -64,6 +68,9 @@ (export (open (config : web-config/pervasive^)) (open (new-config : web-config/local^))))) + (provide ; XXX contract + make-make-servlet-namespace + load-configuration-sexpr) (provide/contract [complete-configuration (path-string? configuration-table? . -> . configuration?)] [get-configuration (path-string? . -> . configuration-table?)] @@ -71,6 +78,5 @@ [build-developer-configuration (list? . -> . configuration?)] [default-configuration-table-path path?] [update-configuration (configuration? (listof (cons/c symbol? any/c)) . -> . configuration?)] - [load-configuration-sexpr (list? . -> . configuration?)] [load-configuration (path-string? . -> . configuration?)] [load-developer-configuration (path-string? . -> . configuration?)])) diff --git a/collects/web-server/private/configuration.ss b/collects/web-server/private/configuration.ss index 0e643d3bfe..8510f7862b 100644 --- a/collects/web-server/private/configuration.ss +++ b/collects/web-server/private/configuration.ss @@ -222,6 +222,7 @@ (provide ; XXX contract build-configuration + apply-default-functions-to-host-table make-make-servlet-namespace) (provide/contract [complete-configuration (path-string? configuration-table? . -> . configuration?)]