--------------------- PatchSet 1901 Date: 2005/09/29 21:39:42 Author: dwsquid Branch: squid3-icap Tag: (none) Log: astyle Members: src/ICAPXaction.cc:1.1.2.34->1.1.2.35 src/http.cc:1.49.2.33->1.49.2.34 Index: squid3/src/ICAPXaction.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/Attic/ICAPXaction.cc,v retrieving revision 1.1.2.34 retrieving revision 1.1.2.35 diff -u -r1.1.2.34 -r1.1.2.35 --- squid3/src/ICAPXaction.cc 29 Sep 2005 18:00:44 -0000 1.1.2.34 +++ squid3/src/ICAPXaction.cc 29 Sep 2005 21:39:42 -0000 1.1.2.35 @@ -188,7 +188,7 @@ &ICAPXaction_noteCommTimeout, this); closer = &ICAPXaction_noteCommClose; comm_add_close_handler(connection, closer, this); -debug(0,0)("ICAPXaction::openConnection() to %s %d\n", service->host.buf(), service->port); + debug(0,0)("ICAPXaction::openConnection() to %s %d\n", service->host.buf(), service->port); commConnectStart(connection, service->host.buf(), service->port, &ICAPXaction_noteCommConnected, this); } Index: squid3/src/http.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/http.cc,v retrieving revision 1.49.2.33 retrieving revision 1.49.2.34 diff -u -r1.49.2.33 -r1.49.2.34 --- squid3/src/http.cc 29 Sep 2005 18:00:44 -0000 1.49.2.33 +++ squid3/src/http.cc 29 Sep 2005 21:39:42 -0000 1.49.2.34 @@ -1,6 +1,6 @@ /* - * $Id: http.cc,v 1.49.2.33 2005/09/29 18:00:44 dwsquid Exp $ + * $Id: http.cc,v 1.49.2.34 2005/09/29 21:39:42 dwsquid Exp $ * * DEBUG: section 11 Hypertext Transfer Protocol (HTTP) * AUTHOR: Harvest Derived @@ -747,7 +747,7 @@ if (icap_access_check = new ICAPAccessCheck(ICAPServiceRep::respmod, ICAPServiceRep::precache, request, reply, icapAclCheckDoneWrapper, this)) { icap_access_check->check(); - icapAccessCheckPending = true; + icapAccessCheckPending = true; ctx_exit(ctx); return; } @@ -1099,11 +1099,11 @@ void HttpStateData::writeReplyBody(const char *data, int len) { -debug(0,0)("HttpStateData::writeReplyBody() called\n"); + debug(0,0)("HttpStateData::writeReplyBody() called\n"); #if ICAP_CLIENT if (icap) { -debug(0,0)("HttpStateData::writeReplyBody sending %d bytes to ICAP\n", len); + debug(0,0)("HttpStateData::writeReplyBody sending %d bytes to ICAP\n", len); icap->sendMoreData (StoreIOBuffer(len, 0, (char*)data)); return; } @@ -1127,7 +1127,8 @@ void HttpStateData::processReplyBody() { -debug(0,0)("HttpStateData::processReplyBody() called\n"); + debug(0,0)("HttpStateData::processReplyBody() called\n"); + if (!flags.headers_parsed) { flags.do_next_read = 1; maybeReadData(); @@ -1135,7 +1136,7 @@ } if (icapAccessCheckPending) - return; + return; /* * At this point the reply headers have been parsed and consumed. @@ -1988,6 +1989,7 @@ HttpStateData::icapAclCheckDone(ICAPServiceRep::Pointer service) { icapAccessCheckPending = false; + if (service == NULL) { // handle case where no service is selected; assert(false);