svn commit: r660775 - /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java

[et...@apache.org]

Author: etnu
Date: Tue May 27 18:45:13 2008
New Revision: 660775

URL: http://svn.apache.org/viewvc?rev=660775&view=rev
Log:
Re-inserted header pass through (note to self: add unit tests for the handler header output).


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

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java?rev=660775&r1=660774&r2=660775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java Tue May 27 18:45:13 2008
@@ -85,6 +85,10 @@
     DISALLOWED_RESPONSE_HEADERS.add("last-modified");
     DISALLOWED_RESPONSE_HEADERS.add("accept-ranges");
     DISALLOWED_RESPONSE_HEADERS.add("vary");
+    DISALLOWED_RESPONSE_HEADERS.add("expires");
+    DISALLOWED_RESPONSE_HEADERS.add("date");
+    DISALLOWED_RESPONSE_HEADERS.add("pragma");
+    DISALLOWED_RESPONSE_HEADERS.add("cache-control");
   }
 
   // This isn't a final field because we want to support optional injection.
@@ -321,6 +325,15 @@
     }
     HttpUtil.setCachingHeaders(response, refreshInterval);
 
+    for (Map.Entry<String, List<String>> entry : results.getAllHeaders().entrySet()) {
+      String name = entry.getKey();
+      if (!DISALLOWED_RESPONSE_HEADERS.contains(name.toLowerCase())) {
+        for (String value : entry.getValue()) {
+          response.addHeader(name, value);
+        }
+      }
+    }
+
     response.getOutputStream().write(IOUtils.toByteArray(results.getResponse()));
   }