From 95e78ad24b73f0e5772dff2c685e4f5517b6decf Mon Sep 17 00:00:00 2001
From: "craig.p.drummond" <craig.p.drummond@gmail.com>
Date: Mon, 30 Dec 2013 10:29:05 +0000
Subject: [PATCH] Fix truncated files served from internal HTTP server. BUG:
 368

---
 ChangeLog           | 1 +
 http/httpsocket.cpp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index cee67b441..8828e2e06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@
 4. Improve error message if 'playlist_directory' does not exist.
 5. If icon theme does not have network-server, then use audio file icon for
    HTTP server settings page.
+6. Fix truncated files served from internal HTTP server.
 
 1.2.1
 -----
diff --git a/http/httpsocket.cpp b/http/httpsocket.cpp
index c2f6e40b7..c8065bbe8 100644
--- a/http/httpsocket.cpp
+++ b/http/httpsocket.cpp
@@ -340,6 +340,7 @@ void HttpSocket::readClient()
             qint32 readBytesTo=0;
             getRange(params, readBytesFrom, readBytesTo);
 
+            DBUG << "readBytesFrom" << readBytesFrom << "readBytesTo" << readBytesTo;
             if (q.hasQueryItem("cantata")) {
                 Song song=HttpServer::self()->decodeUrl(url);
 
@@ -446,7 +447,7 @@ void HttpSocket::readClient()
                                 if (!write(socket, buffer, bytesRead, stop) || f.atEnd()) {
                                     break;
                                 }
-                            } while ((readPos+bytesRead)<totalBytes && !stop && !terminated);
+                            } while (readPos<totalBytes && !stop && !terminated);
                         }
                     }
                 }