- added encoding scheme to 'URLDecoder.decode'.

- added '.png' and '.scala' extension in 'guessContentTypeFromName'.

1 files changed, 22 insertions, 10 deletions

diff --git a/sources/scala/tools/scaladoc/HTTPServer.java b/sources/scala/tools/scaladoc/HTTPServer.java
index f466696064..c87b2a119d 100755
--- a/sources/scala/tools/scaladoc/HTTPServer.java
+++ b/sources/scala/tools/scaladoc/HTTPServer.java
@@ -155,6 +155,8 @@ public class HTTPServer extends Thread {
 
 class RequestProcessor implements Runnable {
 
+    private final static String ENCODING_SCHEME = "UTF-8";
+
     private static List pool = new LinkedList();
     private File documentRootDirectory;
     private String indexFileName = "index.html";
@@ -192,17 +194,22 @@ class RequestProcessor implements Runnable {
      */
     public static Map parseQuery(String query) {
         Map map = new HashMap();
-        String[] bindings = query.split("\\&");
-        String regexp = "([^=]*)=([^=]*)";
-        Pattern p = Pattern.compile(regexp);
-        for(int i = 0; i < bindings.length; i++) {
-            Matcher m = p.matcher(bindings[i]);
-            if (m.find()) {
-                String key = URLDecoder.decode(m.group(1));
-                String value = URLDecoder.decode(m.group(2));
-                map.put(key, value);
+        try {
+            String[] bindings = query.split("\\&");
+            String regexp = "([^=]*)=([^=]*)";
+            Pattern p = Pattern.compile(regexp);
+            for (int i = 0; i < bindings.length; i++) {
+                Matcher m = p.matcher(bindings[i]);
+                if (m.find()) {
+                    String key = URLDecoder.decode(m.group(1), ENCODING_SCHEME);
+                    String value = URLDecoder.decode(m.group(2), ENCODING_SCHEME);
+                    map.put(key, value);
+                }
             }
         }
+        catch (UnsupportedEncodingException e) {
+            System.out.println("Une exception: " + e);
+        }
         return map;
     }
 
@@ -367,7 +374,9 @@ class RequestProcessor implements Runnable {
         if (name.endsWith(".html") || name.endsWith(".htm")) {
             return "text/html";
         }
-        else if (name.endsWith(".txt") || name.endsWith(".java")) {
+        else if (name.endsWith(".txt") ||
+                 name.endsWith(".java") ||
+                 name.endsWith(".scala")) {
             return "text/plain";
         }
         else if (name.endsWith(".gif")) {
@@ -379,6 +388,9 @@ class RequestProcessor implements Runnable {
         else if (name.endsWith(".jpg") || name.endsWith(".jpeg")) {
             return "image/jpeg";
         }
+        else if (name.endsWith(".png")) {
+            return "image/png";
+        }
         else return "text/plain";
     }