Merge branch '2.4' into 2.5

weaverryan · weaverryan · commit b879ad7fcd16 · 2014-06-13T06:28:32.000-05:00
diff --git a/contributing/documentation/license.rst b/contributing/documentation/license.rst
@@ -32,13 +32,13 @@ Attribution-Share Alike 3.0 Unported `License`_.
 * *Other Rights* — In no way are any of the following rights affected by the
   license:
 
-    * Your fair dealing or fair use rights, or other applicable copyright
-      exceptions and limitations;
+  * Your fair dealing or fair use rights, or other applicable copyright exceptions
+    and limitations;
 
-    * The author's moral rights;
+  * The author's moral rights;
 
-    * Rights other persons may have either in the work itself or in how
-      the work is used, such as publicity or privacy rights.
+  * Rights other persons may have either in the work itself or in how the
+    work is used, such as publicity or privacy rights.
 
 * *Notice* — For any reuse or distribution, you must make clear to others
   the license terms of this work. The best way to do this is with a link
diff --git a/cookbook/cache/varnish.rst b/cookbook/cache/varnish.rst
@@ -57,6 +57,14 @@ Symfony2 adds automatically:
             // For Varnish < 3.0
             // esi;
         }
+        /* By default Varnish ignores Cache-Control: nocache 
+        (https://www.varnish-cache.org/docs/3.0/tutorial/increasing_your_hitrate.html#cache-control),
+        so in order avoid caching it has to be done explicitly */
+        if (beresp.http.Pragma ~ "no-cache" ||
+             beresp.http.Cache-Control ~ "no-cache" ||
+             beresp.http.Cache-Control ~ "private") {
+            return (hit_for_pass);
+        }
     }
 
 .. caution::

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,14 @@ Symfony2 adds automatically:`
`57`	`57`	`// For Varnish < 3.0`
`58`	`58`	`// esi;`
`59`	`59`	`}`
	`60`	`+ /* By default Varnish ignores Cache-Control: nocache`
	`61`	`+ (https://www.varnish-cache.org/docs/3.0/tutorial/increasing_your_hitrate.html#cache-control),`
	`62`	`+ so in order avoid caching it has to be done explicitly */`
	`63`	`+ if (beresp.http.Pragma ~ "no-cache" \|\|`
	`64`	`+ beresp.http.Cache-Control ~ "no-cache" \|\|`
	`65`	`+ beresp.http.Cache-Control ~ "private") {`
	`66`	`+ return (hit_for_pass);`
	`67`	`+ }`
`60`	`68`	`}`
`61`	`69`
`62`	`70`	`.. caution::`