web: Rename handler slot to http-handler.

[8sync.git] / 8sync / systems / web.scm

diff --git a/8sync/systems/web.scm b/8sync/systems/web.scm
index dc4fc2ef08da5b172dbf08a7064d331ce5ffba14..597fd008574be22775837f9fe8695b1e6e12dc9c 100644 (file)
--- a/8sync/systems/web.scm
+++ b/8sync/systems/web.scm
@@ -1,10 +1,10 @@
 ;;; 8sync --- Asynchronous programming for Guile
-;;; Copyright (C) 2017 Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright © 2017 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;;
 ;;; Code (also under the LGPL) borrowed from fibers:
-;;;   Copyright (C) 2016 Andy Wingo <wingo@pobox.com>
+;;;   Copyright © 2016 Andy Wingo <wingo@pobox.com>
 ;;; and Guile:
-;;;   Copyright (C)  2010, 2011, 2012, 2015 Free Software Foundation, Inc.
+;;;   Copyright © 2010, 2011, 2012, 2015 Free Software Foundation, Inc.
 ;;;
 ;;; This file is part of 8sync.
 ;;;
@@ -54,8 +54,10 @@
         #:accessor web-server-addr)
   (socket #:init-value #f
           #:accessor web-server-socket)
-  (handler #:init-keyword #:handler
-           #:getter web-server-handler))
+  (upgrade #:init-value '()
+           #:allocation #:each-subclass)
+  (http-handler #:init-keyword #:http-handler
+                #:getter web-server-http-handler))
 
 (define-method (initialize (web-server <web-server>) init-args)
   (next-method)
@@ -171,7 +173,7 @@ as we're alive."
 (define (web-server-handle-request web-server message
                                    request body)
   (receive (response body)
-      ((web-server-handler web-server) request body)
+      ((web-server-http-handler web-server) request body)
     (receive (response body)
         (sanitize-response request response body)
       (<-reply message response body))))