Commit e157de23 authored by Philipp Schafft's avatar Philipp Schafft 🦁

Updated <alias> to use destination="" not dest="".

The old dest="" attribute is still supported.

svn path=/icecast/trunk/icecast/; revision=18128
parent f57110d7
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.
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -986,7 +986,9 @@ static void _parse_paths(xmlDocPtr doc, xmlNodePtr node,
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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment