From 7dcd6c0bfd2a95f278fe096d3e58b2e6f9c7741b Mon Sep 17 00:00:00 2001
From: Drake <drake@plainblack.com>
Date: Wed, 1 Nov 2006 21:27:17 +0000
Subject: [PATCH] Merge r3114 fix for HttpProxy not requiring Apache2::Upload
 correctly into HEAD.

---
 docs/changelog/7.x.x.txt              | 1 +
 lib/WebGUI/Asset/Wobject/HttpProxy.pm | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index a01f514c8..5e56c9114 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -43,6 +43,7 @@
  - Added some additional indicies for slightly better performance.
  - fix: PM resource search popup has no scrollbars
  - fix: Matrix listings create CS assets with wrong permissions
+ - fix: HttpProxy not requiring Apache2::Upload correctly
 
 7.1.2
  - Fixed a bug where logging in/out would cause a blank page display.
diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
index c812271a0..6b1e095ab 100644
--- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm
+++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
@@ -21,6 +21,7 @@ use WebGUI::Storage;
 use WebGUI::Asset::Wobject;
 use WebGUI::Asset::Wobject::HttpProxy::Parse;
 use WebGUI::Cache;
+use Apache2::Upload;
 
 our @ISA = qw(WebGUI::Asset::Wobject);