call html_escape() in xfun 0.48

yihui · Oct 2, 2024 · 58d7737 · 58d7737
1 parent d120084
commit 58d7737
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: servr
 Type: Package
 Title: A Simple HTTP Server to Serve Static Files or Dynamic Documents
-Version: 0.31.1
+Version: 0.31.2
 Authors@R: c(
   person("Yihui", "Xie", role = c("aut", "cre"), email = "xie@yihui.name", comment = c(ORCID = "0000-0003-0645-5666")),
   person("Carson", "Sievert", role = "ctb"),
@@ -19,7 +19,7 @@ Depends:
 Imports:
     mime (>= 0.2),
     httpuv (>= 1.5.2),
-    xfun (>= 0.42),
+    xfun (>= 0.48),
     jsonlite
 Suggests:
     tools,

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 # CHANGES IN servr VERSION 0.32
 
+- Requires **xfun** >= 0.48.
+
 # CHANGES IN servr VERSION 0.31
 
 - A fallback `favicon.ico` will be provided if it does not exist when serving files (thanks, @MMJansen, rstudio/pagedown#329).

diff --git a/R/static.R b/R/static.R
@@ -311,7 +311,7 @@ serve_dir = function(dir = '.', response = NULL) function(req) {
       readLines(idx, warn = FALSE)
     } else {
       d = file.info(list.files(path, all.files = TRUE, full.names = TRUE))
-      title = xfun:::escape_html(path)
+      title = xfun::html_escape(path)
       html_doc(c(sprintf('<h1>Index of %s</h1>', title), fileinfo_table(d)),
                title = title)
     }

diff --git a/R/utils.R b/R/utils.R
@@ -9,7 +9,7 @@ fileinfo_table = function(info) {
   d = info$isdir; i = !is.na(d)
   # files/dirs
   x1 = paste(basename(rownames(info)), ifelse(d & i, '/', ''), sep = '')
-  x1 = xfun:::escape_html(x1)
+  x1 = xfun::html_escape(x1)
   x1[i] = sprintf('<a href="%s">%s</a>', x1[i], x1[i])
   # size
   x2 = paste(format(info$size, scientific = FALSE, big.mark = ','), 'B')