------------------------------------------------------------ revno: 13125 revision-id: squid3@treenet.co.nz-20140423051549-dup5fwxvyxv9fiw7 parent: squid3@treenet.co.nz-20140423050922-3a28qb0gbb3wcz0g committer: Amos Jeffries branch nick: 3.4 timestamp: Tue 2014-04-22 22:15:49 -0700 message: Fix outgoing peer type when using ORIGINAL_DST instead of DIRECT ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20140423051549-dup5fwxvyxv9fiw7 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # testament_sha1: e9d6e52b5a79552676f760fbd393ea4b191719dd # timestamp: 2014-04-23 05:27:22 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # base_revision_id: squid3@treenet.co.nz-20140423050922-\ # 3a28qb0gbb3wcz0g # # Begin patch === modified file 'src/peer_select.cc' --- src/peer_select.cc 2014-02-02 02:47:38 +0000 +++ src/peer_select.cc 2014-04-23 05:15:49 +0000 @@ -242,7 +242,7 @@ // construct a "result" adding the ORIGINAL_DST to the set instead of DIRECT Comm::ConnectionPointer p = new Comm::Connection(); p->remote = req->clientConnectionManager->clientConnection->local; - p->peerType = fs->code; + p->peerType = ORIGINAL_DST; // fs->code is DIRECT. This fixes the display. p->setPeer(fs->_peer); // check for a configured outgoing address for this destination...