Changeset 1563

Timestamp:

12/24/08 00:22:13 (3 years ago)

Author:

GilmarSantosJr

Message:

Item6042: hack to force execution under -T switch. Fixed a warning about empty $ENV{PATH_INFO}

Location:

trunk/FastCGIEngineContrib

Files:

• bin/foswiki.fcgi (modified) (4 diffs)
• lib/Foswiki/Engine/FastCGI.pm (modified) (5 diffs)

trunk/FastCGIEngineContrib/bin/foswiki.fcgi

@@ -1 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 # Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
@@ -25 +25 @@
 
 use strict;
-use warnings;
 
 BEGIN {
     $Foswiki::cfg{Engine} = 'Foswiki::Engine::FastCGI';
-    @INC = ('.', grep { $_ ne '.' } @INC);
+    @INC = ( '.', grep { $_ ne '.' } @INC );
     delete $ENV{FOSWIKI_ACTION} if exists $ENV{FOSWIKI_ACTION};
     require 'setlib.cfg';
@@ -36 +35 @@
 use Getopt::Long;
 use Pod::Usage;
+use Foswiki;
+use Foswiki::UI;
+
+eval { eval substr($0, 0, 0) };
+Foswiki::Engine::FastCGI::reExec() unless $@;
 
 my ( $listen, $nproc, $pidfile, $manager, $detach, $help );
@@ -49 +53 @@
 pod2usage(1) if $help;
 
-use Foswiki;
-use Foswiki::UI;
-
 $Foswiki::engine->run(
     $listen,
-    {   nproc         => $nproc,
-        pidfile       => $pidfile,
-        manager       => $manager,
-        detach        => $detach,
+    {
+        nproc   => $nproc,
+        pidfile => $pidfile,
+        manager => $manager,
+        detach  => $detach,
     }
 );

trunk/FastCGIEngineContrib/lib/Foswiki/Engine/FastCGI.pm

@@ -35 +35 @@
 
 use FCGI;
-use IO::Handle;
 
 sub run {
@@ -41 +40 @@
 
     my $sock = 0;
-    if ( $listen ) {
-        $sock = FCGI::OpenSocket( $listen, 100)
+    if ($listen) {
+        $sock = FCGI::OpenSocket( $listen, 100 )
           or die "Failed to create FastCGI socket: $!";
     }
     my %env = ();
     $args ||= {};
-    my $r = FCGI::Request( \*STDIN, \*STDOUT, \*STDERR, \%ENV, $sock, &FCGI::FAIL_ACCEPT_ON_INTR);
+    my $r = FCGI::Request( \*STDIN, \*STDOUT, \*STDERR, \%ENV, $sock,
+        &FCGI::FAIL_ACCEPT_ON_INTR );
     my $manager;
-    
+
     if ($listen) {
         $args->{manager} ||= 'FCGI::ProcManager';
@@ -75 +75 @@
         CGI::initialize_globals();
         my $req = $this->prepare;
-        if ( UNIVERSAL::isa($req, 'Foswiki::Request') ) {
+        if ( UNIVERSAL::isa( $req, 'Foswiki::Request' ) ) {
             my $res = Foswiki::UI::handleRequest($req);
             $this->finalize( $res, $req );
@@ -101 +101 @@
     # way, SUPER::preparePath works fine.
 
-    $ENV{PATH_INFO} =~ s#^$Foswiki::cfg{ScriptUrlPath}/*#/#;
+    $ENV{PATH_INFO} =~ s#^$Foswiki::cfg{ScriptUrlPath}/*#/#
+      if $ENV{PATH_INFO};
     $this->SUPER::preparePath(@_);
 }
 
 sub write {
-    my ($this, $buffer) = @_;
+    my ( $this, $buffer ) = @_;
     syswrite STDOUT, $buffer;
+}
+
+sub reExec {
+    require Config;
+    $ENV{PERL5LIB} .= join $Config::Config{path_sep}, @INC;
+    $ENV{PATH} = $Foswiki::cfg{SafeEnvPath};
+    my $perl = $Config::Config{perlpath};
+    my ($script) = $0 =~ /^(.*)$/;
+    exec $perl, '-wT', $script, map { /^(.*)$/; $1 } @ARGV;
 }
 
@@ -127 +137 @@
     umask(0);
     chdir '/';
-    open STDIN, "+</dev/null" or die $!;
-    open STDOUT, ">&STDIN"    or die $!;
-    open STDERR, ">&STDIN"    or die $!;
+    open STDIN,  "+</dev/null" or die $!;
+    open STDOUT, ">&STDIN"     or die $!;
+    open STDERR, ">&STDIN"     or die $!;
     POSIX::setsid();
 }