cvs commit: modperl-2.0/src/modules/perl mod_perl.c

[dougm]

dougm       02/01/06 13:39:36

  Modified:    src/modules/perl mod_perl.c
  Log:
  only tie/untie STD{OUT,IN} and %ENV in the main request
  
  Revision  Changes    Path
  1.102     +10 -6     modperl-2.0/src/modules/perl/mod_perl.c
  
  Index: mod_perl.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
  retrieving revision 1.101
  retrieving revision 1.102
  diff -u -r1.101 -r1.102
  --- mod_perl.c        6 Jan 2002 20:45:35 -0000       1.101
  +++ mod_perl.c        6 Jan 2002 21:39:36 -0000       1.102
  @@ -640,17 +640,21 @@
           modperl_env_request_populate(aTHX_ r);
       }
   
  -    h_stdout = modperl_io_tie_stdout(aTHX_ r);
  -    h_stdin  = modperl_io_tie_stdin(aTHX_ r);
  +    if (!r->main) {
  +        h_stdout = modperl_io_tie_stdout(aTHX_ r);
  +        h_stdin  = modperl_io_tie_stdin(aTHX_ r);
   
  -    modperl_env_request_tie(aTHX_ r);
  +        modperl_env_request_tie(aTHX_ r);
  +    }
   
       retval = modperl_response_handler_run(r, FALSE);
   
  -    modperl_io_handle_untie(aTHX_ h_stdout);
  -    modperl_io_handle_untie(aTHX_ h_stdin);
  +    if (!r->main) {
  +        modperl_io_handle_untie(aTHX_ h_stdout);
  +        modperl_io_handle_untie(aTHX_ h_stdin);
   
  -    modperl_env_request_untie(aTHX_ r);
  +        modperl_env_request_untie(aTHX_ r);
  +    }
   
       modperl_perl_global_request_restore(aTHX_ r);