From 7ebea75e336a13024bbbeeab86d3e252cfea78fa Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Wed, 2 May 2007 16:44:02 +0000
Subject: [PATCH] fix: HttpProxy no longer processes macros in proxied content

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

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index f34764f7f..f34df9bab 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -29,6 +29,8 @@
     http://www.plainblack.com/bugs/tracker/too-many-directories-in-rss-cache
  - fix: Help link broken for navigation template (perlDreamer Consulting, LLC)
     http://www.plainblack.com/bugs/tracker/help-link-broken-for-navigation-template
+ - fix: HttpProxy no longer processes macros in proxied content
+    http://www.plainblack.com/bugs/tracker/weird-characters-in-webgui.log-caused-by-http-proxy
 
 7.3.15
  - Added more documentation to WebGUI.pm
diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
index e542a1a44..9cc9ccb92 100644
--- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm
+++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
@@ -419,21 +419,21 @@ sub view {
 #-------------------------------------------------------------------
 
 sub www_view {
-        my $self = shift;
-        return $self->session->privilege->noAccess() unless $self->canView;
-	$self->prepareView;
-        my $output = $self->view;
-        if ($self->session->http->getMimeType ne "text/html") {
-                return $output;
-        } else {
-		$self->session->http->sendHeader;
-		my $style = $self->processStyle("~~~");
-		my ($head, $foot) = split("~~~",$style);
-		$self->session->output->print($head, 1);
-		$self->session->output->print($output);
-		$self->session->output->print($foot, 1);
-		return "chunked";
-        }
+    my $self = shift;
+    return $self->session->privilege->noAccess() unless $self->canView;
+    $self->prepareView;
+    my $output = $self->view;
+    if ($self->session->http->getMimeType ne "text/html") {
+        return $output;
+    } else {
+        $self->session->http->sendHeader;
+        my $style = $self->processStyle("~~~");
+        my ($head, $foot) = split("~~~",$style);
+        $self->session->output->print($head);
+        $self->session->output->print($output, 1); # Do not process macros
+        $self->session->output->print($foot);
+        return "chunked";
+    }
 }
 
 1;