--------------------- PatchSet 3465 Date: 2001/12/10 22:24:44 Author: jkay Branch: push Tag: (none) Log: Made numbers of storeLock() and storeUnlock() calls on PUT entry match in new-squid environment. Members: src/put.c:1.1.2.2->1.1.2.3 Index: squid/src/put.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/Attic/put.c,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid/src/put.c 7 Dec 2001 23:25:32 -0000 1.1.2.2 +++ squid/src/put.c 10 Dec 2001 22:24:44 -0000 1.1.2.3 @@ -1,5 +1,5 @@ /* - * $Id: put.c,v 1.1.2.2 2001/12/07 23:25:32 jkay Exp $ + * $Id: put.c,v 1.1.2.3 2001/12/10 22:24:44 jkay Exp $ * * DEBUG: section 81 PUT transmission and reception * AUTHOR: Jon Kay, 1997 @@ -129,7 +129,7 @@ /* fwdpush support */ if (http->log_type == LOG_TCP_PUT) { for (p = DistAllPeers; p; p = p->fwdpush) { -#if USE_ICPDATA +#if USE_ICP_DATA if (p->options.icpdata) { putSend(entry, &p->in_addr, NULL, NULL, P_ICPDATA, p->icp_data_q); } @@ -141,7 +141,7 @@ sin.sin_addr = p->in_addr.sin_addr; sin.sin_port = p->http_port; putSend(entry, &sin, NULL, NULL, 0); -#if USE_ICPDATA +#if USE_ICP_DATA } #endif } @@ -213,7 +213,7 @@ putReply(fd, entry); httpStateFree(fd, httpState); assert(entry->lock_count >= 1); - storeUnlockObject(entry); + /* Last unlock will be from httpRequestFree */ } static void @@ -283,7 +283,7 @@ p->entry = entry; p->handler = handler; p->arg = arg; -#if USE_ICPDATA +#if USE_ICP_DATA if (flags & P_ICPDATA) { p->fd = comm_virtual_fd(); p->q = q;