r4243 - in branches/2.0/varnish-cache: . bin/varnishd lib/libvcl

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-09-28 10:43:38 +0200 (Mon, 28 Sep 2009)
New Revision: 4243

Modified:
   branches/2.0/varnish-cache/bin/varnishd/cache.h
   branches/2.0/varnish-cache/configure.ac
   branches/2.0/varnish-cache/lib/libvcl/vcc_fixed_token.c
Log:
Merge r4030: Make HTTP_HDR_MAX_VAL a configure option

Thanks to "whocares" in the bts.

Fixes #455


Modified: branches/2.0/varnish-cache/bin/varnishd/cache.h
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache.h	2009-09-24 14:22:21 UTC (rev 4242)
+++ branches/2.0/varnish-cache/bin/varnishd/cache.h	2009-09-28 08:43:38 UTC (rev 4243)
@@ -58,8 +58,6 @@
 #include "heritage.h"
 #include "miniobj.h"
 
-#define HTTP_HDR_MAX_VAL 32
-
 enum {
 	/* Fields from the first line of HTTP proto */
 	HTTP_HDR_REQ,

Modified: branches/2.0/varnish-cache/configure.ac
===================================================================
--- branches/2.0/varnish-cache/configure.ac	2009-09-24 14:22:21 UTC (rev 4242)
+++ branches/2.0/varnish-cache/configure.ac	2009-09-28 08:43:38 UTC (rev 4243)
@@ -360,6 +360,15 @@
 fi
 AC_DEFINE_UNQUOTED([VCC_CC],"$VCC_CC",[C compiler command line for VCL code])
 
+# Define HTTP_HDR_MAX_VAL
+AC_ARG_WITH(max-header-fields,
+            AS_HELP_STRING([--with-max-header-fields=NUM],
+                           [How many header fields to support (default=32)]),
+            [],
+            [with_max_header_fields=32])
+
+AC_DEFINE_UNQUOTED(HTTP_HDR_MAX_VAL, $with_max_header_fields, [Define maximum number of header fields supported by varnish ])
+
 # Use jemalloc on Linux
 JEMALLOC_SUBDIR=
 JEMALLOC_LDADD=

Modified: branches/2.0/varnish-cache/lib/libvcl/vcc_fixed_token.c
===================================================================
--- branches/2.0/varnish-cache/lib/libvcl/vcc_fixed_token.c	2009-09-24 14:22:21 UTC (rev 4242)
+++ branches/2.0/varnish-cache/lib/libvcl/vcc_fixed_token.c	2009-09-28 08:43:38 UTC (rev 4243)
@@ -324,9 +324,9 @@
 
 	/* ../../include/vrt_obj.h */
 
-	vsb_cat(sb, "/*\n * $Id: vcc_gen_obj.tcl 3992 2009-03-23 12:50:04Z ");
-	vsb_cat(sb, "tfheen $\n *\n * NB:  This file is machine generated, ");
-	vsb_cat(sb, "DO NOT EDIT!\n *\n * Edit vcc_gen_obj.tcl instead\n");
+	vsb_cat(sb, "/*\n * $Id$\n");
+	vsb_cat(sb, " *\n * NB:  This file is machine generated, DO NOT EDI");
+	vsb_cat(sb, "T!\n *\n * Edit vcc_gen_obj.tcl instead\n");
 	vsb_cat(sb, " */\n\nstruct sockaddr * VRT_r_client_ip(const struct ");
 	vsb_cat(sb, "sess *);\nstruct sockaddr * VRT_r_server_ip(struct ses");
 	vsb_cat(sb, "s *);\nconst char * VRT_r_server_hostname(struct sess ");