[Catalyst-commits] r13083 - in Catalyst-Runtime/5.80/trunk: . lib/Catalyst/Engine

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2010-03-28 17:43:37 +0100 (Sun, 28 Mar 2010)
New Revision: 13083

Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP.pm
Log:
Back out 13063. This changes the CGI environment we construct to just be plain wrong, SERVER_NAME is meant to be a name after all. I have a feeling that all of this crap could be simplified, but I don't want to spend a lot of tuits changing it (and possibly breaking things for people with non-obvious behaviour changes like this one) - when those tuits could be spent on Plack stuff so that all this code dies anyway (and we do a major release so breakage can be more reasonable expected / extensively tested for). This is all possibly being _too_ paranoid here, but given the original commit didn't know what was happening / what changed _at all_, I think that's fair..

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2010-03-26 16:00:54 UTC (rev 13082)
+++ Catalyst-Runtime/5.80/trunk/Changes	2010-03-28 16:43:37 UTC (rev 13083)
@@ -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

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP.pm	2010-03-26 16:00:54 UTC (rev 13082)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/HTTP.pm	2010-03-28 16:43:37 UTC (rev 13083)
@@ -534,7 +534,8 @@
         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;