- update from 2.0.4

Changed files:
    varnish.conf -> 1.3

diff --git a/varnish.conf b/varnish.conf
index 6b5ddbfa543573718babfdeee41f3c3020f89bd2..244a8de0b927ca4e9c172bb4b84c2dda3d80db47 100644 (file)
--- a/varnish.conf
+++ b/varnish.conf
@@ -1,88 +1,124 @@
-#
 # This is a basic VCL configuration file for varnish.  See the vcl(7)
 # man page for details on VCL syntax and semantics.
-#
-# $Id$
-#
 
 # Default backend definition.  Set this to point to your content
 # server.
-
 backend default {
-       set backend.host = "127.0.0.1";
-       set backend.port = "8080";
+       .host = "127.0.0.1";
+       .port = "8080";
 }
 
 # Below is a commented-out copy of the default VCL logic.  If you
 # redefine any of these subroutines, the built-in logic will be
 # appended to your code.
-
-## 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") {
+#        /* Non-RFC2616 or CONNECT which is weird. */
+#        return (pipe);
+#    }
+#    if (req.request != "GET" && req.request != "HEAD") {
+#        /* We only deal with GET and HEAD by default */
+#        return (pass);
+#    }
+#    if (req.http.Authorization || req.http.Cookie) {
+#        /* Not cacheable by default */
+#        return (pass);
+#    }
+#    return (lookup);
 #}
 #
-## Called when entering pipe mode
-#
 #sub vcl_pipe {
-#      pipe;
+#    # Note that only the first request to the backend will have
+#    # X-Forwarded-For set.  If you use X-Forwarded-For and want to
+#    # have it set for all requests, make sure to have:
+#    # set req.http.connection = "close";
+#    # here.  It is not set by default as it might break some broken web
+#    # applications, like IIS with NTLM authentication.
+#    return (pipe);
 #}
 #
-## Called when entering pass mode
-#
 #sub vcl_pass {
-#      pass;
+#    return (pass);
 #}
 #
-## Called when entering an object into the cache
-#
 #sub vcl_hash {
-#      hash;
+#    set req.hash += req.url;
+#    if (req.http.host) {
+#        set req.hash += req.http.host;
+#    } else {
+#        set req.hash += server.ip;
+#    }
+#    return (hash);
 #}
 #
-## Called when the requested object was found in the cache
-#
 #sub vcl_hit {
-#      if (!obj.cacheable) {
-#              pass;
-#      }
-#      deliver;
+#    if (!obj.cacheable) {
+#        return (pass);
+#    }
+#    return (deliver);
 #}
 #
-## Called when the requested object was not found in the cache
-#
 #sub vcl_miss {
-#      fetch;
+#    return (fetch);
 #}
 #
-## Called when the requested object has been retrieved from the
-## backend, or the request to the backend has failed
-#
 #sub vcl_fetch {
-#      if (!obj.valid) {
-#              error;
-#      }
-#      if (!obj.cacheable) {
-#              pass;
-#      }
-#      if (resp.http.Set-Cookie) {
-#              pass;
-#      }
-#      insert;
+#    if (!obj.cacheable) {
+#        return (pass);
+#    }
+#    if (obj.http.Set-Cookie) {
+#        return (pass);
+#    }
+#    set obj.prefetch =  -30s;
+#    return (deliver);
 #}
 #
-## Called when an object nears its expiry time
+#sub vcl_deliver {
+#    return (deliver);
+#}
+#
+#sub vcl_discard {
+#    /* XXX: Do not redefine vcl_discard{}, it is not yet supported */
+#    return (discard);
+#}
+#
+#sub vcl_prefetch {
+#    /* XXX: Do not redefine vcl_prefetch{}, it is not yet supported */
+#    return (fetch);
+#}
 #
 #sub vcl_timeout {
-#      discard;
+#    /* XXX: Do not redefine vcl_timeout{}, it is not yet supported */
+#    return (discard);
+#}
+#
+#sub vcl_error {
+#    set obj.http.Content-Type = "text/html; charset=utf-8";
+#    synthetic {"
+#<?xml version="1.0" encoding="utf-8"?>
+#<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+# "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+#<html>
+#  <head>
+#    <title>"} obj.status " " obj.response {"</title>
+#  </head>
+#  <body>
+#    <h1>Error "} obj.status " " obj.response {"</h1>
+#    <p>"} obj.response {"</p>
+#    <h3>Guru Meditation:</h3>
+#    <p>XID: "} req.xid {"</p>
+#    <address>
+#       <a href="http://www.varnish-cache.org/">Varnish</a>
+#    </address>
+#  </body>
+#</html>
+#"};
+#    return (deliver);
 #}