oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

curl: moved proxy settings to "input" block

Browse Source 
The old global settings "http_proxy_host", "http_proxy_port",
"http_proxy_user" and "http_proxy_password" continue to work.
This commit is contained in:
Max Kellermann
2009-04-25 13:35:04 +02:00
parent bd014483c2
commit 11bcd7f013
5 changed files with 72 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
doc/mpd.conf.5
View File

@@ -210,16 +210,8 @@ The default is 10%, a little over 1 second of CD-quality audio with the default
buffer size.
.TP
.B http_proxy_host <hostname>
Use to specify the proxy host used for HTTP connections.
.TP
.B http_proxy_port <port>
The port that the HTTP proxy host uses.
.TP
.B http_proxy_user <username>
If the HTTP proxy server requires authentication, this specifies the username.
.TP
.B http_proxy_password <password>
If the HTTP proxy server requires authentication, this specifies the password.
This setting is deprecated. Use the "proxy" setting in the "curl"
input block. See MPD user manual for details.
.TP
.B connection_timeout <seconds>
If a client does not send any new data in this time period, the connection is

26
doc/mpdconf.example
View File

@@ -149,6 +149,19 @@
###############################################################################
# Input #######################################################################
#
input {
plugin "curl"
# proxy "proxy.isp.com:8080"
# proxy_user "user"
# proxy_password "password"
}
#
###############################################################################
# Audio Output ################################################################
#
# MPD supports various audio output types, as well as playing through multiple
@@ -325,19 +338,6 @@
###############################################################################
# HTTP Streaming Proxy ########################################################
#
# This setting specifies the HTTP proxy to use for playing HTTP streams. These
# settings will be disabled by default.
#
#http_proxy_host "proxy.isp.com"
#http_proxy_port "8080"
#http_proxy_user "user"
#http_proxy_password "password"
#
###############################################################################
# Resource Limitations ########################################################
#
# These settings are various limitations to prevent MPD from using too many

30
doc/user.xml
View File

@@ -303,6 +303,36 @@ cd mpd-0.14.2</programlisting>
<para>
Opens remote files or streams over HTTP.
</para>
<informaltable>
<tgroup cols="2">
<thead>
<row>
<entry>Setting</entry>
<entry>Description</entry>
</row>
</thead>
<tbody>
<row>
<entry>
<varname>proxy</varname>
</entry>
<entry>
Sets the address of the HTTP proxy server.
</entry>
</row>
<row>
<entry>
<varname>proxy_user</varname>,
<varname>proxy_password</varname>
</entry>
<entry>
Configures proxy authentication.
</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</section>
<section>