Skip to content

V
vlc-2-2
Commit b314c950 authored by Christophe Massiot's avatar Christophe Massiot
Browse files
Options

* src/misc/httpd.c: Changed the encoding of mandatory pages (401, 403, 404...) 

   to ascii instead of UTF-8 because those pages actually contain only
   ascii characters, and it allows it to work with all browsers including
   those which do not support UTF-8. BTW these pages should be somewhere
   in the filesystem instead of hard-coded in the C file.
parent af59bbe3
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
src/misc/httpd.c
View file @ b314c950
...@@ -565,7 +565,7 @@ static int httpd_RedirectCallBack( httpd_callback_sys_t *p_sys, ...@@ -565,7 +565,7 @@ static int httpd_RedirectCallBack( httpd_callback_sys_t *p_sys,
p = answer->p_body = malloc( 1000 + strlen( rdir->psz_dst ) ); p = answer->p_body = malloc( 1000 + strlen( rdir->psz_dst ) );
p += sprintf( (char *)p, p += sprintf( (char *)p,
"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" "<?xml version=\"1.0\" encoding=\"ascii\" ?>\n"
"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" " "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" "
"\"http://www.w3.org/TR/xhtml10/DTD/xhtml10strict.dtd\">\n" "\"http://www.w3.org/TR/xhtml10/DTD/xhtml10strict.dtd\">\n"
"<html>\n" "<html>\n"
...@@ -2026,7 +2026,7 @@ static void httpd_HostThread( httpd_host_t *host ) ...@@ -2026,7 +2026,7 @@ static void httpd_HostThread( httpd_host_t *host )
p = answer->p_body = malloc( 1000 ); p = answer->p_body = malloc( 1000 );
p += sprintf( (char *)p, p += sprintf( (char *)p,
"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" "<?xml version=\"1.0\" encoding=\"ascii\" ?>"
"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" " "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" "
"\"http://www.w3.org/TR/xhtml10/DTD/xhtml10strict.dtd\">\n" "\"http://www.w3.org/TR/xhtml10/DTD/xhtml10strict.dtd\">\n"
"<html>\n" "<html>\n"
...@@ -2143,7 +2143,7 @@ static void httpd_HostThread( httpd_host_t *host ) ...@@ -2143,7 +2143,7 @@ static void httpd_HostThread( httpd_host_t *host )
/* FIXME: lots of code duplication */ /* FIXME: lots of code duplication */
p += sprintf( (char *)p, p += sprintf( (char *)p,
"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" "<?xml version=\"1.0\" encoding=\"ascii\" ?>"
"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" " "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" "
"\"http://www.w3.org/TR/xhtml10/DTD/xhtml10strict.dtd\">\n" "\"http://www.w3.org/TR/xhtml10/DTD/xhtml10strict.dtd\">\n"
"<html>\n" "<html>\n"
...@@ -2163,7 +2163,7 @@ static void httpd_HostThread( httpd_host_t *host ) ...@@ -2163,7 +2163,7 @@ static void httpd_HostThread( httpd_host_t *host )
answer->psz_status = strdup( "Authorization Required" ); answer->psz_status = strdup( "Authorization Required" );
p += sprintf( (char *)p, p += sprintf( (char *)p,
"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" "<?xml version=\"1.0\" encoding=\"ascii\" ?>"
"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" " "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" "
"\"http://www.w3.org/TR/xhtml10/DTD/xhtml10strict.dtd\">\n" "\"http://www.w3.org/TR/xhtml10/DTD/xhtml10strict.dtd\">\n"
"<html>\n" "<html>\n"
...@@ -2184,7 +2184,7 @@ static void httpd_HostThread( httpd_host_t *host ) ...@@ -2184,7 +2184,7 @@ static void httpd_HostThread( httpd_host_t *host )
answer->psz_status = strdup( "Not found" ); answer->psz_status = strdup( "Not found" );
p += sprintf( (char *)p, p += sprintf( (char *)p,
"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" "<?xml version=\"1.0\" encoding=\"ascii\" ?>"
"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" " "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" "
"\"http://www.w3.org/TR/xhtml10/DTD/xhtml10strict.dtd\">\n" "\"http://www.w3.org/TR/xhtml10/DTD/xhtml10strict.dtd\">\n"
"<html>\n" "<html>\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment