Log reponse code and object length

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

bin/varnishd/cache.h

@@ -60,6 +60,8 @@ struct object {
 	unsigned		heap_idx;
 	unsigned		ban_seq;
 
+	unsigned		response;
+
 	unsigned		valid;
 	unsigned		cacheable;
 

bin/varnishd/cache_fetch.c

@@ -63,7 +63,7 @@ fetch_straight(struct worker *w, struct sess *sp, int fd, struct http *hp, char
 
 	while (cl != 0) {
 		i = read(fd, p, cl);
-		assert(i > 0);
+		assert(i > 0);	/* XXX seen */
 		p += i;
 		cl -= i;
 	}
@@ -245,6 +245,8 @@ FetchSession(struct worker *w, struct sess *sp)
 	sp->obj->xid = sp->xid;
 
 	fd = VBE_GetFd(sp->backend, &fd_token, sp->xid);
+	if (fd == -1)
+		fd = VBE_GetFd(sp->backend, &fd_token, sp->xid);
 	assert(fd != -1);	/* XXX: handle this */
 	VSL(SLT_Backend, sp->fd, "%d %s", fd, sp->backend->vcl_name);
 
@@ -287,6 +289,9 @@ FetchSession(struct worker *w, struct sess *sp)
 	sbuf_finish(w->sb);
 	sp->obj->header = strdup(sbuf_data(w->sb));
 
+	VSL(SLT_Response, sp->fd, "%u", sp->obj->response);
+	VSL(SLT_Length, sp->fd, "%u", sp->obj->len);
+
 	vca_write_obj(sp, sp->obj->header, 0);
 
 	if (http_GetHdr(hp, "Connection", &b) && !strcasecmp(b, "close"))

bin/varnishd/rfc2616.c

@@ -130,7 +130,8 @@ RFC2616_cache_policy(struct sess *sp, struct http *hp)
 	 * Initial cacheability determination per [RFC2616, 13.4]
 	 * We do not support ranges yet, so 206 is out.
 	 */
-	switch (http_GetStatus(hp)) {
+	sp->obj->response = http_GetStatus(hp);
+	switch (sp->obj->response) {
 	case 200: /* OK */
 		sp->obj->valid = 1;
 		/* FALLTHROUGH */