Bump version to v2.9.7

(cherry picked from commit 30a3110ca7)

Changelog

@@ -1,3 +1,6 @@
+* Sun Mar 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.7
+    - BUGFIX: Fix important HTTP request parsing bug (Web UI)
+
 * Sat Mar 17 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.6
     - BUGFIX: Fix download first/last pieces state reporting
     - BUGFIX: Fix name of progress column in torrent content panel

qbittorrent.pro

@@ -11,6 +11,8 @@ dist.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.git &&
 dist.commands += rm -f ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.gitignore &&
 dist.commands += cd .. &&
 dist.commands += tar czf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar.gz $${PROJECT_NAME}-$${PROJECT_VERSION} &&
+dist.commands += tar cf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar $${PROJECT_NAME}-$${PROJECT_VERSION} &&
+dist.commands += xz -f $${PROJECT_NAME}-$${PROJECT_VERSION}.tar &&
 dist.commands += rm -fR $${PROJECT_NAME}-$${PROJECT_VERSION}
 
 QMAKE_EXTRA_TARGETS += dist

src/Info.plist

@@ -47,7 +47,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.9.6</string>
+	<string>2.9.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>

src/webui/httpconnection.cpp

@@ -84,6 +84,7 @@ void HttpConnection::read() {
   // Parse HTTP request header
   int header_end = input.indexOf("\r\n\r\n");
   if (header_end < 0) {
+    qDebug() << "Partial request: \n" << input;
     // Partial request waiting for the rest
     return;
   }
@@ -101,7 +102,6 @@ void HttpConnection::read() {
   if (m_parser.header().hasContentLength())  {
     const int expected_length = m_parser.header().contentLength();
     QByteArray message = input.mid(header_end + 4, expected_length);
-    input = input.mid(header_end + 4 + expected_length);
 
     if (expected_length > 100000) {
       qWarning() << "Bad request: message too long";
@@ -113,10 +113,13 @@ void HttpConnection::read() {
 
     if (message.length() < expected_length) {
       // Message too short, waiting for the rest
+      qDebug() << "Partial message:\n" << message;
       return;
     }
 
     m_parser.writeMessage(message);
+
+    input = input.mid(header_end + 4 + expected_length);
   } else {
     input.clear();
   }

version.pri

@@ -1,5 +1,5 @@
 PROJECT_NAME = qbittorrent
-PROJECT_VERSION = 2.9.6
+PROJECT_VERSION = 2.9.7
 
 os2 {
     DEFINES += VERSION=\'\"v$${PROJECT_VERSION}\"\'
@@ -9,4 +9,4 @@ os2 {
 
 DEFINES += VERSION_MAJOR=2
 DEFINES += VERSION_MINOR=9
-DEFINES += VERSION_BUGFIX=6
+DEFINES += VERSION_BUGFIX=7