[Rt-commit] r17194 - in rt/3.8/trunk: .

[sartak at bestpractical.com]

Author: sartak
Date: Fri Dec 12 15:47:33 2008
New Revision: 17194

Modified:
   rt/3.8/trunk/   (props changed)
   rt/3.8/trunk/lib/RT/Interface/Web.pm

Log:
 r77082 at onn:  sartak | 2008-12-12 15:47:22 -0500
 Prefer the SERVER_HOST environment variable for generating uris over HTTP_HOST. rt3.fsck.com #12716.


Modified: rt/3.8/trunk/lib/RT/Interface/Web.pm
==============================================================================
--- rt/3.8/trunk/lib/RT/Interface/Web.pm	(original)
+++ rt/3.8/trunk/lib/RT/Interface/Web.pm	Fri Dec 12 15:47:33 2008
@@ -198,7 +198,8 @@
             $uri->scheme('http');
         }
 
-        $uri->host( $ENV{'HTTP_HOST'} );
+        # [rt3.fsck.com #12716] Apache recommends use of $SERVER_HOST
+        $uri->host( $ENV{'SERVER_HOST'} || $ENV{'HTTP_HOST'} );
         $uri->port( $ENV{'SERVER_PORT'} );
     }