Author: michiel
Date: 2009-05-28 15:54:45 +0200 (Thu, 28 May 2009)
New Revision: 35472

Modified:
   
mmbase/trunk/applications/taglib/src/org/mmbase/bridge/jsp/taglib/ContentTag.java
   
mmbase/trunk/applications/taglib/src/org/mmbase/bridge/jsp/taglib/mmbase-taglib.xml
Log:
Added mm:content varies

Modified: 
mmbase/trunk/applications/taglib/src/org/mmbase/bridge/jsp/taglib/ContentTag.java
===================================================================
--- 
mmbase/trunk/applications/taglib/src/org/mmbase/bridge/jsp/taglib/ContentTag.java
   2009-05-28 13:34:06 UTC (rev 35471)
+++ 
mmbase/trunk/applications/taglib/src/org/mmbase/bridge/jsp/taglib/ContentTag.java
   2009-05-28 13:54:45 UTC (rev 35472)
@@ -282,6 +282,7 @@
     private Attribute expires        = Attribute.NULL;
     private Attribute unacceptable   = Attribute.NULL;
     private Attribute disposition    = Attribute.NULL;
+    private Attribute varies         = Attribute.NULL;
 
 
     public void setType(String ct) throws JspTagException {
@@ -309,6 +310,12 @@
     public void setDisposition(String d) throws JspTagException {
         disposition = getAttribute(d);
     }
+    /**
+     * @since MMBase-1.9.1
+     */
+    public void setVaries(String v) throws JspTagException {
+        varies = getAttribute(v);
+    }
 
 
     public String getType() throws JspTagException {
@@ -535,6 +542,13 @@
                     }
                 }
             }
+            String v = varies.getString(this);
+
+            if (!"".equals(v)) {
+                for (String vary : StringSplitter.split(v)) {
+                    addVary(vary);
+                }
+            }
             if (locale != null) {
                 response.setLocale(locale);
             }

Modified: 
mmbase/trunk/applications/taglib/src/org/mmbase/bridge/jsp/taglib/mmbase-taglib.xml
===================================================================
--- 
mmbase/trunk/applications/taglib/src/org/mmbase/bridge/jsp/taglib/mmbase-taglib.xml
 2009-05-28 13:34:06 UTC (rev 35471)
+++ 
mmbase/trunk/applications/taglib/src/org/mmbase/bridge/jsp/taglib/mmbase-taglib.xml
 2009-05-28 13:54:45 UTC (rev 35472)
@@ -6981,6 +6981,15 @@
       </example>
     </attribute>
     <attribute>
+      <name>varies</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <since>MMBase-1.9.1</since>
+      <info>
+        If using cache-headers, you want to add vary-headers too.
+      </info>
+    </attribute>
+    <attribute>
       <name>postprocessor</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>

_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to