Commit ee31c0b9 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Merge branch 'master' of github.com:varnishcache/varnish-cache

parents d00de5d7 d760826b
...@@ -121,7 +121,7 @@ digraph cache_req_fsm { ...@@ -121,7 +121,7 @@ digraph cache_req_fsm {
] ]
lookup2 [ lookup2 [
shape=record shape=record
label="{<top>cnt_lookup:|{vcl_hit\{\}|{req.*|obj.*}}|{fail|<deliver>deliver|<pass>pass|restart|synth|<miss>miss}}" label="{<top>cnt_lookup:|{vcl_hit\{\}|{req.*|obj.*}}|{fail|<deliver>deliver|<pass>pass|restart|synth}}"
] ]
} }
lookup:busy:s -> lookup:top:ne [label=" waitinglist", lookup:busy:s -> lookup:top:ne [label=" waitinglist",
......
This diff is collapsed.
...@@ -267,10 +267,6 @@ with one of the following keywords: ...@@ -267,10 +267,6 @@ with one of the following keywords:
``pass`` ``pass``
see `pass`_ see `pass`_
``miss``
Synchronously refresh the object from the backend despite the
cache hit. Control will eventually pass to :ref:`vcl_miss`.
``deliver`` ``deliver``
Deliver the object. If it is stale, a background fetch to refresh Deliver the object. If it is stale, a background fetch to refresh
it is triggered. it is triggered.
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/types.h> /* for MUSL (ssize_t) */
#include "vdef.h" #include "vdef.h"
#include "vqueue.h" #include "vqueue.h"
......
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