[svn:mod_parrot] r513 - mod_parrot/trunk/languages/perl6/lib/ModPerl6

Author: jhorwitz
Date: Tue Dec  2 10:22:00 2008
New Revision: 513

Modified:
   mod_parrot/trunk/languages/perl6/lib/ModPerl6/Registry.pm

Log:
fix REQUEST_URI so it includes query string
add PATH_INFO


Modified: mod_parrot/trunk/languages/perl6/lib/ModPerl6/Registry.pm
==============================================================================
--- mod_parrot/trunk/languages/perl6/lib/ModPerl6/Registry.pm	(original)
+++ mod_parrot/trunk/languages/perl6/lib/ModPerl6/Registry.pm	Tue Dec  2 10:22:00 2008
@@ -36,9 +36,13 @@
 
     # set environment variables expected by CGI scripts
     # XXX binding (:=) works, but assigning (=) doesn't
+    my $args = $r.args();
+    my $uri = $args ?? ($r.uri() ~ '?' ~ $args) !! $r.uri();
     %*ENV<MODPERL6> := 1;
-    %*ENV<QUERY_STRING> := $r.args();
+    %*ENV<QUERY_STRING> := $args;
+    %*ENV<PATH_INFO> := $r.path_info();
     %*ENV<REQUEST_METHOD> := $r.method();
+    %*ENV<REQUEST_URI> := $uri;
     %*ENV<CONTENT_LENGTH> := $content_length;
     %*ENV<HTTP_COOKIE> := $cookies;
     %*ENV<SERVER_NAME> := $r.hostname;