[xiph-commits] r18924 - in icecast/branches/ph3/icecast: . src

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

Author: ph3-der-loewe
Date: 2013-04-17 02:56:28 -0700 (Wed, 17 Apr 2013)
New Revision: 18924

Modified:
   icecast/branches/ph3/icecast/ChangeLog
   icecast/branches/ph3/icecast/configure.in
   icecast/branches/ph3/icecast/src/cfgfile.c
   icecast/branches/ph3/icecast/src/format.c
Log:
sync with master

Modified: icecast/branches/ph3/icecast/ChangeLog
===================================================================
--- icecast/branches/ph3/icecast/ChangeLog	2013-04-17 09:48:46 UTC (rev 18923)
+++ icecast/branches/ph3/icecast/ChangeLog	2013-04-17 09:56:28 UTC (rev 18924)
@@ -1,3 +1,63 @@
+2013-04-06 05:00:00  dm8tbr  
+
+	* Icecast 2.4 beta3 aka 2.3.99.3
+
+2013-04-05 20:13:18  dm8tbr
+
+	* Edited warning for clarity.
+
+2013-04-05 19:49:13  ph3-der-loewe
+
+	* added a warning in case mount of type default is defined but a
+	mountname is set
+
+2013-04-05 16:44:51  dm8tbr
+
+	* Setting Icecast version to 2.3.99.3 in preparation for 2.4 beta3.
+
+2013-04-05 16:43:16  dm8tbr
+
+	* Add warning when using generic handler for stream sent to Icecast.
+	All bets are off, we're trying our best using legacy handling code.
+
+2013-04-03 02:04:38  
+
+	* avoid fnmatch() on _WIN32 and fall back to strcmp(). Seems that
+	MinGW does half-implement fnmatch()...
+
+2013-04-03 00:46:55  ph3-der-loewe
+
+	* do fuzzy(fnmatch) matching for mountpoint names of non-normal
+	mounts, see #1914
+
+2013-04-03 00:33:10  ph3-der-loewe
+
+	* mount points defined in config should use data from default mounts
+	as well, see #1914
+
+2013-04-02 18:46:44  ph3-der-loewe
+
+	* Added support for a default mount. See #1914.
+	The default mount is a block in the config file that contains settings
+	for all mount points that do not have a block in configfile themself.
+	This is implemented by a <mount type="default">-block.
+	In this case the <mount>-block MUST NOT contain 
+	a <mount-name>-subblock.
+
+
+2013-04-02 12:19:33  
+
+	* Throw away the reqbuf stuff as it was not well designed. Removing it
+	and restoring usage of %H to properly address #1916
+
+2013-04-02 11:51:47  ph3-der-loewe
+
+	* make use of const keyword in _fatal_error()
+
+2013-04-02 11:48:40  ph3-der-loewe
+
+	* allow --version as alias to -v (printing version number)
+
 2013-03-30 10:52  dm8tbr
 
 	* trunk/icecast/ChangeLog:

Modified: icecast/branches/ph3/icecast/configure.in
===================================================================
--- icecast/branches/ph3/icecast/configure.in	2013-04-17 09:48:46 UTC (rev 18923)
+++ icecast/branches/ph3/icecast/configure.in	2013-04-17 09:56:28 UTC (rev 18924)
@@ -1,4 +1,4 @@
-AC_INIT([Icecast], [2.3.99.2-ph3], [icecast at xiph.org])
+AC_INIT([Icecast], [2.3.99.3-ph3], [icecast at xiph.org])
 
 AC_PREREQ(2.54)
 AC_CONFIG_SRCDIR(src/main.c)

Modified: icecast/branches/ph3/icecast/src/cfgfile.c
===================================================================
--- icecast/branches/ph3/icecast/src/cfgfile.c	2013-04-17 09:48:46 UTC (rev 18923)
+++ icecast/branches/ph3/icecast/src/cfgfile.c	2013-04-17 09:56:28 UTC (rev 18924)
@@ -20,7 +20,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef _WIN32
 #include <fnmatch.h>
+#endif
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 
@@ -747,6 +749,10 @@
         config_clear_mount (mount);
         return;
     }
+    else if (mount->mountname != NULL && mount->mounttype == MOUNT_TYPE_DEFAULT)
+    {
+    	WARN1("Default mount %s has mount-name set. This is not supported. Behavior may not be consistent.", mount->mountname);
+    }
     if (mount->auth)
         mount->auth->mount = strdup ((char *)mount->mountname);
     while(current) {
@@ -1383,8 +1389,13 @@
 	if (mountinfo->mounttype == MOUNT_TYPE_NORMAL && strcmp (mountinfo->mountname, mount) == 0)
             break;
 
+#ifndef _WIN32
         if (fnmatch(mountinfo->mountname, mount, FNM_PATHNAME) == 0)
             break;
+#else
+        if (strcmp(mountinfo->mountname, mount) == 0)
+            break;
+#endif
     }
 
     /* retry with default mount */

Modified: icecast/branches/ph3/icecast/src/format.c
===================================================================
--- icecast/branches/ph3/icecast/src/format.c	2013-04-17 09:48:46 UTC (rev 18923)
+++ icecast/branches/ph3/icecast/src/format.c	2013-04-17 09:56:28 UTC (rev 18924)
@@ -77,7 +77,9 @@
         return FORMAT_TYPE_EBML;
     else
         /* We default to the Generic format handler, which
-           can handle many more formats than just mp3 */
+           can handle many more formats than just mp3.
+	   Let's warn that this is not well supported */
+	WARN1("Unsupported or legacy stream type: \"%s\". Falling back to generic minimal handler for best effort.", contenttype);
         return FORMAT_TYPE_GENERIC;
 }