From a2c8476cff6143e7876869bb51a9c5af5ba35525 Mon Sep 17 00:00:00 2001 From: ygrek Date: Mon, 21 Sep 2009 10:25:58 +0300 Subject: [PATCH] tweak for fcgi --- request.ml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/request.ml b/request.ml index 7f7c67a..f3a7aa2 100644 --- a/request.ml +++ b/request.ml @@ -26,7 +26,10 @@ let main is_cgi (cgi:cgi) = let html = page#render (cgi#arguments:> list) in `Content (if is_cgi then XHTML.M.rewrite_hrefs (prefix env#cgi_script_name) html else html) with - Page.Redirect path -> `Redirect (sprintf "%s%s" (cgi#url ~with_path_info:`None ~with_query_string:`None ()) path) + Page.Redirect path -> + `Redirect (sprintf "%s%s" + (cgi#url ~with_script_name:(if is_cgi then `Env else `None) ~with_path_info:`None ~with_query_string:`None ()) + path) in let dump_cgi () = @@ -39,7 +42,7 @@ let main is_cgi (cgi:cgi) = List.iter (fun x -> out "%s = %s\n" x#name x#value) cgi#arguments in - let path = if is_cgi then env#cgi_path_info else env#cgi_property "REQUEST_URI" in + let path = if is_cgi then env#cgi_path_info else env#cgi_script_name in let path = match path with "" -> "/" | s -> s in match catch (Page.resolve (Page.main:>Page.base)) path with -- 2.11.4.GIT