aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-12-04 14:46:30 -05:00
Code

Added 'admin' and 'location' to default config, thus fixing #1839.

Browse Source 
svn path=/icecast/trunk/icecast/; revision=18129
This commit is contained in:
Thomas B. "dm8tbr" Ruecker 2011-11-25 22:41:54 +00:00
parent e157de2321
commit 759f55b35b
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,4 +1,10 @@
2011-11-25 23:17 ph3-der-loewe 2011-11-25 22:37 dm8tbr
* trunk/icecast/conf/icecast.xml.in:
Added 'admin' and 'location' to default config, thus fixing
#1839.
2011-11-25 22:17 ph3-der-loewe
* trunk/icecast/src/cfgfile.c, trunk/icecast/conf/icecast.xml.in, * trunk/icecast/src/cfgfile.c, trunk/icecast/conf/icecast.xml.in,
trunk/icecast/conf/icecast_urlauth.xml.in, trunk/icecast/conf/icecast_urlauth.xml.in,
@ -6,12 +12,20 @@
to use destination="" not dest="". The old dest="" attribute to use destination="" not dest="". The old dest="" attribute
is still supported. is still supported.
2011-11-25 22:11 dm8tbr
* trunk/icecast/src/cfgfile.c trunk/icecast/src/cfgfile.h
trunk/icecast/src/connection.c:
Applied justdave's patches, fixing #1717 and #1718.
HTTPS now with better security and support for chained
certificates.
2011-11-25 21:20 ph3-der-loewe 2011-11-25 21:20 ph3-der-loewe
* trunk/icecast/AUTHORS, trunk/icecast/src/cfgfile.c. * trunk/icecast/AUTHORS, trunk/icecast/src/cfgfile.c.
trunk/icecast/src/connection.c: Allow the source password trunk/icecast/src/connection.c: Allow the source password
to be undefined. This is to avoid falling back to a default to be undefined. This is to avoid falling back to a default
password which may open security holes. password which would be a security problem. Fixing #1846
---------------------------------------------------------------------- ----------------------------------------------------------------------
Everything above is post 2.3.2. The stuff below is incomplete. Everything above is post 2.3.2. The stuff below is incomplete.

6
conf/icecast.xml.in
View File

@ -1,4 +1,10 @@
<icecast> <icecast>
<!-- location and admin are two arbitrary strings that are e.g. visible
on the server info page of the icecast web interface
(server_version.xsl). -->
<location>Earth<location>
<admin>icemaster@localhost</admin>
<limits> <limits>
<clients>100</clients> <clients>100</clients>
<sources>2</sources> <sources>2</sources>