oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'WebGUI8' of github.com:plainblack/webgui into 8

Browse source 
Conflicts:
	lib/WebGUI.pm
	lib/WebGUI/Auth/WebGUI.pm
	sbin/findBrokenAssets.pl
	sbin/testEnvironment.pl
This commit is contained in:
Doug Bell 2011-05-13 18:20:52 -05:00
commit 677ac978b6
89 changed files with 1064 additions and 448 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/WebGUI/Content/Asset.pm
View file

@ -71,7 +71,7 @@ sub dispatch {
if ($session->user->isVisitor
&& !$session->request->ifModifiedSince($asset->getContentLastModified, $session->setting->get('maxCacheTimeout'))) {
$session->response->status("304");
$session->http->sendHeader;
$session->response->sendHeader;
return "chunked";
}
@ -166,7 +166,7 @@ The content handler for this package.
sub handler {
my ($session) = @_;
my ($log, $http, $asset, $request, $config) = $session->quick(qw(errorHandler http asset request config));
my ($log, $asset, $request, $config) = $session->quick(qw(errorHandler asset request config));
my $output = "";
if (my $perfLog = $log->performanceLogger) { #show performance indicators if required
my $t = [Time::HiRes::gettimeofday()];
@ -176,19 +176,6 @@ sub handler {
else {
$output = dispatch($session, getRequestedAssetUrl($session));
}
my $filename = $http->getStreamedFile();
if ((defined $filename) && ($config->get("enableStreamingUploads") eq "1")) {
my $ct = guess_media_type($filename);
my $oldContentType = $request->content_type($ct);
if ($request->sendfile($filename) ) {
return; # TODO - what should we return to indicate streaming?
}
else {
$request->content_type($oldContentType);
}
}
return $output;
}

2
lib/WebGUI/Content/Maintenance.pm
View file

@ -47,7 +47,7 @@ The content handler for this package.
sub handler {
my $session = shift;
if ($session->setting->get("specialState") eq "upgrading") {
$session->http->sendHeader;
$session->response->sendHeader;
open my $fh, '<', $session->config->get('maintenancePage');
my $output = do { local $/; <$fh> };
close $fh;