---------------------
PatchSet 1595 
Date: 2005/08/24 21:10:49
Author: rousskov
Branch: squid3-icap
Tag: (none) 
Log:
- Made sure writeBuf is initialized before we access hasContent().
- Polished/simplified MemBuf initializations. Use memBufDefInit().

Members: 
	src/ICAPXaction.cc:1.1.2.8->1.1.2.9 

Index: squid3/src/ICAPXaction.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Attic/ICAPXaction.cc,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- squid3/src/ICAPXaction.cc	24 Aug 2005 19:08:44 -0000	1.1.2.8
+++ squid3/src/ICAPXaction.cc	24 Aug 2005 21:10:49 -0000	1.1.2.9
@@ -126,10 +126,10 @@
 	// nothing to do because we are using temporary write buffers
 
 	// reading end
-	memBufInit(&readBuf, MAX_CLIENT_BUF_SZ, 1<<20);
+	memBufDefInit(&readBuf);
 
 	// encoding
-	memBufInit(&requestBuf, MAX_CLIENT_BUF_SZ, 1<<20);
+	memBufDefInit(&requestBuf);
 
 	// parsing
 	icapReply = httpReplyCreate();
@@ -218,6 +218,7 @@
 
 	MsgPipeData::Body *body = virgin->data->body;
 	MemBuf writeBuf; // TODO: suggest a min size based on body and lastChunk
+	memBufDefInit(&writeBuf);
 
 	if (body->hasContent()) {
 		debugs(93, 7, "ICAPXaction will write " << body->contentSize() <<
@@ -243,9 +244,6 @@
 }
 
 void ICAPXaction::moveRequestChunk(MemBuf *buf) {
-	if (memBufIsNull(buf))
-		memBufInit(buf, MAX_CLIENT_BUF_SZ, 1<<20);
-
 	MsgPipeData::Body *body = virgin->data->body;
 	const mb_size_t chunkSize = body->contentSize(); // may be zero
 	memBufPrintf(buf, "%x\r\n", chunkSize);
@@ -522,10 +520,7 @@
 	Must(httpResp);
 
 	MemBuf httpBuf;
-	memBufInit(&httpBuf, MAX_CLIENT_BUF_SZ, 1<<20);
-		// httpReq->urlpath.size() + 25 + // request line, roughly
-		// httpReq->header.len + // request header size
-		// httpResp->hdr_sz); // response request line + header, roughly
+	memBufDefInit(&httpBuf);
 
 	/* build HTTP request header */