[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.7-371-g09c4707

[? sunnavy]

The branch, 3.8-trunk has been updated
       via  09c47071ef4c1177ca37ee541c3bdb26b5ae13ea (commit)
      from  03e2097232a79458cefa2d12fa715f2199f4c876 (commit)

Summary of changes:
 bin/webmux.pl.in |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

- Log -----------------------------------------------------------------
commit 09c47071ef4c1177ca37ee541c3bdb26b5ae13ea
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu May 6 14:38:29 2010 +0800

    localize env for mod_perl

diff --git a/bin/webmux.pl.in b/bin/webmux.pl.in
index 50b959a..5e8596c 100755
--- a/bin/webmux.pl.in
+++ b/bin/webmux.pl.in
@@ -47,6 +47,11 @@
 # 
 # END BPS TAGGED BLOCK }}}
 use strict;
+local $ENV{'PATH'}   = '/bin:/usr/bin';                   # or whatever you need
+local $ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
+local $ENV{'SHELL'}  = '/bin/sh' if defined $ENV{'SHELL'};
+local $ENV{'ENV'}    = '' if defined $ENV{'ENV'};
+local $ENV{'IFS'}    = '' if defined $ENV{'IFS'};
 
 package HTML::Mason::Commands;
 our %session;
@@ -94,17 +99,8 @@ BEGIN {
         and $ENV{'MOD_PERL'} =~ m{mod_perl/(?:1\.9)};
 }
 
-BEGIN {
-    $ENV{'PATH'}   = '/bin:/usr/bin'; # or whatever you need
-    $ENV{'CDPATH'} = '' if defined $ENV{'CDPATH'};
-    $ENV{'SHELL'}  = '/bin/sh' if defined $ENV{'SHELL'};
-    $ENV{'ENV'}    = '' if defined $ENV{'ENV'};
-    $ENV{'IFS'}    = '' if defined $ENV{'IFS'};
-
-    # bring this in before mason, to make sure we
-    # use private tempfiles
-    use CGI qw(-private_tempfiles);
-}
+require CGI;
+CGI->import(qw(-private_tempfiles));
 
 # fix lib paths, some may be relative
 BEGIN {

-----------------------------------------------------------------------