Recognize *.xhtml documents as HTML too

The file plugin was not able to detect XHTML documents from files with
the .xhtml extension if there are comments before the doctype line.
Before falling back to reading the content, we directly specify the
media type to HTML based on the extension alone.

The basic content type detection algorithm is too simple and will
continue to fail when comments are placed before the doctype line.

Reported-by: Kevin Koster <dillo@ombertech.com>
See: https://lists.mailman3.com/hyperkitty/list/dillo-dev@mailman3.com/message/HBKXGO7EGCHWOQ6BM55A4LZQKT437UID/

2 files changed, 2 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 88c16e21..408c0ffd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,6 +65,7 @@ dillo-3.1 [not released yet]
  - Fix W3C validator and remove broken WDG validator.
  - Simplify bookmark DPI page style and improve readability.
  - Improve the Dillo manual available from the help button.
+ - Improve detection of XHTML documents
    Patches: Rodrigo Arias Mallo <rodarima@gmail.com>
 
 -----------------------------------------------------------------------------
diff --git a/dpi/file.c b/dpi/file.c
index 5fef5fb9..d84f4b64 100644
--- a/dpi/file.c
+++ b/dpi/file.c
@@ -511,6 +511,7 @@ static const char *File_ext(const char *filename)
    } else if (!dStrAsciiCasecmp(e, "png")) {
       return "image/png";
    } else if (!dStrAsciiCasecmp(e, "html") ||
+              !dStrAsciiCasecmp(e, "xhtml") ||
               !dStrAsciiCasecmp(e, "htm") ||
               !dStrAsciiCasecmp(e, "shtml")) {
       return "text/html";