svn commit: r833838 - in /incubator/shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java test/java/org/apache/shindig/gadgets/servlet/ProxyBaseTest.java

[lindner]

Author: lindner
Date: Sun Nov  8 06:48:20 2009
New Revision: 833838

URL: http://svn.apache.org/viewvc?rev=833838&view=rev
Log:
SHINDIG-1019 | Proxied requests do not force a content-type on the response

Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyBaseTest.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java?rev=833838&r1=833837&r2=833838&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java
 Sun Nov  8 06:48:20 2009
@@ -140,6 +140,9 @@
     if 
(!"application/x-shockwave-flash".equalsIgnoreCase(results.getHeader("Content-Type")))
 {
       response.setHeader("Content-Disposition", "attachment;filename=p.txt");
     }
+    if (results.getHeader("Content-Type") == null) {
+      response.setHeader("Content-Type", "application/octet-stream");
+    }
   }
 
   protected void setRequestHeaders(HttpServletRequest servletRequest, 
HttpRequest req) {

Modified: 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyBaseTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyBaseTest.java?rev=833838&r1=833837&r2=833838&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyBaseTest.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyBaseTest.java
 Sun Nov  8 06:48:20 2009
@@ -164,6 +164,15 @@
     assertNull(recorder.getHeader("Content-Disposition"));
   }
 
+  public void testSetContentTypeHeader() throws Exception {
+    HttpResponse results = new HttpResponseBuilder()
+        .create();
+    replay();
+    proxy.setResponseHeaders(request, recorder, results);
+
+    assertEquals(recorder.getHeader("Content-Type"), 
"application/octet-stream");
+  }
+
   public void testSetResponseHeadersNoCache() throws Exception {
     Map<String, List<String>> headers = 
Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER);
     headers.put("Pragma", Arrays.asList("no-cache"));