Skip to content

V
vlc
Commit fb2e2f05 authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files
Options

Backport of [15290] and [15297]

parent 1e32fa6f
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
configure.ac
View file @ fb2e2f05
...@@ -5130,7 +5130,7 @@ dnl ...@@ -5130,7 +5130,7 @@ dnl
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
then then
AC_CHECK_LIB(unicows, LoadUnicowsSymbol, [ AC_CHECK_LIB(unicows, LoadUnicowsSymbol, [
VLC_ADD_LDFLAGS([vlc],[-lunicows]) VLC_ADD_LDFLAGS([vlc],[-Wl,--exclude-libs,libunicows.a -lunicows])
]) ])
fi fi
......
src/network/httpd.c
View file @ fb2e2f05
...@@ -2232,7 +2232,7 @@ static void httpd_HostThread( httpd_host_t *host ) ...@@ -2232,7 +2232,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=\"ascii\" ?>" "<?xml version=\"1.0\" encoding=\"us-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"
...@@ -2242,7 +2242,7 @@ static void httpd_HostThread( httpd_host_t *host ) ...@@ -2242,7 +2242,7 @@ static void httpd_HostThread( httpd_host_t *host )
"<body>\n" "<body>\n"
"<h1>403 Forbidden (%s)</h1>\n" "<h1>403 Forbidden (%s)</h1>\n"
"<hr />\n" "<hr />\n"
"<a href=\"http://www.videolan.org\">VideoLAN</a>\n" "<p><a href=\"http://www.videolan.org\">VideoLAN</a></p>\n"
"</body>\n" "</body>\n"
"</html>\n", query->psz_url ); "</html>\n", query->psz_url );
} }
...@@ -2252,7 +2252,7 @@ static void httpd_HostThread( httpd_host_t *host ) ...@@ -2252,7 +2252,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=\"ascii\" ?>" "<?xml version=\"1.0\" encoding=\"us-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"
...@@ -2262,7 +2262,7 @@ static void httpd_HostThread( httpd_host_t *host ) ...@@ -2262,7 +2262,7 @@ static void httpd_HostThread( httpd_host_t *host )
"<body>\n" "<body>\n"
"<h1>401 Authorization Required (%s)</h1>\n" "<h1>401 Authorization Required (%s)</h1>\n"
"<hr />\n" "<hr />\n"
"<a href=\"http://www.videolan.org\">VideoLAN</a>\n" "<p><a href=\"http://www.videolan.org\">VideoLAN</a></p>\n"
"</body>\n" "</body>\n"
"</html>\n", query->psz_url ); "</html>\n", query->psz_url );
} }
...@@ -2273,7 +2273,7 @@ static void httpd_HostThread( httpd_host_t *host ) ...@@ -2273,7 +2273,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=\"ascii\" ?>" "<?xml version=\"1.0\" encoding=\"us-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"
...@@ -2283,7 +2283,7 @@ static void httpd_HostThread( httpd_host_t *host ) ...@@ -2283,7 +2283,7 @@ static void httpd_HostThread( httpd_host_t *host )
"<body>\n" "<body>\n"
"<h1>404 Resource not found(%s)</h1>\n" "<h1>404 Resource not found(%s)</h1>\n"
"<hr />\n" "<hr />\n"
"<a href=\"http://www.videolan.org\">VideoLAN</a>\n" "<p><a href=\"http://www.videolan.org\"> VideoLAN</a></p>\n"
"</body>\n" "</body>\n"
"</html>\n", query->psz_url ); "</html>\n", query->psz_url );
} }
...@@ -2291,6 +2291,7 @@ static void httpd_HostThread( httpd_host_t *host ) ...@@ -2291,6 +2291,7 @@ static void httpd_HostThread( httpd_host_t *host )
answer->i_body = p - answer->p_body; answer->i_body = p - answer->p_body;
cl->i_buffer = -1; /* Force the creation of the answer in httpd_ClientSend */ cl->i_buffer = -1; /* Force the creation of the answer in httpd_ClientSend */
httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body ); httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body );
httpd_MsgAdd( answer, "Content-Type", "%s", "text/html" );
} }
cl->i_state = HTTPD_CLIENT_SENDING; cl->i_state = HTTPD_CLIENT_SENDING;
......
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