eschulte pushed a commit to branch master in repository elpa. commit 6b958435095049ba2755e4d5d8a93cd45f9b8621 Author: Eric Schulte <schulte.e...@gmail.com> Date: Thu Jan 9 22:16:12 2014 -0700
update server stopping w/requests process field ws-stop-server was still assuming the old list representation --- NOTES | 8 ++++---- web-server.el | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NOTES b/NOTES index be84aaf..a81e92c 100644 --- a/NOTES +++ b/NOTES @@ -1,7 +1,7 @@ -*- org -*- * Notes -* Tasks [15/25] +* Tasks [15/24] ** DONE web sockets - http://en.wikipedia.org/wiki/WebSocket - http://tools.ietf.org/html/rfc6455 @@ -161,13 +161,13 @@ provide a light-weight mechanism for a function to wait for incoming process text without something gross like the =(sit-for 0.1)= used in the test suite. -** TODO use gnutls for https +** use gnutls for https low priority -- just [[*running%20behind%20an%20https%20proxy][run behind an https proxy]]. This will be a pain, and will require expanding [[info:emacs-gnutls]] to add support for starting server processes, currently only client processes are supported. -* Bugs [0/1] -** TODO Sometimes servers don't stop cleanly +* Bugs [1/1] +** DONE Sometimes servers don't stop cleanly - specifically servers with active client process - maybe also implement a =ws-stop-all= function diff --git a/web-server.el b/web-server.el index dfa924e..1072371 100644 --- a/web-server.el +++ b/web-server.el @@ -126,7 +126,7 @@ function. (defun ws-stop (server) "Stop SERVER." (setq ws-servers (remove server ws-servers)) - (mapc #'delete-process (append (mapcar #'car (requests server)) + (mapc #'delete-process (append (mapcar #'process (requests server)) (list (process server))))) (defvar ws-http-common-methods '(GET HEAD POST PUT DELETE TRACE)