improved Mojo::Server to use FindBin more defensively (closes #518)

mojolicious · Jul 29, 2013 · 52990dc · 52990dc
1 parent 019b22f
commit 52990dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,6 @@
 
 4.22  2013-07-30
+  - Improved Mojo::Server to use FindBin more defensively.
 
 4.21  2013-07-29
   - Added strip method to Mojo::DOM.

diff --git a/lib/Mojo/Server.pm b/lib/Mojo/Server.pm
@@ -2,7 +2,6 @@ package Mojo::Server;
 use Mojo::Base 'Mojo::EventEmitter';
 
 use Carp 'croak';
-use FindBin;
 use Mojo::Loader;
 use Mojo::Util 'md5_sum';
 use Scalar::Util 'blessed';
@@ -27,9 +26,10 @@ sub build_tx { shift->app->build_tx }
 sub load_app {
   my ($self, $path) = @_;
 
-  # Clean environment (reset FindBin)
+  # Clean environment (reset FindBin defensively)
   {
     local $0 = $path;
+    require FindBin;
     FindBin->again;
     local $ENV{MOJO_APP_LOADER} = 1;
     local $ENV{MOJO_EXE};