From 96b6559250b3b0da30928fe18c665669d62f34c1 Mon Sep 17 00:00:00 2001 From: Doug Bell Date: Wed, 22 Nov 2006 05:54:15 +0000 Subject: [PATCH] HttpProxy now handles styles appropriately --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Asset/Wobject/HttpProxy.pm | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 3fc8f70ee..ceb740a39 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -10,6 +10,7 @@ between canShowDebug, canShowPerformanceIndicators and any other IP based check for privileges. - fix: RSS From Parent having no icon + - fix: HttpProxy now handles styles appropriately. 7.2.1 - Made a change to version tag commits to deal with unusually long commit diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm index 9ef95ede5..50c43716a 100644 --- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm +++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm @@ -310,7 +310,7 @@ sub view { } } ### DEBUG - $self->session->errorHandler->warn("URL: $proxiedUrl"); + #$self->session->errorHandler->warn("URL: $proxiedUrl"); $request = HTTP::Request->new(GET => $proxiedUrl, $header) || return "wrong url"; # Create GET request } else { # It's a POST @@ -401,8 +401,10 @@ sub view { } } + + $self->session->http->setMimeType($var{header}); + if($var{header} ne "text/html") { - $self->session->http->setMimeType($var{header}); return $var{content}; } else { return $self->processTemplate(\%var,undef,$self->{_viewTemplate}); @@ -417,11 +419,16 @@ sub www_view { return $self->session->privilege->noAccess() unless $self->canView; $self->prepareView; my $output = $self->view; - # this is s a stop gap. we need to do something here that deals with the real www_view and caching, etc. - if ($self->session->http->getMimeType() ne "text/html") { + if ($self->session->http->getMimeType ne "text/html") { return $output; } else { - return $self->processStyle($output); + $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"; } }