summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2012-09-21 18:57:00 +0000
committerwm4 <wm4@nowhere>2012-10-30 19:50:20 +0100
commit82d47895e4b24e6ad096786756ad0f4923c81a4f (patch)
tree5a080eb13ab0f8a9f6263e8fba8d8a9ac0a2ca43 /stream
parent5a6dde54af8ce7208585a9e7ad0ef3ede26f24e0 (diff)
downloadmpv-82d47895e4b24e6ad096786756ad0f4923c81a4f.tar.bz2
mpv-82d47895e4b24e6ad096786756ad0f4923c81a4f.tar.xz
stream: fix redirection for proxy URLs
Fix redirection for proxy URLs. Should fix bug #2091. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35207 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: stream/url.c
Diffstat (limited to 'stream')
-rw-r--r--stream/http.c10
-rw-r--r--stream/url.c58
-rw-r--r--stream/url.h2
3 files changed, 55 insertions, 15 deletions
diff --git a/stream/http.c b/stream/http.c
index 8d930c6460..3971aa9d05 100644
--- a/stream/http.c
+++ b/stream/http.c
@@ -829,18 +829,16 @@ static int http_streaming_start(stream_t *stream, int* file_format) {
if( next_url!=NULL ) {
int is_ultravox = strcasecmp(stream->streaming_ctrl->url->protocol, "unsv") == 0;
stream->streaming_ctrl->url = url_redirect( &url, next_url );
- if (!strcasecmp(url->protocol, "mms")) {
+ if (url_is_protocol(url, "mms")) {
res = STREAM_REDIRECTED;
goto err_out;
}
- if (strcasecmp(url->protocol, "http")) {
+ if (!url_is_protocol(url, "http")) {
mp_msg(MSGT_NETWORK,MSGL_ERR,"Unsupported http %d redirect to %s protocol\n", http_hdr->status_code, url->protocol);
goto err_out;
}
- if (is_ultravox) {
- free(url->protocol);
- url->protocol = strdup("unsv");
- }
+ if (is_ultravox)
+ url_set_protocol(url, "unsv");
redirect = 1;
}
break;
diff --git a/stream/url.c b/stream/url.c
index a8fbab5fb4..9114468388 100644
--- a/stream/url.c
+++ b/stream/url.c
@@ -60,25 +60,65 @@ end:
return p;
}
+static int is_proxy(const URL_t *url) {
+ return !strcasecmp(url->protocol, "http_proxy") && url->file && strstr(url->file, "://");
+}
+
+int url_is_protocol(const URL_t *url, const char *proto) {
+ int proxy = is_proxy(url);
+ if (proxy) {
+ URL_t *tmp = url_new(url->file + 1);
+ int res = !strcasecmp(tmp->protocol, proto);
+ url_free(tmp);
+ return res;
+ }
+ return !strcasecmp(url->protocol, proto);
+}
+
+void url_set_protocol(URL_t *url, const char *proto) {
+ int proxy = is_proxy(url);
+ if (proxy) {
+ char *dst = url->file + 1;
+ int oldlen = strstr(dst, "://") - dst;
+ int newlen = strlen(proto);
+ if (newlen != oldlen) {
+ mp_msg(MSGT_NETWORK, MSGL_ERR, "Setting protocol not implemented!\n");
+ return;
+ }
+ memcpy(dst, proto, newlen);
+ return;
+ }
+ free(url->protocol);
+ url->protocol = strdup(proto);
+}
+
URL_t *url_redirect(URL_t **url, const char *redir) {
URL_t *u = *url;
+ int proxy = is_proxy(u);
+ const char *oldurl = proxy ? u->file + 1 : u->url;
+ const char *newurl = redir;
+ char *buffer = NULL;
URL_t *res;
if (!strchr(redir, '/') || *redir == '/') {
char *tmp;
- char *newurl = malloc(strlen(u->url) + strlen(redir) + 1);
- strcpy(newurl, u->url);
+ newurl = buffer = malloc(strlen(oldurl) + strlen(redir) + 1);
+ strcpy(buffer, oldurl);
if (*redir == '/') {
redir++;
- tmp = strstr(newurl, "://");
+ tmp = strstr(buffer, "://");
if (tmp) tmp = strchr(tmp + 3, '/');
} else
- tmp = strrchr(newurl, '/');
+ tmp = strrchr(buffer, '/');
if (tmp) tmp[1] = 0;
- strcat(newurl, redir);
- res = url_new(newurl);
- free(newurl);
- } else
- res = url_new(redir);
+ strcat(buffer, redir);
+ }
+ if (proxy) {
+ char *tmp = get_http_proxy_url(u, newurl);
+ free(buffer);
+ newurl = buffer = tmp;
+ }
+ res = url_new(newurl);
+ free(buffer);
url_free(u);
*url = res;
return res;
diff --git a/stream/url.h b/stream/url.h
index 5954367c8a..9115692fd1 100644
--- a/stream/url.h
+++ b/stream/url.h
@@ -36,6 +36,8 @@ typedef struct {
char *password;
} URL_t;
+int url_is_protocol(const URL_t *url, const char *proto);
+void url_set_protocol(URL_t *url, const char *proto);
URL_t *url_redirect(URL_t **url, const char *redir);
char *get_http_proxy_url(const URL_t *proxy, const char *host_url);