[Catalyst-commits] r11147 - Catalyst-Runtime/5.80/trunk

[jshirley at dev.catalyst.perl.org]

Author: jshirley
Date: 2009-08-17 22:13:05 +0000 (Mon, 17 Aug 2009)
New Revision: 11147

Modified:
   Catalyst-Runtime/5.80/trunk/Changes
Log:
Conflict resolution

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2009-08-17 22:11:34 UTC (rev 11146)
+++ Catalyst-Runtime/5.80/trunk/Changes	2009-08-17 22:13:05 UTC (rev 11147)
@@ -37,6 +37,8 @@
          as such by adding a _component_name accessor for all components
          which returns the component instance's name to be used when building
          actions etc.
+       - Adding X-Forwarded-Port to allow the frontend proxy to dictate the
+         frontend port (jshirley)
 
   Documentation:
        - Fix POD to refer to ->config(key => $val), rather than