[xiph-commits] r18765 - icecast/branches/ph3/icecast/src

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

Author: ph3-der-loewe
Date: 2013-01-15 07:20:14 -0800 (Tue, 15 Jan 2013)
New Revision: 18765

Modified:
   icecast/branches/ph3/icecast/src/cfgfile.c
   icecast/branches/ph3/icecast/src/logging.c
Log:
sync with master

Modified: icecast/branches/ph3/icecast/src/cfgfile.c
===================================================================
--- icecast/branches/ph3/icecast/src/cfgfile.c	2013-01-10 23:06:45 UTC (rev 18764)
+++ icecast/branches/ph3/icecast/src/cfgfile.c	2013-01-15 15:20:14 UTC (rev 18765)
@@ -732,6 +732,11 @@
         current = current->next;
     }
 
+    if (!mount->fallback_mount && (mount->fallback_when_full || mount->fallback_override))
+    {
+        WARN1("Config for mount %s contains fallback options but no fallback mount.", mount->mountname);
+    }
+
     if(last)
         last->next = mount;
     else

Modified: icecast/branches/ph3/icecast/src/logging.c
===================================================================
--- icecast/branches/ph3/icecast/src/logging.c	2013-01-10 23:06:45 UTC (rev 18764)
+++ icecast/branches/ph3/icecast/src/logging.c	2013-01-15 15:20:14 UTC (rev 18765)
@@ -159,7 +159,7 @@
         user_agent = "-";
 
     log_write_direct (accesslog,
-            "%s - %s [%s] \"%s\" %d %" PRIu64 " \"%s\" \"%s\" %lu",
+            "%s - %H [%s] \"%H\" %d %" PRIu64 " \"%H\" \"%H\" %lu",
             client->con->ip,
             username,
             datebuf,