[Mplayer-cvslog] CVS: main/libmpdemux asf_streaming.c,1.19,1.20 network.c,1.24,1.25

[Bertrand Baudet]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mplayer:/var/tmp.root/cvs-serv22274

Modified Files:
	asf_streaming.c network.c 
Log Message:
Changed the proxy protocol to http_proxy.


Index: asf_streaming.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/asf_streaming.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- asf_streaming.c	12 Jan 2002 21:08:12 -0000	1.19
+++ asf_streaming.c	14 Jan 2002 01:12:44 -0000	1.20
@@ -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;

Index: network.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/network.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- network.c	12 Jan 2002 21:08:12 -0000	1.24
+++ network.c	14 Jan 2002 01:12:44 -0000	1.25
@@ -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 );