Fix issue #13

Author: jeapostrophe

web-server-lib/web-server/private/launch.rkt

@@ -65,9 +65,12 @@
 (define (serve)
   (serve/web-config@ 
    configuration@
-   #:dispatch-server-connect@ (if (ssl)
-                                  (make-ssl-connect@ (build-path (current-directory) "server-cert.pem")
-                                                     (build-path (current-directory) "private-key.pem"))
-                                  raw:dispatch-server-connect@)))
+   #:dispatch-server-connect@
+   (cond
+     [(ssl)
+      (make-ssl-connect@ (build-path (current-directory) "server-cert.pem")
+                         (build-path (current-directory) "private-key.pem"))]
+     [else
+      raw:dispatch-server-connect@])))
 
 (provide serve)

web-server-lib/web-server/web-server-unit.rkt

@@ -3,7 +3,7 @@
          net/tcp-sig)
 (require web-server/web-server-sig
          web-server/web-config-sig
-         web-server/private/dispatch-server-unit
+         web-server/private/dispatch-server-with-connect-unit
          web-server/private/dispatch-server-sig
          web-server/private/web-server-structs
          web-server/private/mime-types
@@ -105,7 +105,7 @@
 (define-compound-unit/infer web-server-with-connect@
   (import tcp^ dispatch-server-connect^ web-config^)
   (export web-server^)
-  (link web-config@->dispatch-server-config@ dispatch-server@))
+  (link web-config@->dispatch-server-config@ dispatch-server-with-connect@))
 
 (define-compound-unit/infer web-server@
   (import tcp^ web-config^)

web-server-lib/web-server/web-server.rkt

@@ -158,9 +158,11 @@
     (for-each apply shutdowns)))
 
 ; serve/config@ : configuration -> (-> void)
-(define (serve/web-config@ config@ 
-                           #:dispatch-server-connect@ [dispatch-server-connect@ raw:dispatch-server-connect@]
-                           #:tcp@ [tcp@ raw:tcp@])
+(define (serve/web-config@
+         config@ 
+         #:dispatch-server-connect@
+         [dispatch-server-connect@ raw:dispatch-server-connect@]
+         #:tcp@ [tcp@ raw:tcp@])
   (define-unit-binding a-dispatch-server-connect@
     dispatch-server-connect@ (import) (export dispatch-server-connect^))
   (define-unit-binding a-tcp@