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

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

Browse Source 
The old dest="" attribute is still supported.

svn path=/icecast/trunk/icecast/; revision=18128
This commit is contained in:
Philipp Schafft 2011-11-25 22:22:48 +00:00
parent f57110d7e5
commit e157de2321
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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 2011-11-25 21:20 ph3-der-loewe
* trunk/icecast/AUTHORS, trunk/icecast/src/cfgfile.c. * trunk/icecast/AUTHORS, trunk/icecast/src/cfgfile.c.

4
conf/icecast.xml.in
View File

@ -139,13 +139,13 @@
and "bind-address" attributes. and "bind-address" attributes.
--> -->
<!-- <!--
<alias source="/foo" dest="/bar"/> <alias source="/foo" destination="/bar"/>
--> -->
<!-- Aliases: can also be used for simple redirections as well, <!-- Aliases: can also be used for simple redirections as well,
this example will redirect all requests for http://server:port/ to this example will redirect all requests for http://server:port/ to
the status page the status page
--> -->
<alias source="/" dest="/status.xsl"/> <alias source="/" destination="/status.xsl"/>
</paths> </paths>
<logging> <logging>

2
conf/icecast_minimal.xml.in
View File

@ -25,7 +25,7 @@
<logdir>@localstatedir@/log/@PACKAGE@</logdir> <logdir>@localstatedir@/log/@PACKAGE@</logdir>
<webroot>@pkgdatadir@/web</webroot> <webroot>@pkgdatadir@/web</webroot>
<adminroot>@pkgdatadir@/admin</adminroot> <adminroot>@pkgdatadir@/admin</adminroot>
<alias source="/" dest="/status.xsl"/> <alias source="/" destination="/status.xsl"/>
</paths> </paths>
<logging> <logging>
<accesslog>access.log</accesslog> <accesslog>access.log</accesslog>

2
conf/icecast_urlauth.xml.in
View File

@ -34,7 +34,7 @@
<logdir>@localstatedir@/log/@PACKAGE@</logdir> <logdir>@localstatedir@/log/@PACKAGE@</logdir>
<webroot>@pkgdatadir@/web</webroot> <webroot>@pkgdatadir@/web</webroot>
<adminroot>@pkgdatadir@/admin</adminroot> <adminroot>@pkgdatadir@/admin</adminroot>
<alias source="/" dest="/status.xsl"/> <alias source="/" destination="/status.xsl"/>
</paths> </paths>
<logging> <logging>
<accesslog>access.log</accesslog> <accesslog>access.log</accesslog>

4
src/cfgfile.c
View File

@ -986,7 +986,9 @@ static void _parse_paths(xmlDocPtr doc, xmlNodePtr node,
free(alias); free(alias);
continue; 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) { if(alias->destination == NULL) {
xmlFree(alias->source); xmlFree(alias->source);
free(alias); free(alias);