--------------------- PatchSet 7082 Date: 2005/10/09 07:05:00 Author: adri Branch: tidyup_deferred_reads Tag: (none) Log: * tweak the debugging a little * disable registering a deferred handler in the HTTP code. Members: src/http.c:1.17.6.27.4.12->1.17.6.27.4.13 src/store.c:1.16.6.7.10.5->1.16.6.7.10.6 Index: squid/src/http.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/http.c,v retrieving revision 1.17.6.27.4.12 retrieving revision 1.17.6.27.4.13 diff -u -r1.17.6.27.4.12 -r1.17.6.27.4.13 --- squid/src/http.c 7 Oct 2005 03:23:11 -0000 1.17.6.27.4.12 +++ squid/src/http.c 9 Oct 2005 07:05:00 -0000 1.17.6.27.4.13 @@ -1,6 +1,6 @@ /* - * $Id: http.c,v 1.17.6.27.4.12 2005/10/07 03:23:11 adri Exp $ + * $Id: http.c,v 1.17.6.27.4.13 2005/10/09 07:05:00 adri Exp $ * * DEBUG: section 11 Hypertext Transfer Protocol (HTTP) * AUTHOR: Harvest Derived @@ -839,7 +839,8 @@ * request bodies. */ commSetTimeout(fd, Config.Timeout.read, httpTimeout, httpState); - commSetDefer(fd, fwdCheckDeferRead, entry); + //commSetDefer(fd, fwdCheckDeferRead, entry); + commSetDefer(fd, NULL, NULL); } httpState->flags.request_sent = 1; } Index: squid/src/store.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/store.c,v retrieving revision 1.16.6.7.10.5 retrieving revision 1.16.6.7.10.6 diff -u -r1.16.6.7.10.5 -r1.16.6.7.10.6 --- squid/src/store.c 7 Oct 2005 03:23:11 -0000 1.16.6.7.10.5 +++ squid/src/store.c 9 Oct 2005 07:05:01 -0000 1.16.6.7.10.6 @@ -1,6 +1,6 @@ /* - * $Id: store.c,v 1.16.6.7.10.5 2005/10/07 03:23:11 adri Exp $ + * $Id: store.c,v 1.16.6.7.10.6 2005/10/09 07:05:01 adri Exp $ * * DEBUG: section 20 Storage Manager * AUTHOR: Harvest Derived @@ -1507,7 +1507,7 @@ if (e->mem_obj->srv.callback == NULL) return; if (cbdataValid(e->mem_obj->srv.data)) { - debug (98, 3) ("storeServerWait: wait\n"); + debug (98, 2) ("storeServerWait: wait\n"); e->mem_obj->srv.callback(e, e->mem_obj->srv.data, STKICK_WAIT); } }