Home Esplora Aiuto
Accedi
NitoTV
/
apt
Segui 2
Vota 0
Forka 0
File Problemi 0 Pull Requests 0 Wiki
Sfoglia il codice sorgente

aptwebserver: fix html validation issues

Iceweasel^WFirefox complains about the missing encoding in its console
which can be a bit annoying in interactive sessions, so fixing these
issues has no effect on apt itself, but on the testers.

Git-Dch: Ignore
David Kalnischkies 10 anni fa
parent
4a808deaac
commit
12f40394b3
1 ha cambiato i file con 5 aggiunte e 5 eliminazioni
Visualizzazione unificata Mostra Diff Stats
  1. 5 5
      test/interactive-helper/aptwebserver.cc

+ 5 - 5
test/interactive-helper/aptwebserver.cc
Vedi File 

@@ -209,8 +209,8 @@ static bool sendData(int const client, std::list<std::string> const &headers, st
 
 static void sendError(int const client, int const httpcode, std::string const &request,/*{{{*/
 
 static void sendError(int const client, int const httpcode, std::string const &request,/*{{{*/
 
 	       bool const content, std::string const &error, std::list<std::string> &headers)
 
 	       bool const content, std::string const &error, std::list<std::string> &headers)
 
 {
 
 {
 
-   std::string response("<html><head><title>");
 
-   response.append(httpcodeToStr(httpcode)).append("</title></head>");
 
+   std::string response("<!doctype html><html><head><title>");
 
+   response.append(httpcodeToStr(httpcode)).append("</title><meta charset=\"utf-8\" /></head>");
 
    response.append("<body><h1>").append(httpcodeToStr(httpcode)).append("</h1>");
 
    response.append("<body><h1>").append(httpcodeToStr(httpcode)).append("</h1>");
 
    if (httpcode != 200)
 
    if (httpcode != 200)
 
       response.append("<p><em>Error</em>: ");
 
       response.append("<p><em>Error</em>: ");
 
@@ -245,8 +245,8 @@ static void sendRedirect(int const client, int const httpcode, std::string const
 
 		  std::string const &request, bool content)
 
 		  std::string const &request, bool content)
 
 {
 
 {
 
    std::list<std::string> headers;
 
    std::list<std::string> headers;
 
-   std::string response("<html><head><title>");
 
-   response.append(httpcodeToStr(httpcode)).append("</title></head>");
 
+   std::string response("<!doctype html><html><head><title>");
 
+   response.append(httpcodeToStr(httpcode)).append("</title><meta charset=\"utf-8\" /></head>");
 
    response.append("<body><h1>").append(httpcodeToStr(httpcode)).append("</h1");
 
    response.append("<body><h1>").append(httpcodeToStr(httpcode)).append("</h1");
 
    response.append("<p>You should be redirected to <em>").append(uri).append("</em></p>");
 
    response.append("<p>You should be redirected to <em>").append(uri).append("</em></p>");
 
    response.append("This page is a result of the request: <pre>");
 
    response.append("This page is a result of the request: <pre>");
 
@@ -332,7 +332,7 @@ static void sendDirectoryListing(int const client, std::string const &dir,/*{{{*
 
       return;
 
       return;
 
    }
 
    }
 
 
 
-   listing << "<html><head><title>Index of " << dir << "</title>"
 
+   listing << "<!doctype html><html><head><title>Index of " << dir << "</title><meta charset=\"utf-8\" />"
 
 	   << "<style type=\"text/css\"><!-- td {padding: 0.02em 0.5em 0.02em 0.5em;}"
 
 	   << "<style type=\"text/css\"><!-- td {padding: 0.02em 0.5em 0.02em 0.5em;}"
 
 	   << "tr:nth-child(even){background-color:#dfdfdf;}"
 
 	   << "tr:nth-child(even){background-color:#dfdfdf;}"
 
 	   << "h1, td:nth-child(3){text-align:center;}"
 
 	   << "h1, td:nth-child(3){text-align:center;}"