diff options
| -rw-r--r-- | TODO | 1 | ||||
| -rw-r--r-- | Xerl.pm | 4 | ||||
| -rw-r--r-- | Xerl/Setup/Configure.pm | 22 | ||||
| -rwxr-xr-x | index.pl | 4 |
4 files changed, 15 insertions, 16 deletions
@@ -1,6 +1,5 @@ Hint: Run 'make todo' (in the source tree) to see everything in every file what is to do! -TODO: - Migrate to Perl 6 after Perl 6 stable is available as a FreeBSD package TODO: - Evaluate Template Toolkit, maybe use it TODO: - Documentation of all features/options @@ -1,4 +1,4 @@ -# Xerl (c) 2005-2011, 2013-2015 by Paul Buetow +# Xerl (c) 2005-2011, 2013-2015, 2017 by Paul Buetow # # E-Mail: xerl@dev.buetow.org WWW: https://xerl.buetow.org # @@ -12,7 +12,7 @@ use warnings; use v5.14.0; -use CGI::Carp 'fatalsToBrowser'; +#use CGI::Carp 'fatalsToBrowser'; use Time::HiRes 'gettimeofday'; use Xerl::Base; diff --git a/Xerl/Setup/Configure.pm b/Xerl/Setup/Configure.pm index 8f19f80..406df9c 100644 --- a/Xerl/Setup/Configure.pm +++ b/Xerl/Setup/Configure.pm @@ -66,17 +66,6 @@ sub defaults { my $host = $self->get_host(); unless ( -d $self->get_hostroot() . $host ) { - my $redirect = $self->get_hostroot() . 'redirect:' . $host; - - if ( -f $redirect ) { - my $file = Xerl::Tools::FileIO->new( 'path' => $redirect ); - $file->fslurp(); - - my $location = $file->shift(); - Xerl::Main::Global::REDIRECT($location); - $self->set_finish_request(1); - } - my $alias = $self->get_hostroot() . 'alias:' . $host; my $alias_host = ''; @@ -94,6 +83,17 @@ sub defaults { $self->set_host( $alias_host ); } + + my $redirect = $self->get_hostroot() . 'redirect:' . $self->get_host(); + + if ( -f $redirect ) { + my $file = Xerl::Tools::FileIO->new( 'path' => $redirect ); + $file->fslurp(); + + my $location = $file->shift(); + Xerl::Main::Global::REDIRECT($location); + $self->set_finish_request(1); + } } $self->set_outputformat( $self->get_defaultoutputformat() ) @@ -1,6 +1,6 @@ -#!/usr/bin/perl +#!/usr/local/bin/perl -# Xerl (c) 2005-2011, 2013-2015 by Paul Buetow +# Xerl (c) 2005-2011, 2013-2015, 2017 by Paul Buetow # # E-Mail: xerl@dev.buetow.org WWW: https://xerl.buetow.org # |