github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-29 19:18:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix handling of simultaneous connections in Web UI.

Browse source 
May be related to issue #68.
This commit is contained in:
Christophe Dumez 2012-09-29 14:11:07 +03:00
parent 51aae059e3
commit 32bfd8741f
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/webui/httpconnection.cpp
View file

@ -78,21 +78,20 @@ void HttpConnection::handleDownloadFailure(const QString& url,
} }
void HttpConnection::read() { void HttpConnection::read() {
static QByteArray input; m_receivedData.append(m_socket->readAll());
input.append(m_socket->readAll());
// Parse HTTP request header // Parse HTTP request header
int header_end = input.indexOf("\r\n\r\n"); int header_end = m_receivedData.indexOf("\r\n\r\n");
if (header_end < 0) { if (header_end < 0) {
qDebug() << "Partial request: \n" << input; qDebug() << "Partial request: \n" << m_receivedData;
// Partial request waiting for the rest // Partial request waiting for the rest
return; return;
} }
QByteArray header = input.left(header_end); QByteArray header = m_receivedData.left(header_end);
m_parser.writeHeader(header); m_parser.writeHeader(header);
if (m_parser.isError()) { if (m_parser.isError()) {
qWarning() << Q_FUNC_INFO << "header parsing error"; qWarning() << Q_FUNC_INFO << "header parsing error";
input.clear(); m_receivedData.clear();
m_generator.setStatusLine(400, "Bad Request"); m_generator.setStatusLine(400, "Bad Request");
write(); write();
return; return;
@ -101,12 +100,12 @@ void HttpConnection::read() {
// Parse HTTP request message // Parse HTTP request message
if (m_parser.header().hasContentLength()) { if (m_parser.header().hasContentLength()) {
const int expected_length = m_parser.header().contentLength(); const int expected_length = m_parser.header().contentLength();
QByteArray message = input.mid(header_end + 4, expected_length); QByteArray message = m_receivedData.mid(header_end + 4, expected_length);
if (expected_length > 10000000) { if (expected_length > 10000000) {
qWarning() << "Bad request: message too long"; qWarning() << "Bad request: message too long";
m_generator.setStatusLine(400, "Bad Request"); m_generator.setStatusLine(400, "Bad Request");
input.clear(); m_receivedData.clear();
write(); write();
return; return;
} }
@ -119,9 +118,9 @@ void HttpConnection::read() {
m_parser.writeMessage(message); m_parser.writeMessage(message);
input = input.mid(header_end + 4 + expected_length); m_receivedData = m_receivedData.mid(header_end + 4 + expected_length);
} else { } else {
input.clear(); m_receivedData.clear();
} }
if (m_parser.isError()) { if (m_parser.isError()) {

1
src/webui/httpconnection.h
View file

@ -88,6 +88,7 @@ private:
HttpServer *m_httpserver; HttpServer *m_httpserver;
HttpRequestParser m_parser; HttpRequestParser m_parser;
HttpResponseGenerator m_generator; HttpResponseGenerator m_generator;
QByteArray m_receivedData;
}; };
#endif #endif