r246 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-06-28 12:31:29 +0200 (Wed, 28 Jun 2006)
New Revision: 246

Modified:
   trunk/varnish-cache/bin/varnishd/cache_fetch.c
Log:
304's don't have a body


Modified: trunk/varnish-cache/bin/varnishd/cache_fetch.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_fetch.c	2006-06-28 10:30:57 UTC (rev 245)
+++ trunk/varnish-cache/bin/varnishd/cache_fetch.c	2006-06-28 10:31:29 UTC (rev 246)
@@ -67,16 +67,7 @@
 		p += i;
 		cl -= i;
 	}
-
-	http_BuildSbuf(2, w->sb, hp);
-
-	vca_write_obj(sp, w->sb);
-
-#if 0
-	hash->deref(sp->obj);
-#endif
 	return (0);
-
 }
 
 /*--------------------------------------------------------------------*/
@@ -184,10 +175,6 @@
 
 	if (st != NULL && stevedore->trim != NULL)
 		stevedore->trim(st, st->len);
-
-	http_BuildSbuf(2, w->sb, hp);
-
-	vca_write_obj(sp, w->sb);
 	return (0);
 }
 
@@ -237,9 +224,6 @@
 	if (st != NULL && stevedore->trim != NULL)
 		stevedore->trim(st, st->len);
 
-	http_BuildSbuf(2, w->sb, hp);
-
-	vca_write_obj(sp, w->sb);
 	return (1);
 }
 
@@ -252,6 +236,7 @@
 	struct http *hp;
 	char *b;
 	time_t t_req, t_resp;
+	int body;
 
 	fd = VBE_GetFd(sp->backend, &fd_token);
 	assert(fd != -1);
@@ -282,7 +267,16 @@
 		sp->obj->valid = 1;
 		sp->obj->cacheable = 1;
 		sp->obj->header = strdup(sbuf_data(w->sb));
+		body = 1;
 		break;
+	case 304:
+		http_BuildSbuf(3, w->sb, hp);
+		/* XXX: fill in object from headers */
+		sp->obj->valid = 1;
+		sp->obj->cacheable = 1;
+		sp->obj->header = strdup(sbuf_data(w->sb));
+		body = 0;
+		break;
 	case 391:
 		sp->obj->valid = 0;
 		sp->obj->cacheable = 0;
@@ -301,13 +295,20 @@
 	if (sp->obj->cacheable)
 		EXP_Insert(sp->obj);
 
-	if (http_GetHdr(hp, "Content-Length", &b))
-		cls = fetch_straight(w, sp, fd, hp, b);
-	else if (http_HdrIs(hp, "Transfer-Encoding", "chunked"))
-		cls = fetch_chunked(w, sp, fd, hp);
-	else 
-		cls = fetch_eof(w, sp, fd, hp);
+	if (body) {
+		if (http_GetHdr(hp, "Content-Length", &b))
+			cls = fetch_straight(w, sp, fd, hp, b);
+		else if (http_HdrIs(hp, "Transfer-Encoding", "chunked"))
+			cls = fetch_chunked(w, sp, fd, hp);
+		else 
+			cls = fetch_eof(w, sp, fd, hp);
+	} else
+		cls = 0;
 
+	http_BuildSbuf(2, w->sb, hp);
+
+	vca_write_obj(sp, w->sb);
+
 	if (http_GetHdr(hp, "Connection", &b) && !strcasecmp(b, "close"))
 		cls = 1;