varnish 4

dbu · dbu · commit 161e26551a87 · 2015-07-29T09:21:00.000+02:00
diff --git a/doc/varnish-configuration.rst b/doc/varnish-configuration.rst
@@ -327,8 +327,8 @@ inline C enabled: ``-p vcc_allow_inline_c=on``. Then add the following to
 
         include "path-to-config/varnish-4/fos_custom_ttl.vcl";
 
-        sub vcl_fetch {
-            call fos_custom_ttl_fetch;
+        sub vcl_backend_response {
+            call fos_custom_ttl_backend_response;
         }
 
     .. code-block:: varnish3
diff --git a/resources/config/varnish-4/fos_custom_ttl.vcl b/resources/config/varnish-4/fos_custom_ttl.vcl
@@ -11,7 +11,7 @@
  * Read a custom TTL header for the time to live information, to be used
  * instead of s-maxage.
  */
-sub fos_custom_ttl_fetch {
+sub fos_custom_ttl_backend_response {
     if (beresp.http.X-Reverse-Proxy-TTL) {
         /*
          * Note that there is a ``beresp.ttl`` field in VCL but unfortunately
diff --git a/tests/Functional/Fixtures/varnish-4/custom_ttl.vcl b/tests/Functional/Fixtures/varnish-4/custom_ttl.vcl
@@ -12,6 +12,6 @@ sub vcl_deliver {
     call fos_debug_deliver;
 }
 
-sub vcl_fetch {
-    call fos_custom_ttl_fetch;
+sub vcl_backend_response {
+    call fos_custom_ttl_backend_response;
 }

Original file line number	Diff line number	Diff line change
@@ -327,8 +327,8 @@ inline C enabled: ``-p vcc_allow_inline_c=on``. Then add the following to
`327`	`327`
`328`	`328`	`include "path-to-config/varnish-4/fos_custom_ttl.vcl";`
`329`	`329`
`330`		`- sub vcl_fetch {`
`331`		`- call fos_custom_ttl_fetch;`
	`330`	`+ sub vcl_backend_response {`
	`331`	`+ call fos_custom_ttl_backend_response;`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`.. code-block:: varnish3`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ sub vcl_deliver {`
`12`	`12`	`call fos_debug_deliver;`
`13`	`13`	`}`
`14`	`14`
`15`		`-sub vcl_fetch {`
`16`		`- call fos_custom_ttl_fetch;`
	`15`	`+sub vcl_backend_response {`
	`16`	`+ call fos_custom_ttl_backend_response;`
`17`	`17`	`}`