You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by lr...@apache.org on 2008/05/28 08:30:37 UTC
svn commit: r660831 - in
/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet:
ConcatProxyServlet.java ProxyHandler.java
Author: lryan
Date: Tue May 27 23:30:37 2008
New Revision: 660831
URL: http://svn.apache.org/viewvc?rev=660831&view=rev
Log:
Fixes for concat when doing if-modified-since check
Allow force of mime-type onto response.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
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/ConcatProxyServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java?rev=660831&r1=660830&r2=660831&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java Tue May 27 23:30:37 2008
@@ -53,6 +53,10 @@
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException {
+ if (request.getHeader("If-Modified-Since") != null) {
+ response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+ return;
+ }
ResponseWrapper wrapper = new ResponseWrapper(response);
for (int i = 1; i < Integer.MAX_VALUE; i++) {
String url = request.getParameter(Integer.toString(i));
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=660831&r1=660830&r2=660831&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 23:30:37 2008
@@ -18,6 +18,8 @@
*/
package org.apache.shindig.gadgets.servlet;
+import com.google.inject.Inject;
+
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.common.SecurityTokenDecoder;
import org.apache.shindig.common.SecurityTokenException;
@@ -31,10 +33,6 @@
import org.apache.shindig.gadgets.rewrite.ContentRewriter;
import org.apache.shindig.gadgets.spec.Auth;
import org.apache.shindig.gadgets.spec.Preload;
-
-import com.google.inject.Inject;
-
-import org.apache.commons.io.IOUtils;
import org.json.JSONException;
import org.json.JSONObject;
@@ -334,7 +332,11 @@
}
}
- response.getOutputStream().write(IOUtils.toByteArray(results.getResponse()));
+ if (rcr.getOptions().rewriteMimeType != null) {
+ response.setContentType(rcr.getOptions().rewriteMimeType);
+ }
+
+ response.getOutputStream().write(results.getResponseAsBytes());
}
/**