From 7943d1dfc8a2c5f2b0633e7997cdff23daeb3981 Mon Sep 17 00:00:00 2001
From: marcelloc <marcellocoutinho@gmail.com>
Date: Sat, 20 Aug 2011 00:26:04 -0300
Subject: Per-user session cache, better static cache, new sync gui and bug
 fixes

---
 config/varnish64/varnish_settings.xml | 40 +++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/config/varnish64/varnish_settings.xml b/config/varnish64/varnish_settings.xml
index f697d284..fdbf91e2 100644
--- a/config/varnish64/varnish_settings.xml
+++ b/config/varnish64/varnish_settings.xml
@@ -42,7 +42,7 @@
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
 	<name>varnishsettings</name>
-	<version>0.0.5</version>
+	<version>0.0.6</version>
 	<title>Varnish Settings</title>
 	<aftersaveredirect>pkg_edit.php?xml=varnish_settings.xml&amp;id=0</aftersaveredirect>
 	<include_file>/usr/local/pkg/varnish.inc</include_file>
@@ -161,7 +161,7 @@
 			<fielddescr>BasicVCLLT</fielddescr>
 			<fieldname>BasicVCLLT</fieldname>
 			<type>listtopic</type>
-			<name>Basic VCL Settings</name>
+			<name>General VCL Settings</name>
 		</field>
 		<field>
 			<fielddescr>Client identity method</fielddescr>
@@ -174,12 +174,6 @@
 				<option><name>User Agent</name><value>agent</value></option>
 			</options>
 		</field>
-		<field>
-			<fielddescr>Don't cache sessions</fielddescr>
-			<fieldname>sessioncache</fieldname>
-			<description>Don't cache pages wiht JSESSION,PHPSESSID or nocache headers/cookies</description>
-			<type>checkbox</type>
-		</field>
 		<field>
 			<fielddescr>Don't cache posts</fielddescr>
 			<fieldname>postcache</fieldname>
@@ -187,15 +181,35 @@
 			<type>checkbox</type>
 		</field>
 		<field>
-			<fielddescr>Cache Images and css</fielddescr>
-			<fieldname>imagecache</fieldname>
-			<description>cache .css .js .gif .jpg .jpeg .bmp .png .ico .img .tga and .wmf files</description>
-			<type>checkbox</type>
+			<fielddescr>Session Cache</fielddescr>
+			<fieldname>sessioncache</fieldname>
+			<description><![CDATA[<strong>Never</strong> Don't cache anything with JSESSION,PHPSESSID set.<br>
+								<strong>Per User</strong><a href="https://www.varnish-cache.org/trac/wiki/VCLExampleCacheCookies"> This causes a lookup for a given object to include the Cookie.</a><br><br>								
+								Note: <strong>no-cache no-store private</strong> header directives are respected by default.]]></description>
+			<type>select</type>
+			<options>
+				<option><name>Never</name><value>never</value></option>
+				<option><name>Per User</name><value>user</value></option>
+			</options>
+		</field>
+		<field>
+			<fielddescr>Cache static content</fielddescr>
+			<fieldname>staticache</fieldname>
+			<description><![CDATA[cache images, css and javascript files (.css .js .txt .gif .jpg .jpeg .bmp .png .ico .img .tga and .wmf .mp3 .ogg)<BR>
+									<strong>Always</strong><a href="https://www.varnish-cache.org/trac/wiki/VCLExampleCacheCookies"> Cache all static content. When cookies are present, varnish will unset it from object before caching.</a><br>
+									<strong>Never</strong> Do not cache static content.<br>
+									<strong>When possible</strong> Cache only static content and per user objects when session cache is set to it.<br>]]></description>
+			<type>select</type>
+			<options>
+				<option><name>When Possible</name><value>yes</value></option>
+				<option><name>Always</name><value>all</value></option>
+				<option><name>Never</name><value>no</value></option>
+			</options>
 		</field>
 		<field>
 			<fielddescr>Fix gzip compression</fielddescr>
 			<fieldname>fixgzip</fieldname>
-			<description>Ignore compression in images files and unknow compression algorithm</description>
+			<description>Ignore compression for images files and unknow compression algorithm</description>
 			<type>checkbox</type>
 		</field>
 		<field>
-- 
cgit v1.2.3