Commit d1d5b1e0 authored by Petter Knudsen's avatar Petter Knudsen

Updated the default.vcl and man page with the latest config from mgt_vcc.c.

The following perl one-liner is useful:
perl -ne 'if( $print == 1 ) { exit if( /^$/ ); eval "print " . $_; } $print = 1 if /default_vcl/;' mgt_vcc.c 
Fixes #135 (for now)


git-svn-id: http://www.varnish-cache.org/svn/trunk@2994 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent ec8e3bb7
......@@ -20,16 +20,25 @@ backend default {
## Called when a client request is received
#
#sub vcl_recv {
# if (req.request != "GET" && req.request != "HEAD") {
# pipe;
# }
# if (req.http.Expect) {
# pipe;
# }
# if (req.http.Authenticate || req.http.Cookie) {
# pass;
# }
# lookup;
# if (req.request != "GET" &&
# req.request != "HEAD" &&
# req.request != "PUT" &&
# req.request != "POST" &&
# req.request != "TRACE" &&
# req.request != "OPTIONS" &&
# req.request != "DELETE") {
# pipe;
# }
# if (req.http.Expect) {
# pipe;
# }
# if (req.request != "GET" && req.request != "HEAD") {
# pass;
# }
# if (req.http.Authorization || req.http.Cookie) {
# pass;
# }
# lookup;
#}
#
## Called when entering pipe mode
......@@ -47,9 +56,13 @@ backend default {
## Called when entering an object into the cache
#
#sub vcl_hash {
# set req.hash += req.url;
# set req.hash += req.http.host;
# hash;
# set req.hash += req.url;
# if (req.http.host) {
# set req.hash += req.http.host;
# } else {
# set req.hash += server.ip;
# }
# hash;
#}
#
## Called when the requested object was found in the cache
......@@ -71,19 +84,18 @@ backend default {
## backend, or the request to the backend has failed
#
#sub vcl_fetch {
# if (!obj.valid) {
# error;
# }
# if (!obj.cacheable) {
# pass;
# }
# if (obj.http.Set-Cookie) {
# pass;
# }
# insert;
# if (!obj.valid) {
# error obj.status;
# }
# if (!obj.cacheable) {
# pass;
# }
# if (obj.http.Set-Cookie) {
# pass;
# }
# set obj.prefetch = -30s; insert;
#}
#
#
## Called before a cached object is delivered to the client
#
#sub vcl_deliver {
......@@ -96,7 +108,7 @@ backend default {
# discard;
#}
#
## Called when an object is about to be discarded
# Called when an object is about to be discarded
#
#sub vcl_discard {
# discard;
......
......@@ -507,13 +507,22 @@ backend default {
}
sub vcl_recv {
if (req.request != "GET" && req.request != "HEAD") {
if (req.request != "GET" &&
req.request != "HEAD" &&
req.request != "PUT" &&
req.request != "POST" &&
req.request != "TRACE" &&
req.request != "OPTIONS" &&
req.request != "DELETE") {
pipe;
}
if (req.http.Expect) {
pipe;
}
if (req.http.Authenticate || req.http.Cookie) {
if (req.request != "GET" && req.request != "HEAD") {
pass;
}
if (req.http.Authorization || req.http.Cookie) {
pass;
}
lookup;
......@@ -529,7 +538,11 @@ sub vcl_pass {
sub vcl_hash {
set req.hash += req.url;
set req.hash += req.http.host;
if (req.http.host) {
set req.hash += req.http.host;
} else {
set req.hash += server.ip;
}
hash;
}
......@@ -546,7 +559,7 @@ sub vcl_miss {
sub vcl_fetch {
if (!obj.valid) {
error;
error obj.status;
}
if (!obj.cacheable) {
pass;
......@@ -554,18 +567,18 @@ sub vcl_fetch {
if (obj.http.Set-Cookie) {
pass;
}
insert;
set obj.prefetch = -30s; insert;
}
sub vcl_deliver {
deliver;
}
sub vcl_timeout {
sub vcl_discard {
discard;
}
sub vcl_discard {
sub vcl_timeout {
discard;
}
.Ed
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment