Enable CURLOPT_FORBID_REUSE (fix #97)

The cURL connection re-use caused response headers for different requests to be
confused when testing against Varnish 4.0.1 (on PHP 5.5). Varnish 3.0.2 (and
possibly 4.0.0) still work fine with re-use.

Author: ddeboer

tests/AbstractProxyClientTestCase.php

@@ -32,7 +32,7 @@ abstract class AbstractProxyClientTestCase extends \PHPUnit_Framework_TestCase
     const CACHE_HIT  = 'HIT';
 
     /**
-     * A guzzle http client.
+     * A Guzzle HTTP client.
      *
      * @var Client
      */
@@ -65,6 +65,7 @@ public function assertHit(Response $response, $message = null)
      *
      * @param string $url
      * @param array  $headers
+     * @param array  $options
      *
      * @return Response
      */
@@ -81,7 +82,10 @@ public function getResponse($url, array $headers = array(), $options = array())
     public function getClient()
     {
         if (null === $this->client) {
-            $this->client = new Client('http://' . $this->getHostName() . ':' . $this->getCachingProxyPort());
+            $this->client = new Client(
+                'http://' . $this->getHostName() . ':' . $this->getCachingProxyPort(),
+                array('curl.options' => array(CURLOPT_FORBID_REUSE => true))
+            );
         }
 
         return $this->client;

tests/Functional/Fixtures/varnish-4/purge.vcl

@@ -3,22 +3,6 @@ sub vcl_recv {
         if (!client.ip ~ invalidators) {
             return (synth(405, "Not allowed"));
         }
-        return (hash);
-    }
-}
-
-sub vcl_hit {
-    if (req.method == "PURGE") {
-        purge;
-        return (synth(204, "Purged"));
-    }
-}
-
-# The purge in vcl_miss is necessary to purge all variants in the cases where
-# you hit an object, but miss a particular variant.
-sub vcl_miss {
-    if (req.method == "PURGE") {
-        purge;
-        return (synth(204, "Purged (Not in cache)"));
+        return (purge);
     }
 }