[svn:mod_parrot] r472 - in mod_parrot/trunk: languages/perl6/lib/ModPerl6 src

Author: jhorwitz
Date: Thu Oct 23 12:58:20 2008
New Revision: 472

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

Log:
fix CGI environment variables


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	Thu Oct 23 12:58:20 2008
@@ -26,8 +26,10 @@
         %registry{$mod} = $script;
     }
 
-    %*ENV<QUERY_STRING> = $r.args();
-    %*ENV<REQUEST_METHOD> = $r.method();
+    # set environment variables expected by CGI scripts
+    # XXX binding (:=) works, but assigning (=) doesn't
+    %*ENV<QUERY_STRING> := $r.args();
+    %*ENV<REQUEST_METHOD> := $r.method();
 
     my $interp = ModParrot::Interpreter.new();
     $interp.capture_stdout(1);

Modified: mod_parrot/trunk/src/nci.c
==============================================================================
--- mod_parrot/trunk/src/nci.c	(original)
+++ mod_parrot/trunk/src/nci.c	Thu Oct 23 12:58:20 2008
@@ -239,6 +239,11 @@
     return cfg ? cfg->cfg : PMCNULL;
 }
  
+server_rec *mpnci_cmd_parms_server(Parrot_Interp interp, cmd_parms *cmd)
+{
+    return(cmd->server);
+}
+
 /* XXX still need this so HLLs can tweak mod_parrot configurations */
 #if 0
 #define SET_DIRCFG_INFO(x) if (update) { ctxp->dircfg->x = handler_info; } \