Explicitely manage HTTPManager lifetime

assignment-client/src/octree/OctreeServer.cpp

@@ -233,7 +233,6 @@ OctreeServer::OctreeServer(ReceivedMessage& message) :
     _argc(0),
     _argv(NULL),
     _parsedArgV(NULL),
-    _httpManager(NULL),
     _statusPort(0),
     _packetsPerClientPerInterval(10),
     _packetsTotalPerInterval(DEFAULT_PACKETS_PER_INTERVAL),
@@ -285,7 +284,7 @@ void OctreeServer::initHTTPManager(int port) {
     QString documentRoot = QString("%1/web").arg(PathUtils::getAppDataPath());
 
     // setup an httpManager with us as the request handler and the parent
-    _httpManager = new HTTPManager(QHostAddress::AnyIPv4, port, documentRoot, this, this);
+    _httpManager.reset(new HTTPManager(QHostAddress::AnyIPv4, port, documentRoot, this));
 }
 
 bool OctreeServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url, bool skipSubHandler) {

assignment-client/src/octree/OctreeServer.h

@@ -183,7 +183,7 @@ protected:
 
     bool _isShuttingDown = false;
 
-    HTTPManager* _httpManager;
+    std::unique_ptr<HTTPManager> _httpManager;
     int _statusPort;
     QString _statusHost;
 

domain-server/src/DomainServer.cpp

@@ -149,7 +149,6 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     QCoreApplication(argc, argv),
     _gatekeeper(this),
     _httpManager(QHostAddress::AnyIPv4, DOMAIN_SERVER_HTTP_PORT, QString("%1/resources/web/").arg(QCoreApplication::applicationDirPath()), this),
-    _httpsManager(NULL),
     _allAssignments(),
     _unfulfilledAssignments(),
     _isUsingDTLS(false),
@@ -439,7 +438,7 @@ bool DomainServer::optionallyReadX509KeyAndCertificate() {
         QSslCertificate sslCertificate(&certFile);
         QSslKey privateKey(&keyFile, QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey, keyPassphraseString.toUtf8());
 
-        _httpsManager = new HTTPSManager(QHostAddress::AnyIPv4, DOMAIN_SERVER_HTTPS_PORT, sslCertificate, privateKey, QString(), this, this);
+        _httpsManager.reset(new HTTPSManager(QHostAddress::AnyIPv4, DOMAIN_SERVER_HTTPS_PORT, sslCertificate, privateKey, QString(), this));
 
         qDebug() << "TCP server listening for HTTPS connections on" << DOMAIN_SERVER_HTTPS_PORT;
 

domain-server/src/DomainServer.h

@@ -220,7 +220,7 @@ private:
     DomainGatekeeper _gatekeeper;
 
     HTTPManager _httpManager;
-    HTTPSManager* _httpsManager;
+    std::unique_ptr<HTTPSManager> _httpsManager;
 
     QHash<QUuid, SharedAssignmentPointer> _allAssignments;
     QQueue<SharedAssignmentPointer> _unfulfilledAssignments;

libraries/embedded-webserver/src/HTTPConnection.cpp

@@ -33,7 +33,6 @@ HTTPConnection::HTTPConnection (QTcpSocket* socket, HTTPManager* parentManager)
     QObject(parentManager),
     _parentManager(parentManager),
     _socket(socket),
-    _stream(socket),
     _address(socket->peerAddress())
 {
     // take over ownership of the socket

libraries/embedded-webserver/src/HTTPConnection.h

@@ -113,9 +113,6 @@ protected:
     /// The underlying socket.
     QTcpSocket* _socket;
 
-    /// The data stream for writing to the socket.
-    QDataStream _stream;
-
     /// The stored address.
     QHostAddress _address;
 

libraries/embedded-webserver/src/HTTPManager.cpp

@@ -24,8 +24,7 @@
 const int SOCKET_ERROR_EXIT_CODE = 2;
 const int SOCKET_CHECK_INTERVAL_IN_MS = 30000;
 
-HTTPManager::HTTPManager(const QHostAddress& listenAddress, quint16 port, const QString& documentRoot, HTTPRequestHandler* requestHandler, QObject* parent) :
+HTTPManager::HTTPManager(const QHostAddress& listenAddress, quint16 port, const QString& documentRoot, HTTPRequestHandler* requestHandler) :
-    QTcpServer(parent),
     _listenAddress(listenAddress),
     _documentRoot(documentRoot),
     _requestHandler(requestHandler),

libraries/embedded-webserver/src/HTTPManager.h

@@ -33,7 +33,7 @@ class HTTPManager : public QTcpServer, public HTTPRequestHandler {
    Q_OBJECT
 public:
     /// Initializes the manager.
-    HTTPManager(const QHostAddress& listenAddress, quint16 port, const QString& documentRoot, HTTPRequestHandler* requestHandler = NULL, QObject* parent = 0);
+    HTTPManager(const QHostAddress& listenAddress, quint16 port, const QString& documentRoot, HTTPRequestHandler* requestHandler = NULL);
     
     bool handleHTTPRequest(HTTPConnection* connection, const QUrl& url, bool skipSubHandler = false) override;
 

libraries/embedded-webserver/src/HTTPSManager.cpp

@@ -16,8 +16,8 @@
 #include "HTTPSConnection.h"
 
 HTTPSManager::HTTPSManager(QHostAddress listenAddress, quint16 port, const QSslCertificate& certificate, const QSslKey& privateKey,
-                           const QString& documentRoot, HTTPSRequestHandler* requestHandler, QObject* parent) :
+                           const QString& documentRoot, HTTPSRequestHandler* requestHandler) :
-    HTTPManager(listenAddress, port, documentRoot, requestHandler, parent),
+    HTTPManager(listenAddress, port, documentRoot, requestHandler),
     _certificate(certificate),
     _privateKey(privateKey),
     _sslRequestHandler(requestHandler)

libraries/embedded-webserver/src/HTTPSManager.h

@@ -31,7 +31,7 @@ public:
                  const QSslCertificate& certificate,
                  const QSslKey& privateKey,
                  const QString& documentRoot,
-                 HTTPSRequestHandler* requestHandler = NULL, QObject* parent = 0);
+                 HTTPSRequestHandler* requestHandler = NULL);
     
     void setCertificate(const QSslCertificate& certificate) { _certificate = certificate; }
     void setPrivateKey(const QSslKey& privateKey) { _privateKey = privateKey; }