xitiomet / placebohttp / changeset / 76efabe6b8ff — bitbucket.org

xitiomet / placebohttp (http://openstatic.org/)

Embeded Http server for gcj/java applications. PlaceboHttp uses an automatic session management system, Treating each session as a HttpRequest queue.

Clone this repository (size: 135.2 KB): HTTPS / SSH

$ hg clone http://hg.openstatic.org/placebohttp

$ hg clone ssh://hg@bitbucket.org/xitiomet/placebohttp

commit 33:	76efabe6b8ff
parent 32:	1e684995023a
branch:	default

fixed path parsing alot

Changed (Δ618 bytes):

raw changeset »

.hgignore (binary file changed)

README (binary file changed)

compile.cmd (binary file changed)

manifest.mf (binary file changed)

src/org/json/CDL.java (binary file changed)

src/org/json/Cookie.java (binary file changed)

src/org/json/CookieList.java (binary file changed)

src/org/json/HTTP.java (binary file changed)

src/org/json/HTTPTokener.java (binary file changed)

src/org/json/JSONArray.java (binary file changed)

src/org/json/JSONException.java (binary file changed)

src/org/json/JSONML.java (binary file changed)

src/org/json/JSONObject.java (binary file changed)

src/org/json/JSONString.java (binary file changed)

src/org/json/JSONStringer.java (binary file changed)

src/org/json/JSONTokener.java (binary file changed)

src/org/json/JSONWriter.java (binary file changed)

src/org/json/Test.java (binary file changed)

src/org/json/XML.java (binary file changed)

src/org/json/XMLTokener.java (binary file changed)

src/org/openstatic/placebo/ControlPanel.java (binary file changed)

src/org/openstatic/placebo/CoreServer.java (26 lines added, 9 lines removed)

src/org/openstatic/util/JSONUtil.java (binary file changed)

src/org/openstatic/util/JTextAreaOutputStream.java (binary file changed)

www/idx2.gif (binary file changed)

www/placebo.png (binary file changed)

Up to file-list .hgignore:

Binary file has changed or diff was empty.

Up to file-list README:

Binary file has changed or diff was empty.

Up to file-list compile.cmd:

Binary file has changed or diff was empty.

Up to file-list manifest.mf:

Binary file has changed or diff was empty.

Up to file-list src/org/json/CDL.java:

Binary file has changed or diff was empty.

Binary file has changed or diff was empty.

Up to file-list src/org/json/CookieList.java:

Binary file has changed or diff was empty.

Up to file-list src/org/json/HTTP.java:

Binary file has changed or diff was empty.

Up to file-list src/org/json/HTTPTokener.java:

Binary file has changed or diff was empty.

Up to file-list src/org/json/JSONArray.java:

Binary file has changed or diff was empty.

Up to file-list src/org/json/JSONException.java:

Binary file has changed or diff was empty.

Up to file-list src/org/json/JSONML.java:

Binary file has changed or diff was empty.

Up to file-list src/org/json/JSONObject.java:

Binary file has changed or diff was empty.

Up to file-list src/org/json/JSONString.java:

Binary file has changed or diff was empty.

Up to file-list src/org/json/JSONStringer.java:

Binary file has changed or diff was empty.

Up to file-list src/org/json/JSONTokener.java:

Binary file has changed or diff was empty.

Up to file-list src/org/json/JSONWriter.java:

Binary file has changed or diff was empty.

Up to file-list src/org/json/Test.java:

Binary file has changed or diff was empty.

Up to file-list src/org/json/XML.java:

Binary file has changed or diff was empty.

Up to file-list src/org/json/XMLTokener.java:

Binary file has changed or diff was empty.

Up to file-list src/org/openstatic/placebo/ControlPanel.java:

Binary file has changed or diff was empty.

Up to file-list src/org/openstatic/placebo/CoreServer.java:

@@ -47,6 +47,20 @@ public class CoreServer extends Thread
             addPlugin(key, plugin_list.get(key));
+        }
+    }
     private String resolve_index(String path)
+    {
         String new_path = path;
         if (path.endsWith("/"))
+        {
             new_path = path + "index.html";
+        }
         if (path.endsWith("."))
+        {
             new_path = path + "/index.html";
+        }
         return new_path;
+    }
     public void addPlugin(String path, String class_name)
+    {
@@ -158,13 +172,7 @@ public class CoreServer extends Thread
                     // create new response object
                     HttpResponse response = new HttpResponse();
                     String path = web_root + request.getPath();
                     // add index to the path if needed
                     if (path.endsWith("/"))
+                    {
                         path += "index.html";
+                    }
+                    server.logln("Possible Resource [" + path + "]");
                     // this wacky thing is for finding out if we are inside a zip
                     // and retrieving the proper content.
                     StringTokenizer path_tokens = new StringTokenizer(path, "/");
@@ -202,9 +210,18 @@ public class CoreServer extends Thread
                         // are we done traveling the path
                         if (!path_tokens.hasMoreTokens())
+                        {
                             // if the original path had a trailing slash, so should the final
                             if (path.endsWith("/"))
+                            {
                                 if (in_file)
+                                {
                                     path_inside_file.append("/");
+                                }
                                 new_path.append("/");
+                            }
                             try
+                            {
-                                String file_internal_path = path_inside_file.toString();
+                                String file_internal_path = resolve_index(path_inside_file.toString());
                                 if (in_file && !"".equals(file_internal_path))
                                 { // we are in a path that requires special processing
@@ -247,7 +264,7 @@ public class CoreServer extends Thread
+                                    }
                                 } else { // we just have a normal file to serve
-                                    String file_final_path = new_path.toString();
+                                    String file_final_path = resolve_index(new_path.toString());
                                     server.logln("File: " + file_final_path);
                                     response.setData(new File(file_final_path));
+                                }

Up to file-list src/org/openstatic/util/JSONUtil.java:

Binary file has changed or diff was empty.

Up to file-list src/org/openstatic/util/JTextAreaOutputStream.java:

Binary file has changed or diff was empty.

Up to file-list www/idx2.gif:

Binary file has changed or diff was empty.

Up to file-list www/placebo.png:

Binary file has changed or diff was empty.