svn commit: r944443 - in /shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet: ProxyBase.java ProxyHandler.java

[zhoresh]

Author: zhoresh
Date: Fri May 14 20:15:34 2010
New Revision: 944443

URL: http://svn.apache.org/viewvc?rev=944443&view=rev
Log: (empty)

Modified:
    
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java
    
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java

Modified: 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java?rev=944443&r1=944442&r2=944443&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java
 Fri May 14 20:15:34 2010
@@ -129,6 +129,11 @@ public abstract class ProxyBase {
       refreshInterval = Math.max(60 * 60, (int)(results.getCacheTtl() / 
1000L));
     }
     HttpUtil.setCachingHeaders(response, refreshInterval);
+    setResponseContentHeaders(response, results);
+
+  }
+  
+  protected void setResponseContentHeaders(HttpServletResponse response, 
HttpResponse results) {
 
     // We're skipping the content disposition header for flash due to an issue 
with Flash player 10
     // This does make some sites a higher value phishing target, but this can 
be mitigated by

Modified: 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java?rev=944443&r1=944442&r2=944443&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
 Fri May 14 20:15:34 2010
@@ -161,7 +161,7 @@ public class ProxyHandler extends ProxyB
       }
     }
 
-    setResponseHeaders(request, response, results);
+    setResponseContentHeaders(response, results);
 
     if (results.getHttpStatusCode() != HttpResponse.SC_OK) {
       if (results.getHttpStatusCode() == 
HttpResponse.SC_INTERNAL_SERVER_ERROR) {