------------------------------------------------------------
revno: 13633
revision-id: chtsanti@users.sourceforge.net-20141008081049-68uou0f9kqquo6cz
parent: chtsanti@users.sourceforge.net-20141007172633-4775d212ulc32yes
committer: Christos Tsantilas <chtsanti@users.sourceforge.net>
branch nick: trunk
timestamp: Wed 2014-10-08 11:10:49 +0300
message:
  Validate server certificates without bumping: fix 'make distcheck' error
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chtsanti@users.sourceforge.net-20141008081049-\
#   68uou0f9kqquo6cz
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: fa220006c109f0d5c5e4bd9ea57c36d7b103873c
# timestamp: 2014-10-08 08:51:00 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk
# base_revision_id: chtsanti@users.sourceforge.net-20141007172633-\
#   4775d212ulc32yes
# 
# Begin patch
=== modified file 'src/tests/stub_tunnel.cc'
--- src/tests/stub_tunnel.cc	2014-09-12 23:00:48 +0000
+++ src/tests/stub_tunnel.cc	2014-10-08 08:10:49 +0000
@@ -16,5 +16,5 @@
 
 void tunnelStart(ClientHttpRequest *, int64_t *, int *, const AccessLogEntryPointer &al) STUB
 
-void switchToTunnel(HttpRequest *request, int *status_ptr, Comm::ConnectionPointer &clientConn, Comm::ConnectionPointer &srvConn) STUB
+void switchToTunnel(HttpRequest *request, Comm::ConnectionPointer &clientConn, Comm::ConnectionPointer &srvConn) STUB