toss-devel-svn

[Toss-devel-svn] SF.net SVN: toss:[1441] trunk/Toss/Server/ReqHandler.ml

[<luk...@us...>]

Revision: 1441
          http://toss.svn.sourceforge.net/toss/?rev=1441&view=rev
Author:   lukaszkaiser
Date:     2011-05-14 14:30:21 +0000 (Sat, 14 May 2011)

Log Message:
-----------
Small correction: handle params in GET urls (make toss.sourceforge.net games work again).

Modified Paths:
--------------
    trunk/Toss/Server/ReqHandler.ml

Modified: trunk/Toss/Server/ReqHandler.ml
===================================================================
--- trunk/Toss/Server/ReqHandler.ml	2011-05-13 23:33:56 UTC (rev 1440)
+++ trunk/Toss/Server/ReqHandler.ml	2011-05-14 14:30:21 UTC (rev 1441)
@@ -389,7 +389,9 @@
       Printf.printf "Cookies: %s\n%!" (String.concat "; " ck_strs);
   );
   let fname_in0 = String.sub cmd 5 ((String.index_from cmd 5 ' ') - 5) in
-  let fname_in = if fname_in0 = "" then "index.html" else fname_in0 in
+  let fname_in1 = if fname_in0 = "" then "index.html" else fname_in0 in
+  let fname_in = try String.sub fname_in1 0 (String.index fname_in1 '?')
+    with Not_found -> fname_in1 in
   let fname = !html_dir_path ^ fname_in in
   if !debug_level > 1 then Printf.printf "SERVING FILE: %s;\n%!" fname;
   if Sys.file_exists fname then (


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Toss-devel-svn] SF.net SVN: toss:[1506] trunk/Toss/Server/ReqHandler.ml

[<luk...@us...>]

Revision: 1506
          http://toss.svn.sourceforge.net/toss/?rev=1506&view=rev
Author:   lukaszkaiser
Date:     2011-07-06 22:13:35 +0000 (Wed, 06 Jul 2011)

Log Message:
-----------
Small stability bug.

Modified Paths:
--------------
    trunk/Toss/Server/ReqHandler.ml

Modified: trunk/Toss/Server/ReqHandler.ml
===================================================================
--- trunk/Toss/Server/ReqHandler.ml	2011-07-06 20:07:16 UTC (rev 1505)
+++ trunk/Toss/Server/ReqHandler.ml	2011-07-06 22:13:35 UTC (rev 1506)
@@ -731,7 +731,7 @@
       if line_in = "" || line_in = "\r" then 
 	try nonempty () with End_of_file -> "" 
       else line_in in
-    try nonempty () with Sys_error _ -> "" in
+    try nonempty () with Sys_blocked_io | Sys_error _ -> "" in
   let line_in_len = String.length line_in in
   if line_in_len = 0 then ("", None) else
   (* TODO: who needs escaping? *)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.