Rework the fetch code, to use a common function for feeding bytes into

storage slabs.  Pretty soon we will not be doing that directly and
we want only one place to know about the gzip/gunzip magic.

Overhaul the chunked encoding fetcher code, to be much simpler and 
much more robust.

Sort out some 4GB issues while we where here anyway.



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5702 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/cache.h

@@ -90,6 +90,7 @@ struct director;
 struct object;
 struct objhead;
 struct objcore;
+struct storage;
 struct workreq;
 struct esidata;
 struct vrt_backend;
@@ -250,7 +251,6 @@ struct worker {
 	struct http		*beresp;
 	struct http		*resp;
 
-	enum body_status	body_status;
 	unsigned		cacheable;
 	double			age;
 	double			entered;
@@ -261,6 +261,10 @@ struct worker {
 	/* This is only here so VRT can find it */
 	char			*storage_hint;
 
+	/* Fetch stuff */
+	enum body_status	body_status;
+	struct storage		*storage;
+
 	/* Timeouts */
 	double			connect_timeout;
 	double			first_byte_timeout;
@@ -649,7 +653,7 @@ void http_CollectHdr(struct http *hp, const char *hdr);
 void HTC_Init(struct http_conn *htc, struct ws *ws, int fd);
 int HTC_Reinit(struct http_conn *htc);
 int HTC_Rx(struct http_conn *htc);
-int HTC_Read(struct http_conn *htc, void *d, unsigned len);
+ssize_t HTC_Read(struct http_conn *htc, void *d, size_t len);
 int HTC_Complete(struct http_conn *htc);
 
 #define HTTPH(a, b, c, d, e, f, g) extern char b[];

bin/varnishd/cache_center.c

@@ -1296,6 +1296,7 @@ CNT_Session(struct sess *sp)
 		CHECK_OBJ_ORNULL(w->nobjhead, OBJHEAD_MAGIC);
 		WS_Assert(w->ws);
 		AZ(sp->wrk->storage_hint);
+		AZ(sp->wrk->storage);
 
 		switch (sp->step) {
 #define STEP(l,u) \

bin/varnishd/cache_httpconn.c

@@ -178,12 +178,12 @@ HTC_Rx(struct http_conn *htc)
 	return (HTC_Complete(htc));
 }
 
-int
-HTC_Read(struct http_conn *htc, void *d, unsigned len)
+ssize_t
+HTC_Read(struct http_conn *htc, void *d, size_t len)
 {
-	unsigned l;
+	size_t l;
 	unsigned char *p;
-	int i;
+	ssize_t i;
 
 	l = 0;
 	p = d;

bin/varnishd/cache_pool.c

@@ -182,11 +182,13 @@ wrk_thread_real(struct wq *qp, unsigned shm_workspace, unsigned sess_workspace,
 		w->beresp = NULL;
 		w->resp = NULL;
 		w->storage_hint = NULL;
+		w->storage = NULL;
 		w->wrq->func(w, w->wrq->priv);
 		AZ(w->bereq);
 		AZ(w->beresp1);
 		AZ(w->beresp);
 		AZ(w->resp);
+		AZ(w->storage);
 		WS_Assert(w->ws);
 		AZ(w->wfd);
 		AZ(w->storage_hint);