[master] c5fa269 Be pendatically correct and Collect multiple Connection headers.

Poul-Henning Kamp phk at FreeBSD.org
Mon Jul 14 13:25:00 CEST 2014


commit c5fa269a69cf2c72cee7b3a274b6138afd2f6b50
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Jul 14 11:24:44 2014 +0000

    Be pendatically correct and Collect multiple Connection headers.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index e7b4ad6..e1b37a4 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -972,7 +972,7 @@ ssize_t HTTP1_Read(struct http_conn *htc, void *d, size_t len);
 enum htc_status_e HTTP1_Complete(struct http_conn *htc);
 uint16_t HTTP1_DissectRequest(struct req *);
 uint16_t HTTP1_DissectResponse(struct http *sp, const struct http_conn *htc);
-enum sess_close HTTP1_DoConnection(const struct http *);
+enum sess_close HTTP1_DoConnection(struct http *);
 unsigned HTTP1_Write(const struct worker *w, const struct http *hp, const int*);
 
 #define HTTPH(a, b, c) extern char b[];
diff --git a/bin/varnishd/cache/cache_http1_proto.c b/bin/varnishd/cache/cache_http1_proto.c
index 99564b3..1fe77ba 100644
--- a/bin/varnishd/cache/cache_http1_proto.c
+++ b/bin/varnishd/cache/cache_http1_proto.c
@@ -508,12 +508,13 @@ HTTP1_DissectResponse(struct http *hp, const struct http_conn *htc)
  */
 
 enum sess_close
-HTTP1_DoConnection(const struct http *hp)
+HTTP1_DoConnection(struct http *hp)
 {
 	char *p, *q;
 	enum sess_close ret;
 	unsigned u;
 
+	http_CollectHdr(hp, H_Connection);
 	if (!http_GetHdr(hp, H_Connection, &p)) {
 		if (hp->protover < 11)
 			return (SC_REQ_HTTP10);



More information about the varnish-commit mailing list