boostification of req session finished signal

src/cpp/proxy/engine.cpp

@@ -92,6 +92,7 @@ class Engine::Private : public QObject
 	struct RequestSessionConnections {
 		Connection inspectedConnection;
 		Connection inspectErrorConnection;
+		Connection finishedConnection;
 		Connection finishedByAcceptConnection;
 	};
 
@@ -450,6 +451,7 @@ class Engine::Private : public QObject
 
 		// proxysession will take it from here
 		// TODO: use callbacks for performance
+		reqSessionConnectionMap.erase(rs);
 		rs->disconnect(this);
 
 		ps->add(rs);
@@ -612,10 +614,10 @@ class Engine::Private : public QObject
 		rs->setAutoShare(autoShare);
 
 		// TODO: use callbacks for performance
-		connect(rs, &RequestSession::finished, this, &Private::rs_finished);
 		reqSessionConnectionMap[rs] = {
 			rs->inspected.connect(boost::bind(&Private::rs_inspected, this, boost::placeholders::_1, rs)),
 			rs->inspectError.connect(boost::bind(&Private::rs_inspectError, this, rs)),
+			rs->finished.connect(boost::bind(&Private::rs_finished, this, rs)),
 			rs->finishedByAccept.connect(boost::bind(&Private::rs_finishedByAccept, this, rs))
 		};
 
@@ -760,11 +762,8 @@ class Engine::Private : public QObject
 		doProxy(rs, &idata);
 	}
 
-private slots:
-	void rs_finished()
+	void rs_finished(RequestSession *rs)
 	{
-		RequestSession *rs = (RequestSession *)sender();
-
 		if(!rs->isSockJs())
 			logFinished(rs);
 
@@ -775,7 +774,6 @@ private slots:
 		tryTakeNext();
 	}
 
-private:
 	void rs_finishedByAccept(RequestSession *rs)
 	{
 		logFinished(rs, true);

src/cpp/proxy/proxysession.cpp

@@ -109,6 +109,7 @@ class ProxySession::Private : public QObject
 		Connection bytesWrittenConnection;
 		Connection errorRespondingConnection;
 		Connection pausedConnection;
+		Connection finishedConnection;
 		Connection headerBytesSentConnection;
 		Connection bodyBytesSentConnection;
 	};
@@ -254,11 +255,11 @@ class ProxySession::Private : public QObject
 
 		sessionItems += si;
 		sessionItemsBySession.insert(rs, si);
-		connect(rs, &RequestSession::finished, this, &Private::rs_finished);
 		reqSessionConnectionMap[rs] = {
 			rs->bytesWritten.connect(boost::bind(&Private::rs_bytesWritten, this, boost::placeholders::_1, rs)),
 			rs->errorResponding.connect(boost::bind(&Private::rs_errorResponding, this, rs)),
 			rs->paused.connect(boost::bind(&Private::rs_paused, this, rs)),
+			rs->finished.connect(boost::bind(&Private::rs_finished, this, rs)),
 			rs->headerBytesSent.connect(boost::bind(&Private::rs_headerBytesSent, this, boost::placeholders::_1, rs)),
 			rs->bodyBytesSent.connect(boost::bind(&Private::rs_bodyBytesSent, this, boost::placeholders::_1, rs))
 		};
@@ -1189,7 +1190,6 @@ class ProxySession::Private : public QObject
 		}
 	}
 
-public slots:
 	void rs_bytesWritten(int count, RequestSession *rs)
 	{
 		log_debug("proxysession: %p response bytes written id=%s: %d", q, rs->rid().second.data(), count);
@@ -1207,10 +1207,8 @@ public slots:
 			tryResponseRead();
 	}
 
-	void rs_finished()
+	void rs_finished(RequestSession *rs)
 	{
-		RequestSession *rs = (RequestSession *)sender();
-
 		log_debug("proxysession: %p response finished id=%s", q, rs->rid().second.data());
 
 		SessionItem *si = sessionItemsBySession.value(rs);
@@ -1386,7 +1384,6 @@ public slots:
 			incCounter(Stats::ClientContentBytesSent, count);
 	}
 
-public:
 	void acceptRequest_finished()
 	{
 		if(acceptRequest->success())

src/cpp/proxy/requestsession.cpp

@@ -827,7 +827,7 @@ class RequestSession::Private : public QObject
 		if(zhttpRequest->isFinished())
 		{
 			cleanup();
-			emit q->finished();
+			q->finished();
 		}
 	}
 
@@ -877,7 +877,7 @@ class RequestSession::Private : public QObject
 	{
 		log_debug("requestsession: request error id=%s", rid.second.data());
 		cleanup();
-		emit q->finished();
+		q->finished();
 	}
 
 	void inspectRequest_finished()

src/cpp/proxy/requestsession.h

@@ -116,9 +116,7 @@ class RequestSession : public QObject
 	//   methods. the object remains in an active state though, and so you
 	//   should still wait for finished()
 	Signal errorResponding;
-
-signals:
-	void finished();
+	Signal finished;
 
 private:
 	class Private;