summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2006-04-21 23:27:49 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2006-04-21 23:27:49 +0000
commit77cf0118050f7e1500991dd516c2b3a19b2e0d29 (patch)
tree1b70f311fba69b9bbaf909db950ef8204292290d /src
parent36c94c8401395e65aeb722e05d24915c9a361c97 (diff)
downloadxine-lib-77cf0118050f7e1500991dd516c2b3a19b2e0d29.tar.gz
xine-lib-77cf0118050f7e1500991dd516c2b3a19b2e0d29.tar.bz2
HTTP authentication fix: remove proxy requirement (patch from Diego Pettenò)
This patch removes a dummy check on proxy usage before applying authentication. This was caused by a copy-paste error in older revision of this file, and then drifted to the current problem while the code evolved. With this simple change, authenticated streams works just fine. A big thanks to Mark Kretschmann from the amaroK team who noticed the problem and helped tracking it down. CVS patchset: 7979 CVS date: 2006/04/21 23:27:49
Diffstat (limited to 'src')
-rw-r--r--src/input/input_http.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/input/input_http.c b/src/input/input_http.c
index 51092f716..3f327762f 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -19,7 +19,7 @@
*
* input plugin for http network streams
*
- * $Id: input_http.c,v 1.112 2006/04/12 15:37:07 klan Exp $
+ * $Id: input_http.c,v 1.113 2006/04/21 23:27:49 dsalt Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -657,7 +657,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) {
if (this->port == 0)
this->port = DEFAULT_HTTP_PORT;
- if ((this->user && strlen(this->user)) && use_proxy) {
+ if (this->user && strlen(this->user)) {
if (http_plugin_basicauth (this->user, this->password, this->auth, BUFSIZE)) {
_x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "basic auth error", NULL);
return 0;