# This file documents the revision history for Perl extension Catalyst.
+ Bug fixes:
+ - Additional fix for getting the base application path right when rewriting
+ requests into an application sub path with mod_alias and mod_rewrite on
+ Apache.
+
New features:
- Setting __PACKAGE__->config(enable_catalyst_header => 1); in your MyApp.pm
now enables the X-Catalyst header being printed when not in debug mode.
my @superclasses = ($meta->superclasses, $class, 'Catalyst::Controller');
$meta->superclasses(@superclasses);
}
+ $meta->make_mutable if $meta->is_immutable; # HACK
# Avoid possible C3 issues if 'Moose::Object' is already on RHS of MyApp
$meta->superclasses(grep { $_ ne 'Moose::Object' } $meta->superclasses);
else {
$base_path = $script_name || '/';
}
+# $base_path .= '/' unless $base_path =~ m{/$};
# If we are running as a backend proxy, get the true hostname
PROXY_CHECK:
if (my $req_uri = $ENV{REQUEST_URI}) {
$req_uri =~ s/^\Q$base_path\E//;
$req_uri =~ s/\?.*$//;
- if ($req_uri) {
- # Note that if REQUEST_URI doesn't start with a /, then the user
- # is probably using mod_rewrite or something to rewrite requests
- # into a sub-path of their application..
+ if ($req_uri && $req_uri ne '/') {
# This means that REQUEST_URI needs information from PATH_INFO
# prepending to it to be useful, otherwise the sub path which is
# being redirected to becomes the app base address which is
# incorrect.
- if (substr($req_uri, 0, 1) ne '/') {
- my ($match) = $req_uri =~ m|^([^/]+)|;
- my ($path_info_part) = $path_info =~ m|^(.*?\Q$match\E)|;
- substr($req_uri, 0, length($match), $path_info_part)
- if $path_info_part;
- }
+ my ($match) = $req_uri =~ m{^(/?[^/]+)};
+ my ($path_info_part) = $path_info =~ m|^(.*?\Q$match\E)|;
+ substr($req_uri, 0, length($match), $path_info_part)
+ if $path_info_part;
$path_info = $req_uri;
}
}
is ''.$r->base, 'http://www.foo.com/oslobilder/';
}
-
+{
+ my $r = get_req (
+ PATH_INFO => '/auth/login',
+ SCRIPT_NAME => '/tx',
+ REQUEST_URI => '/login',
+ );
+ is ''.$r->path, 'auth/login';
+ is ''.$r->uri, 'http://www.foo.com/tx/auth/login';
+ is ''.$r->base, 'http://www.foo.com/tx/';
+}
# FIXME - Test proxy logic