Use the HTML5 doctype for error and auto index pages because it is
authorreyk <reyk@openbsd.org>
Thu, 1 Jan 2015 14:15:02 +0000 (14:15 +0000)
committerreyk <reyk@openbsd.org>
Thu, 1 Jan 2015 14:15:02 +0000 (14:15 +0000)
shorter, newer, and the recommendation.  From James Jerkins.

Exclude the charset for now because it is not explicitly handled by httpd.

OK validator.w3.org (This document was successfully checked as HTML5!)

usr.sbin/httpd/server_file.c
usr.sbin/httpd/server_http.c

index a476f37..c2eca71 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: server_file.c,v 1.42 2014/12/21 00:54:49 guenther Exp $       */
+/*     $OpenBSD: server_file.c,v 1.43 2015/01/01 14:15:02 reyk Exp $   */
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -311,8 +311,7 @@ server_file_index(struct httpd *env, struct client *clt, struct stat *st)
            "sans-serif; }\nhr { border: 0; border-bottom: 1px dashed; }\n";
        /* Generate simple HTML index document */
        if (evbuffer_add_printf(evb,
-           "<!DOCTYPE HTML PUBLIC "
-           "\"-//W3C//DTD HTML 4.01 Transitional//EN\">\n"
+           "<!DOCTYPE html>\n"
            "<html>\n"
            "<head>\n"
            "<title>Index of %s</title>\n"
index e317a3a..3a5d84e 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: server_http.c,v 1.57 2014/12/21 00:54:49 guenther Exp $       */
+/*     $OpenBSD: server_http.c,v 1.58 2015/01/01 14:15:02 reyk Exp $   */
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -712,8 +712,7 @@ server_abort_http(struct client *clt, u_int code, const char *msg)
 
        /* Generate simple HTML error document */
        if ((bodylen = asprintf(&body,
-           "<!DOCTYPE HTML PUBLIC "
-           "\"-//W3C//DTD HTML 4.01 Transitional//EN\">\n"
+           "<!DOCTYPE html>\n"
            "<html>\n"
            "<head>\n"
            "<title>%03d %s</title>\n"