Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache

.gitignore

@@ -33,6 +33,7 @@ Makefile.in
 /missing
 /stamp-h1
 /varnishapi.pc
+TAGS
 
 # Default vcl made from bin/varnishd/default.vcl
 /bin/varnishd/default_vcl.h

bin/varnishd/varnishd.c

@@ -421,6 +421,9 @@ main(int argc, char * const *argv)
 		MCF_ParamSet(cli, "thread_pool_workspace", "16384");
 		cli_check(cli);
 
+		MCF_ParamSet(cli, "http_resp_size", "8192");
+		cli_check(cli);
+
 		MCF_ParamSet(cli, "thread_pool_stack", "32bit");
 		cli_check(cli);
 

doc/sphinx/tutorial/vcl.rst

@@ -154,7 +154,7 @@ matches certain criteria:::
   sub vcl_fetch {
      if (req.url ~ "\.(png|gif|jpg)$") {
        unset beresp.http.set-cookie;
-       set beresp.ttl = 3600;
+       set beresp.ttl = 1h;
     }
   }