From 13e706e817870a89fe0931d4bd619cb819a2051c Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Tue, 18 Sep 2007 14:33:55 +0000 Subject: [PATCH] make it possible to not run the https server (which is also the default now) svn: r7378 --- collects/handin-server/doc.txt | 6 +++--- collects/handin-server/handin-server.ss | 4 +++- collects/handin-server/private/config.ss | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/collects/handin-server/doc.txt b/collects/handin-server/doc.txt index c7f4c033a0..33c2737ce7 100644 --- a/collects/handin-server/doc.txt +++ b/collects/handin-server/doc.txt @@ -185,9 +185,9 @@ This directory contains the following files and sub-directories: 'port-number : the port for the main handin server; the default is 7979 - 'https-port-number : the port for the handin-status HTTPS - server; the default is one more than the main server's port - (so the transitive default is 7980) + 'https-port-number : the port number for the handin-status HTTPS + server; the default is #f which indicates that no HTTPS + server is started 'session-timeout : number of seconds before the session times-out -- the client is given this many seconds for the diff --git a/collects/handin-server/handin-server.ss b/collects/handin-server/handin-server.ss index 7137126c48..60f64e893a 100644 --- a/collects/handin-server/handin-server.ss +++ b/collects/handin-server/handin-server.ss @@ -626,7 +626,9 @@ (log-line "server started ------------------------------") (hook 'server-start `([port ,(get-conf 'port-number)])) - (define stop-status (serve-status (get-conf 'https-port-number))) + (define stop-status + (cond [(get-conf 'https-port-number) => (serve-status p)] + [else #f])) (define session-count 0) diff --git a/collects/handin-server/private/config.ss b/collects/handin-server/private/config.ss index bf1085ef67..4f619fee88 100644 --- a/collects/handin-server/private/config.ss +++ b/collects/handin-server/private/config.ss @@ -56,7 +56,7 @@ [(active-dirs) (values '() path-list )] [(inactive-dirs) (values '() path-list )] [(port-number) (values 7979 id )] - [(https-port-number) (values (add1 (get-conf 'port-number)) id )] + [(https-port-number) (values #f id )] [(hook-file) (values #f path/false )] [(session-timeout) (values 300 id )] [(session-memory-limit) (values 40000000 id )]