Keep user context headers in debug mode

To improve debugging, and to be consistent with other cleanup keep
headers if we are in debug mode.

Author: andrerom

resources/config/varnish-3/fos_user_context.vcl

@@ -88,16 +88,18 @@ sub fos_user_context_deliver {
         return (restart);
     }
 
-    # If we get here, this is a real response that gets sent to the client.
-
-    # Remove the vary on context user hash, this is nothing public. Keep all
-    # other vary headers.
-    set resp.http.Vary = regsub(resp.http.Vary, "(?i),? *X-User-Context-Hash *", "");
-    set resp.http.Vary = regsub(resp.http.Vary, "^, *", "");
-    if (resp.http.Vary == "") {
-        remove resp.http.Vary;
-    }
+    # If we get here, this is a real response that gets sent to the client and we do some cleanup if not in debug.
+
+    if (!resp.http.X-Cache-Debug) {
+        # Remove the vary on context user hash, this is nothing public. Keep all
+        # other vary headers.
+        set resp.http.Vary = regsub(resp.http.Vary, "(?i),? *X-User-Context-Hash *", "");
+        set resp.http.Vary = regsub(resp.http.Vary, "^, *", "");
+        if (resp.http.Vary == "") {
+            remove resp.http.Vary;
+        }
 
-    # Sanity check to prevent ever exposing the hash to a client.
-    remove resp.http.X-User-Context-Hash;
+        # Sanity check to prevent ever exposing the hash to a client.
+        remove resp.http.X-User-Context-Hash;
+    }
 }

resources/config/varnish/fos_user_context.vcl

@@ -86,16 +86,18 @@ sub fos_user_context_deliver {
         return (restart);
     }
 
-    # If we get here, this is a real response that gets sent to the client.
-
-    # Remove the vary on context user hash, this is nothing public. Keep all
-    # other vary headers.
-    set resp.http.Vary = regsub(resp.http.Vary, "(?i),? *X-User-Context-Hash *", "");
-    set resp.http.Vary = regsub(resp.http.Vary, "^, *", "");
-    if (resp.http.Vary == "") {
-        unset resp.http.Vary;
-    }
+    # If we get here, this is a real response that gets sent to the client and we do some cleanup if not in debug.
+
+    if (!resp.http.X-Cache-Debug) {
+        # Remove the vary on context user hash, this is nothing public. Keep all
+        # other vary headers.
+        set resp.http.Vary = regsub(resp.http.Vary, "(?i),? *X-User-Context-Hash *", "");
+        set resp.http.Vary = regsub(resp.http.Vary, "^, *", "");
+        if (resp.http.Vary == "") {
+            unset resp.http.Vary;
+        }
 
-    # Sanity check to prevent ever exposing the hash to a client.
-    unset resp.http.X-User-Context-Hash;
+        # Sanity check to prevent ever exposing the hash to a client.
+        unset resp.http.X-User-Context-Hash;
+    }
 }