------------------------------------------------------------ revno: 13509 revision-id: chtsanti@users.sourceforge.net-20140723132805-ihsh3m62odngsheg parent: squid3@treenet.co.nz-20140723125155-ecxtpv6h21n7qnup committer: Christos Tsantilas branch nick: trunk timestamp: Wed 2014-07-23 16:28:05 +0300 message: Fix tcp outgoing tos bugs part2 Fix for the patch r13505, "Fix tcp outgoing tos bugs": The Connection::fd member of a non openned connection used inside Comm::ConnOpener::createFd member, causing crashes to squid ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chtsanti@users.sourceforge.net-20140723132805-\ # ihsh3m62odngsheg # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 278df992a6968ebe891e578fd3e0b08096a8cad2 # timestamp: 2014-07-23 13:54:14 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20140723125155-\ # ecxtpv6h21n7qnup # # Begin patch === modified file 'src/comm/ConnOpener.cc' --- src/comm/ConnOpener.cc 2014-07-22 00:14:36 +0000 +++ src/comm/ConnOpener.cc 2014-07-23 13:28:05 +0000 @@ -271,8 +271,8 @@ conn_->nfmark = 0; #endif - fd_table[conn_->fd].tosToServer = conn_->tos; - fd_table[conn_->fd].nfmarkToServer = conn_->nfmark; + fd_table[temporaryFd_].tosToServer = conn_->tos; + fd_table[temporaryFd_].nfmarkToServer = conn_->nfmark; typedef CommCbMemFunT abortDialer; calls_.earlyAbort_ = JobCallback(5, 4, abortDialer, this, Comm::ConnOpener::earlyAbort);