Merge from 1.1 branch.

2 files changed, 22 insertions, 2 deletions

diff --git a/misc/cdda_server.c b/misc/cdda_server.c
index c4b3f44cb..553ec0a8a 100644
--- a/misc/cdda_server.c
+++ b/misc/cdda_server.c
@@ -1,4 +1,24 @@
-/* CDDA / DVD server
+/*
+ * CDDA / DVD server
+ *
+ * Copyright (C) 2003-2007 the xine project
+ * 
+ * This file is part of xine, a free video player.
+ * 
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
  *
  * This is a TCP server that can be used with xine's cdda input plugin to
  * play audio CDs over the network. It also supports playing DVDs with a
diff --git a/src/input/input_http.c b/src/input/input_http.c
index 25153e5dc..eb9fab144 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -64,7 +64,7 @@
 #define TAG_ICY_NOTICE2    "icy-notice2:"
 #define TAG_ICY_METAINT    "icy-metaint:"
 #define TAG_CONTENT_TYPE   "Content-Type:"
-#define TAG_LASTFM_SERVER  "Server: last.fm Streaming Server"
+#define TAG_LASTFM_SERVER  "Server: last.fm "
 
 typedef struct {
   input_plugin_t   input_plugin;