From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/2] examples/varnish-4.vcl: comments and tweaks
Date: Sun, 3 Jul 2016 01:21:09 +0000 [thread overview]
Message-ID: <20160703012109.11097-3-e@80x24.org> (raw)
In-Reply-To: <20160703012109.11097-1-e@80x24.org>
Document and simplify things a bit. The major functional change
is we no longer waste space caching objects from dumb HTTP
clones.
---
examples/varnish-4.vcl | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/examples/varnish-4.vcl b/examples/varnish-4.vcl
index 999f954..2429603 100644
--- a/examples/varnish-4.vcl
+++ b/examples/varnish-4.vcl
@@ -10,24 +10,15 @@
vcl 4.0;
backend default {
+ # this is where public-inbox-http listens
.host = "127.0.0.1";
.port = "280";
}
sub vcl_recv {
- if (req.method != "GET" &&
- req.method != "HEAD" &&
- req.method != "PUT" &&
- req.method != "POST" &&
- req.method != "TRACE" &&
- req.method != "OPTIONS" &&
- req.method != "DELETE") {
- /* Non-RFC2616 or CONNECT which is weird. */
- return (pipe);
- }
+ /* pipe POST and any other weird methods directly to backend */
if (req.method != "GET" && req.method != "HEAD") {
- /* We only deal with GET and HEAD by default */
- return (pass);
+ return (pipe);
}
if (req.http.Authorization || req.http.Cookie) {
/* Not cacheable by default */
@@ -36,6 +27,13 @@ sub vcl_recv {
return (hash);
}
+sub vcl_pipe {
+ # By default Connection: close is set on all piped requests by varnish,
+ # but public-inbox-httpd supports persistent connections well :)
+ unset bereq.http.connection;
+ return (pipe);
+}
+
sub vcl_hash {
hash_data(req.url);
if (req.http.host) {
@@ -43,6 +41,7 @@ sub vcl_hash {
} else {
hash_data(server.ip);
}
+ /* we generate fully-qualified URLs for Atom feeds and redirects */
if (req.http.X-Forwarded-Proto) {
hash_data(req.http.X-Forwarded-Proto);
}
@@ -53,6 +52,8 @@ sub vcl_backend_response {
set beresp.grace = 60s;
set beresp.do_stream = true;
if (beresp.ttl <= 0s ||
+ /* no point in caching stuff git already stores on disk */
+ beresp.http.Content-Type ~ "application/x-git" ||
beresp.http.Set-Cookie ||
beresp.http.Vary == "*") {
/* Mark as "Hit-For-Pass" for the next 2 minutes */
@@ -60,6 +61,7 @@ sub vcl_backend_response {
set beresp.uncacheable = true;
return (deliver);
} else {
+ /* short TTL for up-to-dateness, our PSGI is not that slow */
set beresp.ttl = 10s;
}
return (deliver);
--
EW
prev parent reply other threads:[~2016-07-03 1:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-03 1:21 [PATCH 0/2] varnish tweaks and such Eric Wong
2016-07-03 1:21 ` [PATCH 1/2] examples: remove X-Forwarded-For mentions Eric Wong
2016-07-03 1:21 ` Eric Wong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160703012109.11097-3-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).