Skip to content

V
vlc-1.1
Commit 88d7f4a3 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

http Access: Simplify the re-location code.

parent 78cf3518
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 15 deletions
modules/access/http.c
View file @ 88d7f4a3
...@@ -1082,22 +1082,12 @@ static int Request( access_t *p_access, int64_t i_tell ) ...@@ -1082,22 +1082,12 @@ static int Request( access_t *p_access, int64_t i_tell )
/* This does not follow RFC 2068, but yet if the url is not absolute, /* This does not follow RFC 2068, but yet if the url is not absolute,
* handle it as everyone does. */ * handle it as everyone does. */
if( !strncmp( p, "/", 1 ) && ( !p_sys->psz_location || !strncmp( p_sys->psz_location, "http", 4) ) ) if( p[0] == '/' )
{ {
const char *psz_http_ext; const char *psz_http_ext = p_sys->b_ssl ? "s" : "" ;
if( !p_sys->psz_location ) asprintf(&psz_new_loc, "http%s://%s:%d%s", psz_http_ext,
psz_http_ext = ""; p_sys->url.psz_host, p_sys->url.i_port, p);
else if( p_sys->psz_location[4] == ':' )
psz_http_ext = "";
else if( !strncmp( p_sys->psz_location+4, "s:", 2) )
psz_http_ext = "s";
else
psz_http_ext = NULL; /* Shouldn't happen */
if( psz_http_ext )
asprintf(&psz_new_loc, "http%s://%s:%d%s", psz_http_ext,
p_sys->url.psz_host, p_sys->url.i_port, p);
} }
else else
{ {
......
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