Merge branches with UTF-8 changes.
authorEmil Mikulic <emikulic@gmail.com>
Wed, 13 Jan 2016 09:00:44 +0000 (20:00 +1100)
committerEmil Mikulic <emikulic@gmail.com>
Wed, 13 Jan 2016 09:00:44 +0000 (20:00 +1100)
1  2  3 
darkhttpd.c

diff --cc darkhttpd.c
@@@@ -1787,7 -1787,7 -1864,7 +1864,7 @@@@ static void generate_dir_listing(struc
        "Accept-Ranges: bytes\r\n"
        "%s" /* keep-alive */
        "Content-Length: %llu\r\n"
-       "Content-Type: text/html\r\n"
 -      "Content-Type: text/html; charset=utf-8\r\n"
++      "Content-Type: text/html; charset=UTF-8\r\n"
        "\r\n",
        date, server_hdr, keep_alive(conn), llu(conn->reply_length));