RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Support URL redirections that do not specify full URL. 

Fixes crash with mplayer -playlist http://www.radioseven.se/radioseven.pls.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20800 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-11-08 22:42:31 +00:00
parent bb52578528
commit c407b9b070
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
stream/http.c
View File

@ -835,8 +835,7 @@ static int http_streaming_start(stream_t *stream, int* file_format) {
next_url = http_get_field( http_hdr, "Location" );
if( next_url!=NULL ) {
closesocket( fd );
url_free( url );
stream->streaming_ctrl->url = url = url_new( next_url );
stream->streaming_ctrl->url = url_redirect( &url, next_url );
http_free( http_hdr );
redirect = 1;
}

19
stream/url.c
View File

@ -19,6 +19,25 @@
#define SIZE_MAX ((size_t)-1)
#endif
URL_t *url_redirect(URL_t **url, const char *redir) {
URL_t *u = *url;
URL_t *res;
if (!strchr(redir, '/')) {
char *tmp;
char *newurl = malloc(strlen(u->url) + strlen(redir) + 1);
strcpy(newurl, u->url);
tmp = strrchr(newurl, '/');
if (tmp) tmp[1] = 0;
strcat(newurl, redir);
res = url_new(newurl);
free(newurl);
} else
res = url_new(redir);
url_free(u);
*url = res;
return res;
}
URL_t*
url_new(const char* url) {
int pos1, pos2,v6addr = 0;

1
stream/url.h
View File

@ -19,6 +19,7 @@ typedef struct {
char *password;
} URL_t;
URL_t *url_redirect(URL_t **url, const char *redir);
URL_t* url_new(const char* url);
void url_free(URL_t* url);