From f9ed8d8d5e0f4887d4d17b04736e756dfb702f12 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Fri, 29 Dec 2023 11:22:49 +0100 Subject: [PATCH] update simple-httpd Signed-off-by: Andreas Gerler --- .../simple-httpd-autoloads.el | 36 +++++++++---------- .../simple-httpd-pkg.el | 4 +-- .../simple-httpd.el | 12 +++---- 3 files changed, 25 insertions(+), 27 deletions(-) rename elpa/{simple-httpd-20230619.642 => simple-httpd-20230821.1458}/simple-httpd-autoloads.el (61%) rename elpa/{simple-httpd-20230619.642 => simple-httpd-20230821.1458}/simple-httpd-pkg.el (70%) rename elpa/{simple-httpd-20230619.642 => simple-httpd-20230821.1458}/simple-httpd.el (99%) diff --git a/elpa/simple-httpd-20230619.642/simple-httpd-autoloads.el b/elpa/simple-httpd-20230821.1458/simple-httpd-autoloads.el similarity index 61% rename from elpa/simple-httpd-20230619.642/simple-httpd-autoloads.el rename to elpa/simple-httpd-20230821.1458/simple-httpd-autoloads.el index e0d7a5cb..bfa02a51 100644 --- a/elpa/simple-httpd-20230619.642/simple-httpd-autoloads.el +++ b/elpa/simple-httpd-20230821.1458/simple-httpd-autoloads.el @@ -1,42 +1,40 @@ -;;; simple-httpd-autoloads.el --- automatically extracted autoloads -*- lexical-binding: t -*- -;; +;;; simple-httpd-autoloads.el --- automatically extracted autoloads (do not edit) -*- lexical-binding: t -*- +;; Generated by the `loaddefs-generate' function. + +;; This file is part of GNU Emacs. + ;;; Code: -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) +(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path))) + -;;;### (autoloads nil "simple-httpd" "simple-httpd.el" (0 0 0 0)) ;;; Generated autoloads from simple-httpd.el (autoload 'httpd-start "simple-httpd" "\ Start the web server process. If the server is already running, this will restart the server. There is only one server -instance per Emacs instance." t nil) - +instance per Emacs instance." t) (autoload 'httpd-stop "simple-httpd" "\ -Stop the web server if it is currently running, otherwise do nothing." t nil) - +Stop the web server if it is currently running, otherwise do nothing." t) (autoload 'httpd-running-p "simple-httpd" "\ -Return non-nil if the simple-httpd server is running." nil nil) - +Return non-nil if the simple-httpd server is running.") (autoload 'httpd-serve-directory "simple-httpd" "\ Start the web server with given `directory' as `httpd-root'. -\(fn DIRECTORY)" t nil) - +(fn DIRECTORY)" t) (register-definition-prefixes "simple-httpd" '("defservlet" "httpd" "with-httpd-buffer")) - -;;;*** -;;;### (autoloads nil nil ("simple-httpd-pkg.el") (0 0 0 0)) +;;; End of scraped data + +(provide 'simple-httpd-autoloads) -;;;*** - ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 +;; no-native-compile: t +;; coding: utf-8-emacs-unix ;; End: + ;;; simple-httpd-autoloads.el ends here diff --git a/elpa/simple-httpd-20230619.642/simple-httpd-pkg.el b/elpa/simple-httpd-20230821.1458/simple-httpd-pkg.el similarity index 70% rename from elpa/simple-httpd-20230619.642/simple-httpd-pkg.el rename to elpa/simple-httpd-20230821.1458/simple-httpd-pkg.el index 6fc262d7..bf77f771 100644 --- a/elpa/simple-httpd-20230619.642/simple-httpd-pkg.el +++ b/elpa/simple-httpd-20230821.1458/simple-httpd-pkg.el @@ -1,6 +1,6 @@ -(define-package "simple-httpd" "20230619.642" "pure elisp HTTP server" +(define-package "simple-httpd" "20230821.1458" "pure elisp HTTP server" '((cl-lib "0.3")) - :commit "6260232da8b53c4e214bc5e427ec00c3ebdd9869" :authors + :commit "347c30494d3bcfc79de35e54538f92f4e4a46ecd" :authors '(("Christopher Wellons" . "wellons@nullprogram.com")) :maintainers '(("Christopher Wellons" . "wellons@nullprogram.com")) diff --git a/elpa/simple-httpd-20230619.642/simple-httpd.el b/elpa/simple-httpd-20230821.1458/simple-httpd.el similarity index 99% rename from elpa/simple-httpd-20230619.642/simple-httpd.el rename to elpa/simple-httpd-20230821.1458/simple-httpd.el index a1da44e2..17bc8d18 100644 --- a/elpa/simple-httpd-20230619.642/simple-httpd.el +++ b/elpa/simple-httpd-20230821.1458/simple-httpd.el @@ -418,7 +418,7 @@ emacs -Q -batch -l simple-httpd.elc -f httpd-batch-start" (defun httpd--filter (proc chunk) "Runs each time client makes a request." (with-current-buffer (process-get proc :request-buffer) - (setf (point) (point-max)) + (goto-char (point-max)) (insert chunk) (let ((request (process-get proc :request))) (unless request @@ -656,21 +656,21 @@ actually serve up files." "Parse HTTP header in current buffer into association list. Leaves the point at the start of the request content. Returns nil if it failed to parse a complete HTTP header." - (setf (point) (point-min)) + (goto-char (point-min)) (when (looking-at "\\([^ ]+\\) +\\([^ ]+\\) +\\([^\r]+\\)\r\n") (let ((method (match-string 1)) (path (decode-coding-string (match-string 2) 'iso-8859-1)) (version (match-string 3)) (headers ())) - (setf (point) (match-end 0)) + (goto-char (match-end 0)) (while (looking-at "\\([-!#-'*+.0-9A-Z^_`a-z|~]+\\): *\\([^\r]+\\)\r\n") - (setf (point) (match-end 0)) + (goto-char (match-end 0)) (let ((name (match-string 1)) (value (match-string 2))) (push (list (httpd--normalize-header name) (decode-coding-string value 'iso-8859-1)) headers))) (when (looking-at "\r\n") - (setf (point) (match-end 0)) + (goto-char (match-end 0)) (cons (list method path version) (nreverse headers)))))) (defun httpd-unhex (str) @@ -700,7 +700,7 @@ element is the fragment." (defun httpd-escape-html-buffer () "Escape current buffer contents to be safe for inserting into HTML." - (setf (point) (point-min)) + (goto-char (point-min)) (while (search-forward-regexp "[<>&]" nil t) (replace-match (cl-case (aref (match-string 0) 0) -- 2.47.3