[master] e4996ef Link the HTTP VSLs to the index in the http structure

[Poul-Henning Kamp]

commit e4996efa99d8a0407d6761fce47ca08968d4cb3d
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Mar 22 14:05:30 2012 +0000

    Link the HTTP VSLs to the index in the http structure

diff --git a/include/tbl/vsl_tags.h b/include/tbl/vsl_tags.h
index 885e708..ecf0a20 100644
--- a/include/tbl/vsl_tags.h
+++ b/include/tbl/vsl_tags.h
@@ -53,15 +53,15 @@ SLTM(Length)
 
 SLTM(FetchError)
 
-#define SLTH(aa)	SLTM(Rx##aa)
+#define SLTH(aa, bb)	SLTM(Rx##aa)
 #include "tbl/vsl_tags_http.h"
 #undef SLTH
 
-#define SLTH(aa)	SLTM(Tx##aa)
+#define SLTH(aa, bb)	SLTM(Tx##aa)
 #include "tbl/vsl_tags_http.h"
 #undef SLTH
 
-#define SLTH(aa)	SLTM(Obj##aa)
+#define SLTH(aa, bb)	SLTM(Obj##aa)
 #include "tbl/vsl_tags_http.h"
 #undef SLTH
 
diff --git a/include/tbl/vsl_tags_http.h b/include/tbl/vsl_tags_http.h
index 5e8544f..542af07 100644
--- a/include/tbl/vsl_tags_http.h
+++ b/include/tbl/vsl_tags_http.h
@@ -27,12 +27,15 @@
  *
  * Define the VSL tags for HTTP protocol messages
  *
+ * The order of this table is not random, do not resort.
+ * In particular, the FIRST and LOST entries must be last, in that order.
+ *
  */
 
-SLTH(Request)
-SLTH(Response)
-SLTH(Status)
-SLTH(URL)
-SLTH(Protocol)
-SLTH(Header)
-SLTH(Lost)
+SLTH(Request,	HTTP_HDR_REQ)
+SLTH(URL,	HTTP_HDR_URL)
+SLTH(Protocol,	HTTP_HDR_PROTO)
+SLTH(Status,	HTTP_HDR_STATUS)
+SLTH(Response,	HTTP_HDR_RESPONSE)
+SLTH(Header,	HTTP_HDR_FIRST)
+SLTH(Lost,	HTTP_HDR_LOST)