branch: externals/web-server commit 5dbb1f956e7efe2065e66e3d95fe74c8b8697b86 Merge: de9f6ba 6357a1c Author: Stefan Monnier <monn...@iro.umontreal.ca> Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Merge commit '6357a1c2d1' into externals/web-server --- web-server-status-codes.el | 4 ++-- web-server-test.el | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/web-server-status-codes.el b/web-server-status-codes.el index f3f07fc..158b596 100644 --- a/web-server-status-codes.el +++ b/web-server-status-codes.el @@ -1,6 +1,6 @@ -;;; web-server-status-codes.el --- Emacs Web Server HTML status codes +;;; web-server-status-codes.el --- Emacs Web Server HTML status codes -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2014 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; This software is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by diff --git a/web-server-test.el b/web-server-test.el index 5ec99b3..126726b 100644 --- a/web-server-test.el +++ b/web-server-test.el @@ -1,6 +1,6 @@ -;;; web-server-test.el --- Test the Emacs Web Server +;;; web-server-test.el --- Test the Emacs Web Server -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2014 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte <schulte.e...@gmail.com> @@ -20,7 +20,6 @@ ;;; Code: (require 'web-server) (require 'cl-lib) -(eval-when-compile (require 'cl)) (require 'ert) (defvar ws-test-port 8999) @@ -314,9 +313,9 @@ Content-Type: application/octet-stream 0-125, 126-64k, 64k-2^64." (should (string= (ws-web-socket-frame "short") "\201short")) (should (string= (substring (ws-web-socket-frame (make-string 126 ?a)) - 0 5) "\201~