From e92f86feef3ae1df13f1dc5c8063d8d5b218af94 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Thu, 25 Aug 2005 01:28:25 +0000 Subject: [PATCH] Ensuring cache-entries work with servlet-env svn: r667 --- collects/web-server/servlet-env.ss | 4 ++-- collects/web-server/web-server-unit.ss | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/collects/web-server/servlet-env.ss b/collects/web-server/servlet-env.ss index 3bd83c8b28..37e7f182b0 100644 --- a/collects/web-server/servlet-env.ss +++ b/collects/web-server/servlet-env.ss @@ -60,7 +60,7 @@ (build-path (directory-part default-configuration-table-path) "default-web-root" "." the-path) - the-servlet) + (cons the-servlet (i:make-servlet-namespace))) (unit/sig web-config^ (import) (define port the-port) @@ -72,4 +72,4 @@ (define instances i:instances) (define scripts (box the-scripts)) (define scripts-lock i:scripts-lock) - (define make-servlet-namespace i:scripts-lock))))) \ No newline at end of file + (define make-servlet-namespace i:make-servlet-namespace))))) \ No newline at end of file diff --git a/collects/web-server/web-server-unit.ss b/collects/web-server/web-server-unit.ss index 2fa892365e..6163c68260 100644 --- a/collects/web-server/web-server-unit.ss +++ b/collects/web-server/web-server-unit.ss @@ -607,7 +607,9 @@ ;; ************************************************************ ;; ************************************************************ ;; Paul's ugly loading code: - (define-struct cache-entry (servlet namespace)) + (define make-cache-entry cons) + (define cache-entry-servlet car) + (define cache-entry-namespace cdr) ;; cached-load : str -> script, namespace ;; timestamps are no longer checked for performance. The cache must be explicitly