Commitb879ad7

committed

Merge branch '2.4' into 2.5

2 parentsb7a03f8 +3f0c9ea commitb879ad7Copy full SHA for b879ad7

File tree

+13

-5

lines changed

+13

-5

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -32,13 +32,13 @@ Attribution-Share Alike 3.0 Unported `License`_.
`32`	`32`	`* Other Rights — In no way are any of the following rights affected by the`
`33`	`33`	`license:`
`34`	`34`
`35`		`-* Your fair dealing or fair use rights, or other applicable copyright`
`36`		`- exceptionsand limitations;`
	`35`	`+ * Your fair dealing or fair use rights, or other applicable copyright exceptions`
	`36`	`+ and limitations;`
`37`	`37`
`38`		`-* The author's moral rights;`
	`38`	`+ * The author's moral rights;`
`39`	`39`
`40`		`-* Rights other persons may have either in the work itself or in how`
`41`		`- thework is used, such as publicity or privacy rights.`
	`40`	`+ * Rights other persons may have either in the work itself or in how the`
	`41`	`+ work is used, such as publicity or privacy rights.`
`42`	`42`
`43`	`43`	`* Notice — For any reuse or distribution, you must make clear to others`
`44`	`44`	`the license terms of this work. The best way to do this is with a link`

Lines changed: 8 additions & 0 deletions

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::`

Comments

(0)