[PATCH] Do not keep authentication in URL on connection through a proxy

[Clément Bœsch]

---
 stream/network.c |    2 +-
 stream/url.c     |   12 ++++++++++++
 stream/url.h     |    1 +
 3 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/stream/network.c b/stream/network.c
index 02ddcc8..74da18f 100644
--- a/stream/network.c
+++ b/stream/network.c
@@ -209,7 +209,7 @@ http_send_request( URL_t *url, off_t pos ) {
 			mp_msg(MSGT_NETWORK, MSGL_ERR, "Invalid URL '%s' to proxify\n", url->file+1);
 			goto err_out;
 		}
-		http_set_uri( http_hdr, server_url->url );
+		http_set_uri( http_hdr, server_url->noauth_url );
 	} else {
 		server_url = url;
 		http_set_uri( http_hdr, server_url->file );
diff --git a/stream/url.c b/stream/url.c
index 0469de9..becc729 100644
--- a/stream/url.c
+++ b/stream/url.c
@@ -232,6 +232,18 @@ url_new(const char* url) {
 		strcpy(Curl->file, "/");
 	}
 
+	Curl->noauth_url = malloc(strlen(Curl->url) + 1);
+	if (Curl->noauth_url == NULL) {
+		mp_msg(MSGT_NETWORK, MSGL_FATAL, MSGTR_MemAllocFailed);
+		goto err_out;
+	}
+	if (Curl->port)
+		sprintf(Curl->noauth_url, "%s://%s:%d%s",
+			Curl->protocol, Curl->hostname, Curl->port, Curl->file);
+	else
+		sprintf(Curl->noauth_url, "%s://%s%s",
+			Curl->protocol, Curl->hostname, Curl->file);
+
         free(escfilename);
 	return Curl;
 err_out:
diff --git a/stream/url.h b/stream/url.h
index fab81ec..c89d91a 100644
--- a/stream/url.h
+++ b/stream/url.h
@@ -27,6 +27,7 @@
 
 typedef struct {
 	char *url;
+	char *noauth_url;
 	char *protocol;
 	char *hostname;
 	char *file;
-- 
1.7.3.2


--Qrgsu6vtpU/OV/zm--