Ensuring cache-entries work with servlet-env

svn: r667

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)))))
+        (define make-servlet-namespace i:make-servlet-namespace)))))

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