From 220fc5789700d0756dacb0cd2fac65c2d8203b32 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Tue, 29 May 2007 23:38:26 +0000 Subject: [PATCH] Contract error and path isssue svn: r6397 --- collects/web-server/private/configuration.ss | 11 ++++++----- collects/web-server/prototype-web-server/run.ss | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/collects/web-server/private/configuration.ss b/collects/web-server/private/configuration.ss index 4e91b1c02e..c77444d254 100644 --- a/collects/web-server/private/configuration.ss +++ b/collects/web-server/private/configuration.ss @@ -3,7 +3,8 @@ (lib "kw.ss") (lib "list.ss") (lib "etc.ss") - (lib "contract.ss")) + (lib "contract.ss") + (lib "url.ss" "net")) (require "configuration-structures.ss" "configuration-table-structs.ss" "util.ss" @@ -237,11 +238,11 @@ [error-response ((natural-number/c string? string?) (listof (cons/c symbol? string?)) . ->* . (response?))] ; XXX contract [servlet-loading-responder (string? any/c . -> . response?)] - [gen-servlet-not-found (path-string? . -> . (string? . -> . response?))] - [gen-servlet-responder (path-string? . -> . (string? any/c . -> . response?))] + [gen-servlet-not-found (path-string? . -> . (url? . -> . response?))] + [gen-servlet-responder (path-string? . -> . (url? any/c . -> . response?))] [gen-servlets-refreshed (path-string? . -> . (-> response?))] [gen-passwords-refreshed (path-string? . -> . (-> response?))] - [gen-authentication-responder (path-string? . -> . (string? (cons/c symbol? string?) . -> . response?))] + [gen-authentication-responder (path-string? . -> . (url? (cons/c symbol? string?) . -> . response?))] [gen-protocol-responder (path-string? . -> . (string? . -> . response?))] - [gen-file-not-found-responder (path-string? . -> . (string? . -> . response?))] + [gen-file-not-found-responder (path-string? . -> . (url? . -> . response?))] [gen-collect-garbage-responder (path-string? . -> . (-> response?))])) \ No newline at end of file diff --git a/collects/web-server/prototype-web-server/run.ss b/collects/web-server/prototype-web-server/run.ss index 5f18813c1c..29d633a22a 100644 --- a/collects/web-server/prototype-web-server/run.ss +++ b/collects/web-server/prototype-web-server/run.ss @@ -4,7 +4,7 @@ (prefix files: (lib "dispatch-files.ss" "web-server" "dispatchers")) (prefix filter: (lib "dispatch-filter.ss" "web-server" "dispatchers")) (prefix sequencer: (lib "dispatch-sequencer.ss" "web-server" "dispatchers")) - (prefix servlets2: "dispatch-servlets2.ss")) + (prefix servlets2: (lib "dispatch-servlets2.ss" "web-server" "prototype-web-server"))) (define server-root-path (build-path "~" "Development" "plt" "default-web-root")) (define default-host-path (build-path server-root-path "conf"))