--- HTTP.pm	2011-08-20 11:28:05.000000000 +0100
+++ HTTP.pm.new	2011-08-20 07:57:29.000000000 +0100
@@ -336,6 +336,11 @@
 	
 	foreach my $header (@headers) {
 	
+# Tidy up header to make no stray nulls or \n have been left by caller.
+		$header =~ s/[\0]*$//;
+		$header =~ s/\r/\n/g;
+		$header =~ s/\n\n/\n/g;
+
 		$isDebug && $directlog->debug("header-ds: $header");
 
 		if ($header =~ /^(?:ic[ey]-name|x-audiocast-name):\s*(.+)/i) {