From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 17 Apr 2009 22:09:22 +0000 (+1200)
Subject: Cleanup magic buffer sizes in helper.cc
X-Git-Tag: SQUID_3_2_0_1~1059
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f37478b1ef190dfad93974a0fd656cd142ae04b;p=thirdparty%2Fsquid.git

Cleanup magic buffer sizes in helper.cc

Was an pair of 8KB magic numbers. Not made a single define with comments
to indicate what it is.
---

diff --git a/src/helper.cc b/src/helper.cc
index 4965b738d5..e412659441 100644
--- a/src/helper.cc
+++ b/src/helper.cc
@@ -1,4 +1,3 @@
-
 /*
  * $Id$
  *
@@ -43,6 +42,11 @@
 
 #define HELPER_MAX_ARGS 64
 
+/* size of helper read buffer (maximum?). no reason given for this size */
+/* though it has been seen to be too short for some requests */
+/* it is dynamic, so increasng should not have side effects */
+#define BUF_8KB	8192
+
 static IOCB helperHandleRead;
 static IOCB helperStatefulHandleRead;
 static PF helperServerFree;
@@ -147,7 +151,7 @@ helperOpenServers(helper * hlp)
         srv->addr = hlp->addr;
         srv->rfd = rfd;
         srv->wfd = wfd;
-        srv->rbuf = (char *)memAllocBuf(8192, &srv->rbuf_sz);
+        srv->rbuf = (char *)memAllocBuf(BUF_8KB, &srv->rbuf_sz);
         srv->wqueue = new MemBuf;
         srv->roffset = 0;
         srv->requests = (helper_request **)xcalloc(hlp->concurrency ? hlp->concurrency : 1, sizeof(*srv->requests));
@@ -261,7 +265,7 @@ helperStatefulOpenServers(statefulhelper * hlp)
         srv->addr = hlp->addr;
         srv->rfd = rfd;
         srv->wfd = wfd;
-        srv->rbuf = (char *)memAllocBuf(8192, &srv->rbuf_sz);
+        srv->rbuf = (char *)memAllocBuf(BUF_8KB, &srv->rbuf_sz);
         srv->roffset = 0;
         srv->parent = cbdataReference(hlp);
 
@@ -288,7 +292,6 @@ helperStatefulOpenServers(statefulhelper * hlp)
         comm_add_close_handler(rfd, helperStatefulServerFree, srv);
 
         comm_read(srv->rfd, srv->rbuf, srv->rbuf_sz - 1, helperStatefulHandleRead, srv);
-
     }
 
     hlp->last_restart = squid_curtime;