2 files changed, 48 insertions, 1 deletions
diff --git a/MediaBrowser.Common.Implementations/HttpServer/BaseRestService.cs b/MediaBrowser.Common.Implementations/HttpServer/BaseRestService.cs
index bcf1dc4a7..65195c52b 100644
--- a/MediaBrowser.Common.Implementations/HttpServer/BaseRestService.cs
+++ b/MediaBrowser.Common.Implementations/HttpServer/BaseRestService.cs
@@ -14,7 +14,6 @@ using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using MimeTypes = MediaBrowser.Common.Net.MimeTypes;
-using StreamWriter = MediaBrowser.Common.Net.StreamWriter;
 
 namespace MediaBrowser.Common.Implementations.HttpServer
 {
diff --git a/MediaBrowser.Common.Implementations/HttpServer/StreamWriter.cs b/MediaBrowser.Common.Implementations/HttpServer/StreamWriter.cs
new file mode 100644
index 000000000..c92bfe0b9
--- /dev/null
+++ b/MediaBrowser.Common.Implementations/HttpServer/StreamWriter.cs
@@ -0,0 +1,48 @@
+using ServiceStack.Service;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Common.Implementations.HttpServer
+{
+    /// <summary>
+    /// Class StreamWriter
+    /// </summary>
+    public class StreamWriter : IStreamWriter
+    {
+        /// <summary>
+        /// Gets or sets the source stream.
+        /// </summary>
+        /// <value>The source stream.</value>
+        public Stream SourceStream { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StreamWriter" /> class.
+        /// </summary>
+        /// <param name="source">The source.</param>
+        public StreamWriter(Stream source)
+        {
+            SourceStream = source;
+        }
+
+        /// <summary>
+        /// Writes to.
+        /// </summary>
+        /// <param name="responseStream">The response stream.</param>
+        public void WriteTo(Stream responseStream)
+        {
+            var task = WriteToAsync(responseStream);
+
+            Task.WaitAll(task);
+        }
+
+        /// <summary>
+        /// Writes to async.
+        /// </summary>
+        /// <param name="responseStream">The response stream.</param>
+        /// <returns>Task.</returns>
+        private Task WriteToAsync(Stream responseStream)
+        {
+            return SourceStream.CopyToAsync(responseStream);
+        }
+    }
+}