# HG changeset patch
# User bertrand
# Date 1010970764 0
# Node ID c66fddd8867c2d8683b45b1ca69ca035db66c42a
# Parent  501620ec9b406d14cf2fd5bca902bc3a4eb47e8a
Changed the proxy protocol to http_proxy.

diff -r 501620ec9b40 -r c66fddd8867c libmpdemux/asf_streaming.c
--- a/libmpdemux/asf_streaming.c	Sun Jan 13 22:14:06 2002 +0000
+++ b/libmpdemux/asf_streaming.c	Mon Jan 14 01:12:44 2002 +0000
@@ -63,7 +63,7 @@
 	}
 	if( 	!strncasecmp( proto_s, "http", 4) || 
 		!strncasecmp( proto_s, "mms", 3)  ||
-		!strncasecmp( proto_s, "proxy", 5)
+		!strncasecmp( proto_s, "http_proxy", 10)
 		) {
 		printf("Trying ASF/HTTP...\n");
 		fd = asf_http_streaming_start( stream );
@@ -398,7 +398,7 @@
 	http_set_field( http_hdr, "User-Agent: NSPlayer/4.1.0.3856" );
 
 	// Check if we are using a proxy
-	if( !strcasecmp( url->protocol, "proxy" ) ) {
+	if( !strcasecmp( url->protocol, "http_proxy" ) ) {
 		server_url = url_new( (url->file)+1 );
 		if( server_url==NULL ) {
 			printf("Invalid proxy URL\n");
@@ -561,7 +561,7 @@
 		done = 1;
 		if( fd>0 ) close( fd );
 
-		if( !strcasecmp( url->protocol, "proxy" ) ) {
+		if( !strcasecmp( url->protocol, "http_proxy" ) ) {
 			if( url->port==0 ) url->port = 8080;
 		} else {
 			if( url->port==0 ) url->port = 80;
diff -r 501620ec9b40 -r c66fddd8867c libmpdemux/network.c
--- a/libmpdemux/network.c	Sun Jan 13 22:14:06 2002 +0000
+++ b/libmpdemux/network.c	Mon Jan 14 01:12:44 2002 +0000
@@ -184,7 +184,7 @@
 
 	http_hdr = http_new_header();
 
-	if( !strcasecmp(url->protocol, "proxy") ) {
+	if( !strcasecmp(url->protocol, "http_proxy") ) {
 		proxy = 1;
 		server_url = url_new( (url->file)+1 );
 		http_set_uri( http_hdr, server_url->url );
@@ -325,7 +325,7 @@
 		}
 
 		// HTTP based protocol
-		if( !strcasecmp(url->protocol, "http") || !strcasecmp(url->protocol, "proxy") ) {
+		if( !strcasecmp(url->protocol, "http") || !strcasecmp(url->protocol, "http_proxy") ) {
 			//if( url->port==0 ) url->port = 80;
 
 			fd = http_send_request( url );