--------------------- PatchSet 4746 Date: 2007/06/18 20:58:46 Author: rousskov Branch: squid3-icap Tag: (none) Log: When connect() times out, throw an exception instead of calling mustStop() because we can bypass the former and not the latter. We cannot bypass mustStop because the code may use it for legitimate stopping conditions. Eventually, we may want to have two kinds of exceptions: bypassable and fatal. Members: src/ICAP/ICAPXaction.cc:1.1.2.22->1.1.2.23 Index: squid3/src/ICAP/ICAPXaction.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ICAP/ICAPXaction.cc,v retrieving revision 1.1.2.22 retrieving revision 1.1.2.23 diff -u -r1.1.2.22 -r1.1.2.23 --- squid3/src/ICAP/ICAPXaction.cc 1 Jun 2007 21:34:33 -0000 1.1.2.22 +++ squid3/src/ICAP/ICAPXaction.cc 18 Jun 2007 20:58:46 -0000 1.1.2.23 @@ -261,7 +261,7 @@ debugs(93, 0, HERE << "\tfor " << mb.content()); } - mustStop("connection with ICAP service timed out"); + throw TexcHere("timed out while connecting to the ICAP service"); } // unexpected connection close while talking to the ICAP service