diff options
author | 2002-01-14 01:12:44 +0000 | |
---|---|---|
committer | 2002-01-14 01:12:44 +0000 | |
commit | 32d1e1014ff45f4955ee0315b10b81eea117a8c2 (patch) | |
tree | 5b67a10291a7b1d79c8fe06a95289940afe67ea5 | |
parent | a2cb625f1983e7fc4ffcea533a9dd911f6084367 (diff) |
Changed the proxy protocol to http_proxy.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4146 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libmpdemux/asf_streaming.c | 6 | ||||
-rw-r--r-- | libmpdemux/network.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libmpdemux/asf_streaming.c b/libmpdemux/asf_streaming.c index b000bd1e4a..3d23b4296c 100644 --- a/libmpdemux/asf_streaming.c +++ b/libmpdemux/asf_streaming.c @@ -63,7 +63,7 @@ asf_streaming_start( stream_t *stream ) { } 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 @@ asf_http_request(streaming_ctrl_t *streaming_ctrl) { 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 @@ asf_http_streaming_start( stream_t *stream ) { 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 --git a/libmpdemux/network.c b/libmpdemux/network.c index 62dffee360..ecd22acd92 100644 --- a/libmpdemux/network.c +++ b/libmpdemux/network.c @@ -184,7 +184,7 @@ http_send_request( URL_t *url ) { 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 @@ extension=NULL; } // 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 ); |