Merge branch 'master' into psgi

* master:
  A failing reverse lookup doesn't imply it's a local address
  Tiny tidyups to copyright and license

Conflicts:
	lib/Catalyst/Engine/HTTP.pm

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index d093e23..c337b30 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -3279,6 +3279,10 @@ rainboxx: Matthias Dietrich, C<perl@rainboxx.de>
 
 dd070: Dhaval Dhanani <dhaval070@gmail.com>
 
+=head1 COPYRIGHT
+
+Copyright (c) 2005, the above named PROJECT FOUNDER and CONTRIBUTORS.
+
 =head1 LICENSE
 
 This library is free software. You can redistribute it and/or modify it under

diff --git a/lib/Catalyst/Request.pm b/lib/Catalyst/Request.pm
index ab5c0da..921eab4 100644 (file)
--- a/lib/Catalyst/Request.pm
+++ b/lib/Catalyst/Request.pm
@@ -120,7 +120,7 @@ has hostname => (
   lazy      => 1,
   default   => sub {
     my ($self) = @_;
-    gethostbyaddr( inet_aton( $self->address ), AF_INET ) || 'localhost'
+    gethostbyaddr( inet_aton( $self->address ), AF_INET ) || $self->address
   },
 );
 

diff --git a/lib/Catalyst/Runtime.pm b/lib/Catalyst/Runtime.pm
index 010a388..0613feb 100644 (file)
--- a/lib/Catalyst/Runtime.pm
+++ b/lib/Catalyst/Runtime.pm
@@ -21,11 +21,11 @@ See L<Catalyst>.
 
 This is the primary class for the Catalyst-Runtime distribution, version 5.80.
 
-=head1 AUTHORS
+=head1 AUTHORS & COPYRIGHT
 
 Catalyst Contributors, see Catalyst.pm
 
-=head1 COPYRIGHT
+=head1 LICENSE
 
 This library is free software. You can redistribute it and/or modify it under
 the same terms as Perl itself.