Back out 13063. This changes the CGI environment we construct to just be plain wrong...

diff --git a/Changes b/Changes
index 4db5cf4..e05dd8b 100644 (file)
--- a/Changes
+++ b/Changes
@@ -11,10 +11,6 @@
      in parameter filtering (for example).
    - $c->model/view/controller have become a lot faster for non-regexp names
      by using direct hash lookup instead of looping.
-   - Now reports the used server address as an IP string rather than a
-     looked up hostname (because nothing really cares and hostname
-     lookups, even on local interfaces, can be slow on dev machines with
-     hosed DNS setups)
 
   Bug fixed:
     - DispatchType::Index's uri_for_action only returns for actions registered

diff --git a/lib/Catalyst/Engine/HTTP.pm b/lib/Catalyst/Engine/HTTP.pm
index 6b0bc12..7f01795 100644 (file)
--- a/lib/Catalyst/Engine/HTTP.pm
+++ b/lib/Catalyst/Engine/HTTP.pm
@@ -534,7 +534,8 @@ sub _socket_data {
         peeraddr  => $iaddr
             ? ( inet_ntoa($iaddr) || '127.0.0.1' )
             : '127.0.0.1',
-        localname => inet_ntoa($localiaddr) || '127.0.0.1',
+        localname => gethostbyaddr( $localiaddr, AF_INET ) || 'localhost',
+        localaddr => inet_ntoa($localiaddr) || '127.0.0.1',
     };
 
     return $data;