From 607362b87f6652f99063000801ac55563f34f343 Mon Sep 17 00:00:00 2001
From: Jay McCarthy <jay@racket-lang.org>
Date: Tue, 24 Oct 2006 16:05:37 +0000
Subject: [PATCH] up

svn: r4679
---
 collects/web-server/configuration.ss               |  8 ++++----
 .../web-server/private/configuration-structures.ss |  7 ++-----
 .../private/configuration-table-structs.ss         | 14 +++++++-------
 collects/web-server/private/configuration-util.ss  |  4 ++--
 collects/web-server/private/configuration.ss       |  4 ++--
 5 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/collects/web-server/configuration.ss b/collects/web-server/configuration.ss
index 97834e1f43..7a7fe1bc74 100644
--- a/collects/web-server/configuration.ss
+++ b/collects/web-server/configuration.ss
@@ -61,8 +61,8 @@
               (open (new-config : web-config/local^)))))
   
   (provide/contract
-   [complete-configuration (path? configuration-table? . -> . configuration?)]
-   [get-configuration (string? . -> . configuration-table?)]
+   [complete-configuration (path-string? configuration-table? . -> . configuration?)]
+   [get-configuration (path-string? . -> . configuration-table?)]
    ; XXX contract
    [build-developer-configuration (list? . -> . configuration?)]
    ; XXX contract
@@ -70,5 +70,5 @@
    [default-configuration-table-path path?]
    [update-configuration (configuration? (listof (cons/c symbol? any/c)) . -> . configuration?)]
    [load-configration-sexpr (list? . -> . configuration?)]
-   [load-configuration (path? . -> . configuration?)]
-   [load-developer-configuration (path? . -> . configuration?)]))
\ No newline at end of file
+   [load-configuration (path-string? . -> . configuration?)]
+   [load-developer-configuration (path-string? . -> . configuration?)]))
\ No newline at end of file
diff --git a/collects/web-server/private/configuration-structures.ss b/collects/web-server/private/configuration-structures.ss
index 06baef16ee..26488a6f6e 100644
--- a/collects/web-server/private/configuration-structures.ss
+++ b/collects/web-server/private/configuration-structures.ss
@@ -36,11 +36,8 @@
    [struct host 
            ([indices (listof string?)]
             [log-format symbol?]
-            [log-path (or/c false/c path? string?)]
-            [passwords (or/c false/c path? string?)]
-            #;[passwords (listof (cons/c string?
-                                       (cons/c string?
-                                               (listof (list/c symbol? string?)))))]
+            [log-path (or/c false/c path-string?)]
+            [passwords (or/c false/c path-string?)]
             [responders responders?]
             [timeouts timeouts?]
             [paths paths?])]
diff --git a/collects/web-server/private/configuration-table-structs.ss b/collects/web-server/private/configuration-table-structs.ss
index 5777164855..6a1b28ff67 100644
--- a/collects/web-server/private/configuration-table-structs.ss
+++ b/collects/web-server/private/configuration-table-structs.ss
@@ -46,10 +46,10 @@
             [file-per-byte number?]
             [file-base number?])]
    [struct paths 
-           ([conf (or/c false/c path? string?)]
-            [host-base (or/c false/c path? string?)]
-            [log (or/c false/c path? string?)]
-            [htdocs (or/c false/c path? string?)]
-            [servlet (or/c false/c path? string?)]
-            [mime-types (or/c false/c path? string?)]
-            [passwords (or/c false/c path? string?)])]))
+           ([conf (or/c false/c path-string?)]
+            [host-base (or/c false/c path-string?)]
+            [log (or/c false/c path-string?)]
+            [htdocs (or/c false/c path-string?)]
+            [servlet (or/c false/c path-string?)]
+            [mime-types (or/c false/c path-string?)]
+            [passwords (or/c false/c path-string?)])]))
diff --git a/collects/web-server/private/configuration-util.ss b/collects/web-server/private/configuration-util.ss
index c0abf8b3e3..6d0fe996b2 100644
--- a/collects/web-server/private/configuration-util.ss
+++ b/collects/web-server/private/configuration-util.ss
@@ -58,6 +58,6 @@
       'truncate))
   
   (provide/contract
-   [write-configuration-table (configuration-table? (or/c path? string?) . -> . void)]
+   [write-configuration-table (configuration-table? path-string? . -> . void)]
    [format-host (host-table? . -> . list?)]
-   [write-to-file ((or/c path? string?) list? . -> . void)]))
\ No newline at end of file
+   [write-to-file (path-string? list? . -> . void)]))
\ No newline at end of file
diff --git a/collects/web-server/private/configuration.ss b/collects/web-server/private/configuration.ss
index 36337db62d..7ed0bee143 100644
--- a/collects/web-server/private/configuration.ss
+++ b/collects/web-server/private/configuration.ss
@@ -224,8 +224,8 @@
   
   (provide/contract
    [build-configuration (configuration-table? host-table? . -> . configuration?)]
-   [complete-configuration (path? configuration-table? . -> . configuration?)]
-   [complete-developer-configuration (path? configuration-table? . -> . configuration?)])
+   [complete-configuration (path-string? configuration-table? . -> . configuration?)]
+   [complete-developer-configuration (path-string? configuration-table? . -> . configuration?)])
   ; XXX contract
   (provide
    complete-developer-configuration/vhosts)