Refactor Security::BlindPeerConnector constructor (#1511)

Avoid having to include HttpRequest.h in
BlindPeerConnector.h by moving the
definition of the constructor to the .cc file

diff --git a/src/security/BlindPeerConnector.cc b/src/security/BlindPeerConnector.cc
index 7372df96083a2a0e72d0ecdbb06cf2e5ebb9df51..1811ae96f68ae15a73b5131715dfb570c467f810 100644 (file)
--- a/src/security/BlindPeerConnector.cc
+++ b/src/security/BlindPeerConnector.cc
@@ -86,3 +86,13 @@ Security::BlindPeerConnector::noteNegotiationDone(ErrorState *error)
     }
 }
 
+Security::BlindPeerConnector::BlindPeerConnector(HttpRequestPointer &aRequest,
+        const Comm::ConnectionPointer &aServerConn,
+        const AsyncCallback<EncryptorAnswer> &aCallback,
+        const AccessLogEntryPointer &alp,
+        time_t timeout) :
+    AsyncJob("Security::BlindPeerConnector"),
+    Security::PeerConnector(aServerConn, aCallback, alp, timeout)
+{
+    request = aRequest;
+}

diff --git a/src/security/BlindPeerConnector.h b/src/security/BlindPeerConnector.h
index 62e19c77f519cfa9edc737cb407a1e5b41ccaa42..0001579c7bf5eb0c1c312693deb64cbc3f5eacc6 100644 (file)
--- a/src/security/BlindPeerConnector.h
+++ b/src/security/BlindPeerConnector.h
@@ -10,7 +10,6 @@
 #define SQUID_SRC_SECURITY_BLINDPEERCONNECTOR_H
 
 #include "http/forward.h"
-#include "HttpRequest.h"
 #include "security/PeerConnector.h"
 
 class ErrorState;
@@ -26,12 +25,7 @@ public:
                        const Comm::ConnectionPointer &aServerConn,
                        const AsyncCallback<EncryptorAnswer> &aCallback,
                        const AccessLogEntryPointer &alp,
-                       const time_t timeout = 0) :
-        AsyncJob("Security::BlindPeerConnector"),
-        Security::PeerConnector(aServerConn, aCallback, alp, timeout)
-    {
-        request = aRequest;
-    }
+                       time_t timeout = 0);
 
     /* Security::PeerConnector API */
 

diff --git a/src/tests/stub_libsecurity.cc b/src/tests/stub_libsecurity.cc
index 553253612d0a3c732af4292bcf84c43d565030fc..e6871e0296c8fb73cb740482c3dd66ae791d746c 100644 (file)
--- a/src/tests/stub_libsecurity.cc
+++ b/src/tests/stub_libsecurity.cc
@@ -18,6 +18,14 @@
 CBDATA_NAMESPACED_CLASS_INIT(Security, BlindPeerConnector);
 namespace Security
 {
+BlindPeerConnector::BlindPeerConnector(HttpRequestPointer &, const Comm::ConnectionPointer & aServerConn,
+                                       const AsyncCallback<EncryptorAnswer> & aCallback,
+                                       const AccessLogEntryPointer &alp,
+                                       time_t) :
+    AsyncJob("Security::BlindPeerConnector"),
+    Security::PeerConnector(aServerConn, aCallback, alp, 0)
+{STUB_NOP}
+
 bool BlindPeerConnector::initialize(Security::SessionPointer &) STUB_RETVAL(false)
 Security::ContextPointer BlindPeerConnector::getTlsContext() STUB_RETVAL(Security::ContextPointer())
 void BlindPeerConnector::noteNegotiationDone(ErrorState *) STUB