http Access: Simplify the re-location code.

modules/access/http.c

@@ -1082,20 +1082,10 @@ 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,
              * 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 )
-                    psz_http_ext = "";
-                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);
             }