From 3a987139801de515bc13e01bf25a19092e4b6aa4 Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Tue, 18 Mar 2008 15:46:02 +0000 Subject: [PATCH] fixed: HttpProxy mixes original site's content encoding with WebGUI's --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Asset/Wobject/HttpProxy.pm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 1208430d2..5a0c593eb 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,4 +1,5 @@ 7.5.7 + - fixed: HttpProxy mixes original site's content encoding with WebGUI's 7.5.6 - fixed: events get start/end time even when none specified (also can offset start/end day) diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm index 2c662fbec..549ab1901 100644 --- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm +++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm @@ -373,8 +373,8 @@ sub view { } if($response->is_success) { - $var{content} = $response->content; - $var{header} = $response->content_type; + $var{content} = $response->decoded_content || $response->content; + $var{header} = $response->content_type; if($response->content_type eq "text/html" || ($response->content_type eq "" && $var{content}=~/