From bc75ac3fe358802adc112678d8743374a10629f7 Mon Sep 17 00:00:00 2001
From: Jay McCarthy <jay@racket-lang.org>
Date: Tue, 29 May 2007 17:47:09 +0000
Subject: [PATCH] Removing unused session field

svn: r6379
---
 .../dispatch-servlets2.ss                     |  2 +-
 .../prototype-web-server/private/session.ss   | 12 +++++------
 .../prototype-web-server/private/web.ss       | 21 ++++++++-----------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/collects/web-server/prototype-web-server/dispatch-servlets2.ss b/collects/web-server/prototype-web-server/dispatch-servlets2.ss
index e56e390d90..4974668701 100644
--- a/collects/web-server/prototype-web-server/dispatch-servlets2.ss
+++ b/collects/web-server/prototype-web-server/dispatch-servlets2.ss
@@ -103,7 +103,7 @@
               (parameterize ([current-directory (directory-part a-path)])
                 (let* ([cust (make-custodian top-cust)]
                        [ns (make-servlet-namespace)]
-                       [ses (new-session cust ns (make-session-url uri url-servlet-path) a-path)])
+                       [ses (new-session cust ns (make-session-url uri url-servlet-path))])
                   (parameterize ([current-custodian cust]
                                  [current-namespace ns]
                                  [current-session ses])
diff --git a/collects/web-server/prototype-web-server/private/session.ss b/collects/web-server/prototype-web-server/private/session.ss
index 73b8c219dd..5c5c88366f 100644
--- a/collects/web-server/prototype-web-server/private/session.ss
+++ b/collects/web-server/prototype-web-server/private/session.ss
@@ -5,17 +5,16 @@
            (lib "response.ss" "web-server"))
   (provide current-session)
   
-  (define-struct session (id cust namespace servlet url mod-path))
+  (define-struct session (id cust namespace servlet url))
   
   (provide/contract
    [struct session ([id number?]
                     [cust custodian?]
                     [namespace namespace?]
                     [servlet (request? . -> . response?)]
-                    [url url?]
-                    [mod-path path?])]
+                    [url url?])]
    [lookup-session (number? . -> . (union session? boolean?))]
-   [new-session (custodian? namespace? url? path? . -> . session?)])
+   [new-session (custodian? namespace? url? . -> . session?)])
   
   (define current-session (make-parameter #f))
   
@@ -29,15 +28,14 @@
   (define the-session-table (make-hash-table))
   
   ;; new-session: namespace path -> session
-  (define (new-session cust ns uri mod-path)
+  (define (new-session cust ns uri)
     (let* ([new-id (new-session-id)]
            [ses (make-session
                  new-id
                  cust
                  ns
                  (lambda (req) (error "session not initialized"))
-                 (encode-session uri new-id)
-                 mod-path)])
+                 (encode-session uri new-id))])
       (hash-table-put! the-session-table new-id ses)
       ses))
   
diff --git a/collects/web-server/prototype-web-server/private/web.ss b/collects/web-server/prototype-web-server/private/web.ss
index 6b4ca58ffb..77aa0d4c24 100644
--- a/collects/web-server/prototype-web-server/private/web.ss
+++ b/collects/web-server/prototype-web-server/private/web.ss
@@ -46,20 +46,18 @@
   ;; send/suspend/url: (url -> response) -> request
   ;; like send/suspend except the continuation is encoded in the url
   (define (send/suspend/url page-maker)
-    (let ([ses (current-session)])
-      (send/suspend0
-       (lambda (k)
-         (page-maker
-          (stuff-url (serialize k)
-                     (session-url ses)))))))
+    (send/suspend0
+     (lambda (k)
+       (page-maker
+        (stuff-url (serialize k)
+                   (session-url (current-session)))))))
   
   ; XXX Changing embedding to be a param
   (define embed-label 'superkont)  
   (define (embed-proc/url k-url proc)
-    (define ses (current-session))
     (define superkont-url
       (stuff-url (serialize proc)                                              
-                 (session-url ses)))
+                 (session-url (current-session))))
     (define result-uri
       (extend-url-query k-url embed-label 
                         (url->string superkont-url)))
@@ -72,10 +70,9 @@
     (define binds (url-query req-url))
     (define maybe-embedding (assq embed-label binds))
     (if maybe-embedding
-        (let* ([superkont-url (string->url (cdr maybe-embedding))]
-               [proc (deserialize 
-                      (unstuff-url
-                       superkont-url))])
+        (let ([proc (deserialize 
+                     (unstuff-url
+                      (string->url (cdr maybe-embedding))))])
           (proc request))
         (error 'send/suspend/dispatch "No ~a: ~S!" embed-label binds)))