------------------------------------------------------------ revno: 12628 revision-id: squid3@treenet.co.nz-20130929174716-pfqomyh6b0kkix8c parent: squid3@treenet.co.nz-20130929172800-vp3ul70gff41j4nj committer: Amos Jeffries branch nick: 3.3 timestamp: Sun 2013-09-29 11:47:16 -0600 message: Fix pinning hierarchy log information ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20130929174716-pfqomyh6b0kkix8c # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: 2e78540a63290e5ec7ab8b6b013ec48b6a78237f # timestamp: 2013-09-29 17:55:06 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20130929172800-\ # vp3ul70gff41j4nj # # Begin patch === modified file 'src/forward.cc' --- src/forward.cc 2013-09-29 17:28:00 +0000 +++ src/forward.cc 2013-09-29 17:47:16 +0000 @@ -983,6 +983,7 @@ #endif ++n_tries; request->flags.pinned = 1; + request->hier.note(serverConn, pinned_connection->pinning.host); if (pinned_connection->pinnedAuth()) request->flags.auth = 1; comm_add_close_handler(serverConn->fd, fwdServerClosedWrapper, this);