From 9cf37f53642ee2ea928489fadcfe896bfdeb4f05 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sat, 1 Oct 2011 17:16:01 +0300 Subject: [PATCH] BUGFIX: Fix torrent upload issues (Web UI) --- Changelog | 1 + src/webui/httpconnection.cpp | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 9ab291acc..248479331 100644 --- a/Changelog +++ b/Changelog @@ -9,6 +9,7 @@ - BUGFIX: Reduce CPU usage when running Web UI - BUGFIX: Save RSS items to disk regularly for safety - BUGFIX: Fix ratio calculation (use all_time_download) + - BUGFIX: Fix torrent upload issues (Web UI) - COSMETIC: Display speed at the beginning of the Window title - COSMETIC: Several cosmetic fixes to the Web UI - COSMETIC: Make top toolbar follow system style diff --git a/src/webui/httpconnection.cpp b/src/webui/httpconnection.cpp index ca642655a..2f6dc7495 100644 --- a/src/webui/httpconnection.cpp +++ b/src/webui/httpconnection.cpp @@ -78,19 +78,31 @@ void HttpConnection::handleDownloadFailure(const QString& url, } void HttpConnection::read() { - const QByteArray input = m_socket->readAll(); + static QByteArray input; + + input.append(m_socket->readAll()); if(input.size() > 100000) { qDebug("Request too big"); m_generator.setStatusLine(400, "Bad Request"); write(); return; } + + if (!input.endsWith("\r\n\r\n")) { + // incomplete, let wait for more data + qDebug() << Q_FUNC_INFO << "Incomplete HTTP request, let's wait for more data..."; + return; + } + + // HTTP Request is complete, let's parse it m_parser.write(input); + input.clear(); + if(m_parser.isError()) { m_generator.setStatusLine(400, "Bad Request"); write(); } else { - respond(); + respond(); } }