From defb78ab643deb3ad550f575e2bfdfb34a95e525 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Thu, 6 May 2010 09:31:04 -0500
Subject: [PATCH] don't use ForwardedHeaders, and different mechanism for
 Performance debug middleware

---
 sbin/testEnvironment.pl | 1 -
 var/site.psgi           | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sbin/testEnvironment.pl b/sbin/testEnvironment.pl
index 265a628bf..38fd9a6ed 100755
--- a/sbin/testEnvironment.pl
+++ b/sbin/testEnvironment.pl
@@ -112,7 +112,6 @@ checkModule("Plack::Request");
 checkModule("Plack::Response");
 checkModule("Plack::Middleware::Status");
 checkModule("Plack::Middleware::Debug");
-checkModule("Plack::Middleware::ForwardedHeaders");
 checkModule("URI::Escape",                  "3.29"       );
 checkModule("POSIX"                                      );
 checkModule("List::Util"                                 );
diff --git a/var/site.psgi b/var/site.psgi
index 232cb562c..df738477c 100644
--- a/var/site.psgi
+++ b/var/site.psgi
@@ -2,13 +2,11 @@ use strict;
 use Plack::Builder;
 use Plack::App::File;
 use WebGUI;
-use WebGUI::Middleware::Debug::Performance;
 
 builder {
     my $wg = WebGUI->new( site => $ENV{WEBGUI_CONFIG} );
     my $config = $wg->config;
 
-    enable 'ForwardedHeaders';
     enable 'Log4perl', category => $config->getFilename, conf => WebGUI::Paths->logConfig;
 
     # Reproduce URL handler functionality with middleware
@@ -27,6 +25,7 @@ builder {
     enable '+WebGUI::Middleware::HTTPExceptions';
 
     enable_if { ! $_[0]->{'webgui.debug'} } 'ErrorDocument', 500 => $config->get('maintenancePage');
+
     enable_if { $_[0]->{'webgui.debug'} } 'StackTrace';
     enable_if { $_[0]->{'webgui.debug'} } 'Debug', panels => [
         'Environment',
@@ -38,8 +37,8 @@ builder {
         [ 'MySQLTrace', skip_packages => qr/\AWebGUI::SQL(?:\z|::)/ ],
         'Response',
         'Logger',
-        sub { WebGUI::Middleware::Debug::Performance->wrap($_[0]) },
     ];
+    enable_if { $_[0]->{'webgui.debug'} } '+WebGUI::Middleware::Debug::Performance';
 
     # This one uses the Session object, so it comes after WebGUI::Middleware::Session
     mount $config->get('uploadsURL') => builder {