------------------------------------------------------------ revno: 13999 revision-id: chtsanti@users.sourceforge.net-20160229200651-tmdlq21xvhql4fqr parent: chtsanti@users.sourceforge.net-20160229192049-dtzrg5h9iwuyj61j committer: Christos Tsantilas branch nick: 3.5 timestamp: Mon 2016-02-29 22:06:51 +0200 message: Bug 4447:FwdState.cc:447 "serverConnection() == conn" assertion, part2 Fix to allow make check work again. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chtsanti@users.sourceforge.net-20160229200651-\ # tmdlq21xvhql4fqr # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: 6f0a5c69f777f26ff2e42218b55cfdc63856492d # timestamp: 2016-02-29 20:50:58 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: chtsanti@users.sourceforge.net-20160229192049-\ # dtzrg5h9iwuyj61j # # Begin patch === modified file 'src/tests/stub_comm.cc' --- src/tests/stub_comm.cc 2016-01-01 00:14:27 +0000 +++ src/tests/stub_comm.cc 2016-02-29 20:06:51 +0000 @@ -57,7 +57,7 @@ int ignoreErrno(int ierrno) STUB_RETVAL(-1) void commCloseAllSockets(void) STUB void checkTimeouts(void) STUB -void comm_add_close_handler(int fd, CLCB *, void *) STUB +AsyncCall::Pointer comm_add_close_handler(int fd, CLCB *, void *) STUB void comm_add_close_handler(int fd, AsyncCall::Pointer &) STUB void comm_remove_close_handler(int fd, CLCB *, void *) STUB void comm_remove_close_handler(int fd, AsyncCall::Pointer &)STUB