Handle a socket disconnect before a message has been fully received

Author: davidiw

src/qhttpconnection.cpp

@@ -33,6 +33,7 @@ QHttpConnection::QHttpConnection(QTcpSocket *socket, QObject *parent)
     : QObject(parent)
     , m_socket(socket)
     , m_parser(0)
+    , m_request(0)
 {
     qDebug() << "Got new connection" << socket->peerAddress() << socket->peerPort();
 
@@ -50,7 +51,7 @@ QHttpConnection::QHttpConnection(QTcpSocket *socket, QObject *parent)
     m_parser->data = this;
 
     connect(socket, SIGNAL(readyRead()), this, SLOT(parseRequest()));
-    connect(socket, SIGNAL(disconnected()), this, SLOT(deleteLater()));
+    connect(socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
 }
 
 QHttpConnection::~QHttpConnection()
@@ -62,6 +63,19 @@ QHttpConnection::~QHttpConnection()
     m_parser = 0;
 }
 
+void QHttpConnection::socketDisconnected()
+{
+    if(m_request) {
+        if(m_request->successful()) {
+          return;
+        }
+        m_request->setSuccessful(false);
+        emit m_request->end();
+    }
+
+    deleteLater();
+}
+
 void QHttpConnection::parseRequest()
 {
     Q_ASSERT(m_parser);
@@ -144,6 +158,7 @@ int QHttpConnection::HeadersComplete(http_parser *parser)
     if( parser->http_major < 1 || parser->http_minor < 1 )
         response->m_keepAlive = false;
 
+    connect(theConnection, SIGNAL(destroyed()), response, SLOT(connectionClosed()));
     connect(response, SIGNAL(done()), theConnection, SLOT(responseDone()));
 
     // we are good to go!
@@ -157,6 +172,7 @@ int QHttpConnection::MessageComplete(http_parser *parser)
     QHttpConnection *theConnection = (QHttpConnection *)parser->data;
     Q_ASSERT(theConnection->m_request);
 
+    theConnection->m_request->setSuccessful(true);
     emit theConnection->m_request->end();
     return 0;
 }

src/qhttpconnection.h

@@ -52,6 +52,7 @@ class QHttpConnection : public QObject
 private slots:
     void parseRequest();
     void responseDone();
+    void socketDisconnected();
 
 private:
     static int MessageBegin(http_parser *parser);

src/qhttprequest.cpp

@@ -28,6 +28,7 @@ QHttpRequest::QHttpRequest(QHttpConnection *connection, QObject *parent)
     : QObject(parent)
     , m_connection(connection)
     , m_url("http://localhost/")
+    , m_success(false)
 {
 }
 

src/qhttprequest.h

@@ -35,6 +35,8 @@ class QHttpConnection;
 
 typedef QHash<QString, QString> HeaderHash;
 
+/* Request Methods */
+
 /*! \class QHttpRequest
  *
  * The QHttpRequest class represents the header and data
@@ -169,6 +171,29 @@ class QHttpRequest : public QObject
      */
     quint16 remotePort() const { return m_remotePort; };
 
+    /*!
+     * Post data
+     */
+    const QByteArray &body() const { return m_body; }
+
+    /*!
+     * Set immediately before end has been emitted,
+     * stating whether the message was properly received.
+     * Defaults to false untiil the message has completed.
+     */
+    bool successful() const { return m_success; }
+
+    /*!
+     * connect to data and store all data in a QByteArray
+     * accessible at body()
+     */
+    void storeBody()
+    {
+      connect(this, SIGNAL(data(const QByteArray &)),
+          this, SLOT(appendBody(const QByteArray &)),
+          Qt::UniqueConnection);
+    }
+
 signals:
     /*!
      * This signal is emitted whenever body data is encountered
@@ -196,6 +221,7 @@ class QHttpRequest : public QObject
     void setVersion(const QString &version) { m_version = version; }
     void setUrl(const QUrl &url) { m_url = url; }
     void setHeaders(const HeaderHash headers) { m_headers = headers; }
+    void setSuccessful(bool success) { m_succes = success; }
 
     QHttpConnection *m_connection;
     HeaderHash m_headers;
@@ -204,8 +230,16 @@ class QHttpRequest : public QObject
     QString m_version;
     QString m_remoteAddress;
     quint16 m_remotePort;
+    QByteArray m_body;
+    bool m_succes;
 
     friend class QHttpConnection;
+
+    private slots:
+      void appendBody(const QByteArray &body)
+      {
+        m_body.append(body);
+      }
 };
 
 #endif

src/qhttpresponse.cpp

@@ -39,6 +39,7 @@ QHttpResponse::QHttpResponse(QHttpConnection *connection)
     , m_keepAlive(true)
     , m_last(false)
     , m_useChunkedEncoding(false)
+    , m_finished(false)
 {
 }
 
@@ -48,11 +49,19 @@ QHttpResponse::~QHttpResponse()
 
 void QHttpResponse::setHeader(const QString &field, const QString &value)
 {
+    if(m_finished) {
+      return;
+    }
+
     m_headers[field] = value;
 }
 
 void QHttpResponse::writeHeader(const char *field, const QString &value)
 {
+    if(m_finished) {
+      return;
+    }
+
     m_connection->write(field);
     m_connection->write(": ");
     m_connection->write(value.toUtf8());
@@ -61,6 +70,10 @@ void QHttpResponse::writeHeader(const char *field, const QString &value)
 
 void QHttpResponse::writeHeaders()
 {
+    if(m_finished) {
+      return;
+    }
+
     foreach(QString name, m_headers.keys())
     {
         QString value = m_headers[name];
@@ -121,6 +134,10 @@ void QHttpResponse::writeHeaders()
 
 void QHttpResponse::writeHead(int status)
 {
+    if(m_finished) {
+      return;
+    }
+
     if( m_headerWritten ) return;
 
     m_connection->write(QString("HTTP/1.1 %1 %2\r\n").arg(status).arg(STATUS_CODES[status]).toAscii());
@@ -133,6 +150,10 @@ void QHttpResponse::writeHead(int status)
 
 void QHttpResponse::write(const QByteArray &data)
 {
+    if(m_finished) {
+      return;
+    }
+
     if( !m_headerWritten )
     {
         qDebug() << "You MUST call writeHead() before writing body data";
@@ -144,14 +165,29 @@ void QHttpResponse::write(const QByteArray &data)
 
 void QHttpResponse::write(const QString &data)
 {
+    if(m_finished) {
+      return;
+    }
+
     m_connection->write(data.toUtf8());
 }
 
 void QHttpResponse::end(const QString &data)
 {
+    if(m_finished) {
+      return;
+    }
+    m_finished = true;
+
     write(data);
 
     emit done();
     deleteLater();
     // TODO: end connection and delete ourselves
 }
+
+void QHttpResponse::connectionClosed()
+{
+  m_finished = true;
+  deleteLater();
+}

src/qhttpresponse.h

@@ -108,7 +108,6 @@ public slots:
     void writeHeaders();
     void writeHeader(const char *field, const QString &value);
 
-private:
     QHttpConnection *m_connection;
 
     bool m_headerWritten;
@@ -122,6 +121,11 @@ public slots:
     bool m_keepAlive;
     bool m_last;
     bool m_useChunkedEncoding;
+    bool m_finished;
+
+private slots:
+    void connectionClosed();
+
 };
 
 #endif