Changeset 8d6a125 for apps/jetty

Timestamp:

Dec 19, 2010 12:19:26 AM (10 years ago)

Author:

sponge <sponge@…>

Branches:

master

Children:

4622080e

Parents:

f8ed3c5

Message:

Fix URI.java, add FileResource?.java

Location:

apps/jetty/java/src/org/mortbay/util

Files:

• FileResource.java (added)
• URI.java (modified) (6 diffs)

apps/jetty/java/src/org/mortbay/util/URI.java

@@ -54 +54 @@
     private UrlEncoded _parameters;
     private boolean _dirty;
+    private static String unreserved = "/0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_.~";
+    private static String reserved = "!*'();:@&=+$,?%#[]";
+    private static String hexchars = "0123456789ABCDEF";
     
     /* ------------------------------------------------------------ */
@@ -238 +241 @@
                     _parameters.clear();
                 _parameters.decode(_query,__CHARSET);
+                
             }
             else
@@ -567 +571 @@
     public static StringBuffer encodePath(StringBuffer buf, String path)
     {
-        if (buf==null)
-        {
-        loop:
-            for (int i=0;i<path.length();i++)
-            {
-                char c=path.charAt(i);
-                switch(c)
-                {
-                  case '%':
-                  case '?':
-                  case ';':
-                  case '#':
-                  case ' ':
-                      buf=new StringBuffer(path.length()<<1);
-                      break loop;
+        // Convert path to native first.
+        byte[] b = null;
+        /*
+        try {
+            b = path.getBytes(__CHARSET);
+        } catch(UnsupportedEncodingException ex) {
+            return null; // Shouldn't be possible.
+        }
+        */
+        b = path.getBytes();
+        StringBuffer x = new StringBuffer(b.length);
+        for(int i=0; i<b.length; i++) {
+            x.append((char)(b[i]&0xff));
+        }
+        String _path = new String(x);
+        if(buf == null) {
+            loop:
+            for(int i = 0; i < _path.length(); i++) {
+                char c = _path.charAt(i);
+                String cs = "" + c;
+                if(reserved.contains(cs) || !unreserved.contains(cs)) {
+                    buf = new StringBuffer(_path.length() << 1);
+                    break loop;
                 }
             }
-            if (buf==null)
+            if(buf == null) {
                 return null;
-        }
-        
-        synchronized(buf)
-        {
-            for (int i=0;i<path.length();i++)
-            {
-                char c=path.charAt(i);       
-                switch(c)
-                {
-                  case '%':
-                      buf.append("%25");
-                      continue;
-                  case '?':
-                      buf.append("%3F");
-                      continue;
-                  case ';':
-                      buf.append("%3B");
-                      continue;
-                  case '#':
-                      buf.append("%23");
-                      continue;
-                  case ' ':
-                      buf.append("%20");
-                      continue;
-                  default:
-                      buf.append(c);
-                      continue;
+            }
+        }
+        synchronized(buf) {
+            for(int i = 0; i < _path.length(); i++) {
+                char c = _path.charAt(i);
+                String cs = "" + c;
+                if(reserved.contains(cs) || !unreserved.contains(cs)) {
+                    if((c & 0xff) == c) {
+                        buf.append(gethex(c & 0xff));
+                    } else {
+                        buf.append(gethex((c >> 8) & 0xff));
+                        buf.append(gethex(c & 0xff));
+                    }
+                } else {
+                    buf.append(c);
                 }
             }
@@ -620 +620 @@
     }
     
+    /**
+     *
+     * @param decimal value not greater than 255.
+     * @return a percent sign followed by two hexadecimal digits.
+     */
+    private static String gethex(int decimal) {
+        return new String("%" + hexchars.charAt(decimal >> 4) + hexchars.charAt(decimal & 0xF));
+    }
     /* ------------------------------------------------------------ */
     /** Encode a URI path.
@@ -709 +717 @@
             return path;
 
+        /*
         try
         {    
@@ -718 +727 @@
             return new String(bytes,0,n);
         }
+        */
+        
+        return new String(bytes,0,n);
+        
     }