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

[ph3-der-loewe at svn.xiph.org]

Author: ph3-der-loewe
Date: 2011-11-25 14:22:48 -0800 (Fri, 25 Nov 2011)
New Revision: 18128

Modified:
   icecast/trunk/icecast/ChangeLog
   icecast/trunk/icecast/conf/icecast.xml.in
   icecast/trunk/icecast/conf/icecast_minimal.xml.in
   icecast/trunk/icecast/conf/icecast_urlauth.xml.in
   icecast/trunk/icecast/src/cfgfile.c
Log:
Updated <alias> to use destination="" not dest="".
The old dest="" attribute is still supported.


Modified: icecast/trunk/icecast/ChangeLog
===================================================================
--- icecast/trunk/icecast/ChangeLog	2011-11-25 22:12:11 UTC (rev 18127)
+++ icecast/trunk/icecast/ChangeLog	2011-11-25 22:22:48 UTC (rev 18128)
@@ -1,3 +1,11 @@
+2011-11-25 23: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 21:20  ph3-der-loewe
 
 	* trunk/icecast/AUTHORS, trunk/icecast/src/cfgfile.c.

Modified: icecast/trunk/icecast/conf/icecast.xml.in
===================================================================
--- icecast/trunk/icecast/conf/icecast.xml.in	2011-11-25 22:12:11 UTC (rev 18127)
+++ icecast/trunk/icecast/conf/icecast.xml.in	2011-11-25 22:22:48 UTC (rev 18128)
@@ -139,13 +139,13 @@
              and "bind-address" attributes.
           -->
         <!--
-        <alias source="/foo" dest="/bar"/>
+        <alias source="/foo" destination="/bar"/>
           -->
         <!-- Aliases: can also be used for simple redirections as well,
              this example will redirect all requests for http://server:port/ to
              the status page
           -->
-        <alias source="/" dest="/status.xsl"/>
+        <alias source="/" destination="/status.xsl"/>
     </paths>
 
     <logging>

Modified: icecast/trunk/icecast/conf/icecast_minimal.xml.in
===================================================================
--- icecast/trunk/icecast/conf/icecast_minimal.xml.in	2011-11-25 22:12:11 UTC (rev 18127)
+++ icecast/trunk/icecast/conf/icecast_minimal.xml.in	2011-11-25 22:22:48 UTC (rev 18128)
@@ -25,7 +25,7 @@
         <logdir>@localstatedir@/log/@PACKAGE@</logdir>
         <webroot>@pkgdatadir@/web</webroot>
         <adminroot>@pkgdatadir@/admin</adminroot>
-        <alias source="/" dest="/status.xsl"/>
+        <alias source="/" destination="/status.xsl"/>
     </paths>
     <logging>
         <accesslog>access.log</accesslog>

Modified: icecast/trunk/icecast/conf/icecast_urlauth.xml.in
===================================================================
--- icecast/trunk/icecast/conf/icecast_urlauth.xml.in	2011-11-25 22:12:11 UTC (rev 18127)
+++ icecast/trunk/icecast/conf/icecast_urlauth.xml.in	2011-11-25 22:22:48 UTC (rev 18128)
@@ -34,7 +34,7 @@
         <logdir>@localstatedir@/log/@PACKAGE@</logdir>
         <webroot>@pkgdatadir@/web</webroot>
         <adminroot>@pkgdatadir@/admin</adminroot>
-        <alias source="/" dest="/status.xsl"/>
+        <alias source="/" destination="/status.xsl"/>
     </paths>
     <logging>
         <accesslog>access.log</accesslog>

Modified: icecast/trunk/icecast/src/cfgfile.c
===================================================================
--- icecast/trunk/icecast/src/cfgfile.c	2011-11-25 22:12:11 UTC (rev 18127)
+++ icecast/trunk/icecast/src/cfgfile.c	2011-11-25 22:22:48 UTC (rev 18128)
@@ -986,7 +986,9 @@
                 free(alias);
                 continue;
             }
-            alias->destination = (char *)xmlGetProp(node, XMLSTR("dest"));
+            alias->destination = (char *)xmlGetProp(node, XMLSTR("destination"));
+            if (!alias->destination)
+                alias->destination = (char *)xmlGetProp(node, XMLSTR("dest"));
             if(alias->destination == NULL) {
                 xmlFree(alias->source);
                 free(alias);