support flag for varnish 4

Author: dbu

doc/varnish-configuration.rst

@@ -316,7 +316,10 @@ Custom TTL
 .. include:: includes/custom-ttl.rst
 
 Subroutines are provided in ``resources/config/varnish-[version]/fos_custom_ttl.vcl``.
-To enable support add the following to ``your_varnish.vcl``:
+The configuration needs to use inline C, which is disabled by default since
+Varnish 4.0. To use the custom TTL feature, you need to start your Varnish with
+inline C enabled: ``-p vcc_allow_inline_c=on``. Then add the following to
+``your_varnish.vcl``:
 
 .. configuration-block::
 

resources/config/varnish-3/fos_custom_ttl.vcl

@@ -14,9 +14,9 @@
 sub fos_custom_ttl_fetch {
     if (beresp.http.X-Reverse-Proxy-TTL) {
         /*
-         * Note that there is a ``beresp.ttl`` field in VCL but unfortunately it can
-         * only be set to absolute values and not dynamically. Thus we have to revert
-         * to a C code fragment.
+         * Note that there is a ``beresp.ttl`` field in VCL but unfortunately
+         * it can only be set to absolute values and not dynamically. Thus we
+         * have to resort to an inline C code fragment.
          */
         C{
             char *ttl;

resources/config/varnish-4/fos_custom_ttl.vcl

@@ -14,9 +14,13 @@
 sub fos_custom_ttl_fetch {
     if (beresp.http.X-Reverse-Proxy-TTL) {
         /*
-         * Note that there is a ``beresp.ttl`` field in VCL but unfortunately it can
-         * only be set to absolute values and not dynamically. Thus we have to revert
-         * to a C code fragment.
+         * Note that there is a ``beresp.ttl`` field in VCL but unfortunately
+         * it can only be set to absolute values and not dynamically. Thus we
+         * have to resort to an inline C code fragment.
+         *
+         * As of Varnish 4.0, inline C is disabled by default. To use this
+         * feature, you need to add `-p vcc_allow_inline_c=on` to your Varnish
+         * startup command.
          */
         C{
             char *ttl;

src/Test/Proxy/VarnishProxy.php

@@ -23,6 +23,7 @@ class VarnishProxy extends AbstractProxy
     protected $configFile;
     protected $configDir;
     protected $cacheDir;
+    protected $allowInlineC = false;
 
     /**
      * Constructor
@@ -40,17 +41,21 @@ public function __construct($configFile)
      */
     public function start()
     {
-        $this->runCommand(
-            $this->getBinary(),
-            [
-                '-a', $this->ip . ':' . $this->getPort(),
-                '-T', $this->ip . ':' . $this->getManagementPort(),
-                '-f', $this->getConfigFile(),
-                '-n', $this->getCacheDir(),
-                '-p', 'vcl_dir=' . $this->getConfigDir(),
-                '-P', $this->pid,
-            ]
-        );
+        $args = [
+            '-a', $this->ip . ':' . $this->getPort(),
+            '-T', $this->ip . ':' . $this->getManagementPort(),
+            '-f', $this->getConfigFile(),
+            '-n', $this->getCacheDir(),
+            '-p', 'vcl_dir=' . $this->getConfigDir(),
+
+            '-P', $this->pid,
+        ];
+        if ($this->getAllowInlineC()) {
+            $args[] = '-p';
+            $args[] = 'vcc_allow_inline_c=on';
+        }
+
+        $this->runCommand($this->getBinary(), $args);
 
         $this->waitFor($this->ip, $this->getPort(), 2000);
     }
@@ -139,4 +144,24 @@ public function getCacheDir()
     {
         return $this->cacheDir;
     }
+
+    /**
+     * Whether the inline C flag should be set.
+     *
+     * @return boolean
+     */
+    public function getAllowInlineC()
+    {
+        return $this->allowInlineC;
+    }
+
+    /**
+     * Set whether the inline c flag should be on or off
+     *
+     * @param boolean $allowInlineC True for on, false for off
+     */
+    public function setAllowInlineC($allowInlineC)
+    {
+        $this->allowInlineC = (boolean) $allowInlineC;
+    }
 }

tests/Functional/Varnish/CustomTtlTest.php

@@ -19,6 +19,14 @@
  */
 class CustomTtlTest extends VarnishTestCase
 {
+    public function setUp()
+    {
+        if ($this->getVarnishVersion() >= 4) {
+            $this->getProxy()->setAllowInlineC(true);
+        }
+        parent::setUp();
+    }
+
     public function testCustomTtl()
     {
         $this->assertMiss($this->getResponse('/custom-ttl.php'));