improved Mojo::Server to load applications consistently for all serve…

…rs (closes #686)
mojolicious · Oct 8, 2014 · 88017f3 · 88017f3
1 parent 70bbe92
commit 88017f3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 1 deletion.
diff --git a/Changes b/Changes
@@ -1,6 +1,8 @@
 
 5.49  2014-10-09
   - Improved form content generator to allow custom content types.
+  - Improved Mojo::Server to load applications consistently for all servers.
+    (tianon, sri)
 
 5.48  2014-10-07
   - Emergency release for a serious security issue that can result in

diff --git a/lib/Mojo/Server.pm b/lib/Mojo/Server.pm
@@ -2,6 +2,7 @@ package Mojo::Server;
 use Mojo::Base 'Mojo::EventEmitter';
 
 use Carp 'croak';
+use Cwd 'abs_path';
 use Mojo::Loader;
 use Mojo::Util 'md5_sum';
 use POSIX;
@@ -43,7 +44,7 @@ sub load_app {
 
   # Clean environment (reset FindBin defensively)
   {
-    local $0 = $path;
+    local $0 = $path = abs_path $path;
     require FindBin;
     FindBin->again;
     local $ENV{MOJO_APP_LOADER} = 1;

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -981,6 +981,8 @@ Tatsuhiko Miyagawa
 
 Terrence Brannon
 
+Tianon Gravi
+
 Tomas Znamenacek
 
 Ulrich Habel

diff --git a/t/mojo/daemon.t b/t/mojo/daemon.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use Test::More;
+use Cwd 'abs_path';
 use File::Spec::Functions 'catdir';
 use FindBin;
 use Mojo;
@@ -62,6 +63,11 @@ is $app->config({test => 23})->config->{test}, 23, 'right value';
 is_deeply $app->config, {foo => 'bar', baz => 'yada', test => 23},
   'right value';
 
+# Script name
+my $path = "$FindBin::Bin/lib/../lib/myapp.pl";
+is(Mojo::Server::Daemon->new->load_app($path)->config('script'),
+  abs_path($path), 'right script name');
+
 # Load broken app
 eval {
   Mojo::Server::Daemon->new->load_app(

diff --git a/t/mojo/lib/myapp.pl b/t/mojo/lib/myapp.pl
@@ -0,0 +1,5 @@
+use Mojolicious::Lite;
+
+app->config(script => $0);
+
+app->start;