[xiph-commits] r18129 - in icecast/trunk/icecast: . conf

[dm8tbr at svn.xiph.org]

Author: dm8tbr
Date: 2011-11-25 14:41:54 -0800 (Fri, 25 Nov 2011)
New Revision: 18129

Modified:
   icecast/trunk/icecast/ChangeLog
   icecast/trunk/icecast/conf/icecast.xml.in
Log:
Added 'admin' and 'location' to default config, thus fixing #1839.



Modified: icecast/trunk/icecast/ChangeLog
===================================================================
--- icecast/trunk/icecast/ChangeLog	2011-11-25 22:22:48 UTC (rev 18128)
+++ icecast/trunk/icecast/ChangeLog	2011-11-25 22:41:54 UTC (rev 18129)
@@ -1,17 +1,31 @@
-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/conf/icecast_urlauth.xml.in,
 	  trunk/icecast/conf/icecast_minimal.xml.in: Updated <alias>
 	  to use destination="" not dest="". The old dest="" attribute
 	  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
 
 	* trunk/icecast/AUTHORS, trunk/icecast/src/cfgfile.c.
 	  trunk/icecast/src/connection.c: Allow the source password
 	  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.

Modified: icecast/trunk/icecast/conf/icecast.xml.in
===================================================================
--- icecast/trunk/icecast/conf/icecast.xml.in	2011-11-25 22:22:48 UTC (rev 18128)
+++ icecast/trunk/icecast/conf/icecast.xml.in	2011-11-25 22:41:54 UTC (rev 18129)
@@ -1,4 +1,10 @@
 <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 at localhost</admin>
+
     <limits>
         <clients>100</clients>
         <sources>2</sources>