[Gzz-commits] storm/org/nongnu/storm/util HTTPProxy.java

[Benja Fallenstein]

CVSROOT:        /cvsroot/storm
Module name:    storm
Changes by:     Benja Fallenstein <address@hidden>      03/05/25 17:28:12

Modified files:
        org/nongnu/storm/util: HTTPProxy.java 

Log message:
        Fix gateway to understand URL-encoded Storm URNs.
        Since many HTTP clients do URL escaping in various places--
        which one cannot hold against them-- we need to be able
        to handle it. Konq does escaping when loading stuff from
        bookmarks, and emacs/eldav does it always for commas apparently.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/util/HTTPProxy.java.diff?tr1=1.42&tr2=1.43&r1=text&r2=text

Patches:
Index: storm/org/nongnu/storm/util/HTTPProxy.java
diff -u storm/org/nongnu/storm/util/HTTPProxy.java:1.42 
storm/org/nongnu/storm/util/HTTPProxy.java:1.43
--- storm/org/nongnu/storm/util/HTTPProxy.java:1.42     Sat May 24 10:56:25 2003
+++ storm/org/nongnu/storm/util/HTTPProxy.java  Sun May 25 17:28:12 2003
@@ -97,7 +97,7 @@
                                     HTTPResponse.Factory resf) throws 
IOException {
            try {
                boolean rewrite = false, backlinks = false;
-               String uri = req.getRequestURI();                               
                
+               String uri = req.getRequestURI();
                if(HTTPProxy.dbg) p("<"+port+"> GET: "+uri + " (" + 
this.getRemoteIPAddress() + ")");
 
                /* URN proxy requests don't start with slash */
@@ -133,6 +133,7 @@
 
                /* At this point, only the block URN is left of URL */
 
+               uri = URLDecoder.decode(uri);
                BlockId id = getBlockId(uri);
 
                if((!rewrite && !backlinks) || 
@@ -420,6 +421,9 @@
 
            if(!acceptPut)
                return doUnknown(req, resf);
+
+           if(uri.startsWith("/"))
+               uri = uri.substring(1);
 
            if(dbg) p("PUT accepted");
            PointerId id = new PointerId(uri);