diff --git a/MediaBrowser.Dlna/Profiles/Xbox360Profile.cs b/MediaBrowser.Dlna/Profiles/Xbox360Profile.cs
index 431807aedd..64b728721b 100644
--- a/MediaBrowser.Dlna/Profiles/Xbox360Profile.cs
+++ b/MediaBrowser.Dlna/Profiles/Xbox360Profile.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Dlna.Profiles
Name = "Xbox 360";
// Required according to above
- ModelName = "Windows Media Connect";
+ ModelName = "Windows Media Player Sharing";
ModelNumber = "12.0";
@@ -25,7 +25,6 @@ namespace MediaBrowser.Dlna.Profiles
ManufacturerUrl = "http://www.microsoft.com";
XDlnaDoc = "DMS-1.50";
ModelDescription = "Emby : UPnP Media Server";
- ModelNumber = "001";
TimelineOffsetSeconds = 40;
RequiresPlainFolders = true;
diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml
index bfe1fceea0..35799f313c 100644
--- a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml
+++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml
@@ -11,9 +11,9 @@
${HostName}: 1
Microsoft Corporation
http://www.microsoft.com
- Windows Media Connect
+ Windows Media Player Sharing
Emby : UPnP Media Server
- 001
+ 12.0
http://go.microsoft.com/fwlink/?LinkId=105926
false
false
diff --git a/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs b/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs
index 649612e1e4..63ea59d530 100644
--- a/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs
+++ b/MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs
@@ -92,10 +92,7 @@ namespace MediaBrowser.Dlna.Server
builder.Append("");
AppendDeviceProperties(builder);
- if (_profile.EnableDlnaProtocol)
- {
- AppendIconList(builder);
- }
+ AppendIconList(builder);
AppendServiceList(builder);
builder.Append("");
}
@@ -111,6 +108,13 @@ namespace MediaBrowser.Dlna.Server
builder.Append("M-DMS-1.50");
builder.Append("" + SecurityElement.Escape(_profile.XDlnaDoc ?? string.Empty) + "");
}
+ else
+ {
+ builder.Append("" + SecurityElement.Escape(_profile.XDlnaCap ?? string.Empty) + "");
+
+ builder.Append("" + SecurityElement.Escape(_profile.XDlnaDoc ?? string.Empty) + "");
+ builder.Append("M-DMS-1.50");
+ }
builder.Append("" + SecurityElement.Escape(GetFriendlyName()) + "");
builder.Append("" + SecurityElement.Escape(_profile.Manufacturer ?? string.Empty) + "");
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
index 0da34efc67..4ef9d52774 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
@@ -58,7 +58,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer
if (hasOptions != null)
{
- hasOptions.Options["Server"] = "Mono-HTTPAPI/1.1";
+ if (!hasOptions.Options.ContainsKey("Server"))
+ {
+ hasOptions.Options["Server"] = "Mono-HTTPAPI/1.1, UPnP/1.0 DLNADOC/1.50";
+ }
// Content length has to be explicitly set on on HttpListenerResponse or it won't be happy
string contentLength;