svn commit: r780194 - in /incubator/shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java

[johnh]

Author: johnh
Date: Sat May 30 07:17:08 2009
New Revision: 780194

URL: http://svn.apache.org/viewvc?rev=780194&view=rev
Log:
Don't decode chained-proxy-syntax URL param. All chained proxy syntax 
expansions should end in %rawurl%.


Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java?rev=780194&r1=780193&r2=780194&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java
 Sat May 30 07:17:08 2009
@@ -58,7 +58,7 @@
                                 Utf8UrlCoder.decode(paramMatcher.group(2)));
       }
 
-      String urlParam = Utf8UrlCoder.decode(chainedMatcher.group(2));
+      String urlParam = chainedMatcher.group(2);
       if (request.getQueryString() != null) {
         urlParam += "?" + request.getQueryString();
       }

Modified: 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java?rev=780194&r1=780193&r2=780194&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletRequestTest.java
 Sat May 30 07:17:08 2009
@@ -72,12 +72,12 @@
     verify();
   }
 
-  public void testChainedSyntaxWithParameters() throws Exception {
+  public void testChainedSyntaxWithParametersDontDecode() throws Exception {
     ProxyServletRequest req = setupMockRequest(
-      
"http://u:p...@127.0.0.1:80/g/proxy/a=b%20+c&url=u/http://r/p%3Fa%3Dd%2Be";
+      "http://u:p...@127.0.0.1:80/g/proxy/a=b%20+c&url=u/http://r/p%3Fa+e";
     );
     assertTrue(req.isUsingChainedSyntax());
-    assertEquals("http://r/p?a=d+e";, req.getParameter("url"));
+    assertEquals("http://r/p%3Fa+e";, req.getParameter("url"));
     assertEquals("b  c", req.getParameter("a"));
     verify();
   }