------------------------------------------------------------
revno: 12506
revision-id: squid3@treenet.co.nz-20130301100457-pa60ly90ytxbgoio
parent: squid3@treenet.co.nz-20130301100412-8cb31rfgaqgmhg9q
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Fri 2013-03-01 03:04:57 -0700
message:
  Docs: document ConnOpener::swanSong() better
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130301100457-pa60ly90ytxbgoio
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 49d8c9d6315edc0b15e56ededb9d34233ac07758
# timestamp: 2013-03-01 10:05:39 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20130301100412-\
#   8cb31rfgaqgmhg9q
# 
# Begin patch
=== modified file 'src/comm/ConnOpener.cc'
--- src/comm/ConnOpener.cc	2013-02-03 14:03:29 +0000
+++ src/comm/ConnOpener.cc	2013-03-01 10:04:57 +0000
@@ -67,9 +67,11 @@
         sendAnswer(COMM_ERR_CONNECT, 0, "Comm::ConnOpener::swanSong");
     }
 
+    // did we abort with a temporary FD assigned?
     if (temporaryFd_ >= 0)
         closeFd();
 
+    // did we abort while waiting between retries?
     if (calls_.sleep_)
         cancelSleep();
 
@@ -120,6 +122,7 @@
         if (callback_->canceled()) {
             debugs(5, 4, conn_ << " not calling canceled " << *callback_ <<
                    " [" << callback_->id << ']' );
+            // TODO save the pconn to the pconnPool ?
         } else {
             typedef CommConnectCbParams Params;
             Params &params = GetCommParams<Params>(callback_);