El vie, 28-03-2008 a las 08:21 +0000, [EMAIL PROTECTED] escribió: > Author: lindner > Date: Fri Mar 28 01:21:48 2008 > New Revision: 642125 > > URL: http://svn.apache.org/viewvc?rev=642125&view=rev > Log: > Fix condition where an iframe URL had a v= param and nocache=1 param > insure nocache=1 takes precedence in this situation >
Just a heads up, specially for Kevin. Re- the guice patch pending to apply from SHINDIG-152 this change touches lines that are deleted there and copied into a new class. http://github.com/sgala/apache-incubator-shindig/commit/33b5b7caa54784cf9a8d3d599c2a91a8875c141a#diff-17 has the rebased version of the guice patch applied *moving* the corresponding hunk of this commit to GadgetRenderingTask.java. (unfortunately, while git detects the copying, it seems to be unable to apply the hunk to the destination alone during the merge) This is the offending hunk: > Modified: > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderer.java > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java > > Modified: > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderer.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderer.java?rev=642125&r1=642124&r2=642125&view=diff > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderer.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderer.java > Fri Mar 28 01:21:48 2008 > @@ -252,11 +252,12 @@ > markup.append(content) > .append("<script>gadgets.util.runOnLoadHandlers();</script>") > .append("</body></html>"); > - if (request.getParameter("v") != null) { > + > + if ("1".equals(request.getParameter("nocache"))) { > + HttpUtil.setCachingHeaders(response, 0); > + } else if (request.getParameter("v") != null) { > // Versioned files get cached indefinitely > HttpUtil.setCachingHeaders(response); > - } else if ("1".equals(request.getParameter("nocache"))) { > - HttpUtil.setCachingHeaders(response, 0); > } else { > // Unversioned files get cached for 5 minutes. > // TODO: This should be configurable > Regards -- Santiago Gala http://memojo.com/~sgala/blog/
