Merge remote-tracking branch 'upstream/master'

1 files changed, 9 insertions, 1 deletions

diff --git a/html.c b/html.c
index 444a53d..de2c60e 100644
--- a/html.c
+++ b/html.c
@@ -427,7 +427,9 @@ static xs_html *html_base_head(void)
             xs_html_attr("name", "generator"),
             xs_html_attr("content", USER_AGENT)));
 
-    /* add server CSS */
+    /* add server CSS and favicon */
+    xs *f;
+    f = xs_fmt("%s/favicon.ico", srv_baseurl);
     xs_list *p = xs_dict_get(srv_config, "cssurls");
     char *v;
     while (xs_list_iter(&p, &v)) {
@@ -438,6 +440,12 @@ static xs_html *html_base_head(void)
                 xs_html_attr("href", v)));
     }
 
+    xs_html_add(head,
+        xs_html_sctag("link",
+            xs_html_attr("rel",  "icon"),
+            xs_html_attr("type", "image/x-icon"),
+            xs_html_attr("href", f)));
+
     return head;
 }