fixed: Exporting to static files can leak large amounts of memory
This commit is contained in:
parent
5fe7ffa55c
commit
b255495c02
2 changed files with 11 additions and 0 deletions
|
|
@ -11,6 +11,7 @@
|
||||||
- fixed #9511: Subcategories displayed incorrectly (Henry Tang, Long Term Results B.v.)
|
- fixed #9511: Subcategories displayed incorrectly (Henry Tang, Long Term Results B.v.)
|
||||||
- fixed #4137: Calendar Search page has head tags in body
|
- fixed #4137: Calendar Search page has head tags in body
|
||||||
- fixed: HTTP Proxy doesn't serve new content to visitors
|
- fixed: HTTP Proxy doesn't serve new content to visitors
|
||||||
|
- fixed: Exporting to static files can leak large amounts of memory
|
||||||
|
|
||||||
7.6.8
|
7.6.8
|
||||||
- added #!/usr/bin/env perl to all utility scripts
|
- added #!/usr/bin/env perl to all utility scripts
|
||||||
|
|
|
||||||
|
|
@ -299,6 +299,8 @@ sub exportAsHtml {
|
||||||
my $message = sprintf( $i18n->get('bad user privileges') . "\n") . $asset->getUrl;
|
my $message = sprintf( $i18n->get('bad user privileges') . "\n") . $asset->getUrl;
|
||||||
$self->session->output->print($message);
|
$self->session->output->print($message);
|
||||||
}
|
}
|
||||||
|
$exportSession->var->end;
|
||||||
|
$exportSession->close;
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -307,12 +309,16 @@ sub exportAsHtml {
|
||||||
if( !$quiet ) {
|
if( !$quiet ) {
|
||||||
$self->session->output->print("$fullPath skipped, not exportable<br />");
|
$self->session->output->print("$fullPath skipped, not exportable<br />");
|
||||||
}
|
}
|
||||||
|
$exportSession->var->end;
|
||||||
|
$exportSession->close;
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|
||||||
# tell the user which asset we're exporting.
|
# tell the user which asset we're exporting.
|
||||||
unless ($quiet) {
|
unless ($quiet) {
|
||||||
my $message = sprintf $i18n->get('exporting page'), $fullPath;
|
my $message = sprintf $i18n->get('exporting page'), $fullPath;
|
||||||
|
$exportSession->var->end;
|
||||||
|
$exportSession->close;
|
||||||
$self->session->output->print($message);
|
$self->session->output->print($message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -322,6 +328,8 @@ sub exportAsHtml {
|
||||||
$returnCode = 0;
|
$returnCode = 0;
|
||||||
$message = $@;
|
$message = $@;
|
||||||
$self->session->output->print("could not export asset with URL " . $asset->getUrl . ": $@");
|
$self->session->output->print("could not export asset with URL " . $asset->getUrl . ": $@");
|
||||||
|
$exportSession->var->end;
|
||||||
|
$exportSession->close;
|
||||||
return ($returnCode, $message);
|
return ($returnCode, $message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -332,6 +340,8 @@ sub exportAsHtml {
|
||||||
$returnCode = 0;
|
$returnCode = 0;
|
||||||
$message = $@;
|
$message = $@;
|
||||||
$self->session->output->print("failed to export asset collateral for URL " . $asset->getUrl . ": $@");
|
$self->session->output->print("failed to export asset collateral for URL " . $asset->getUrl . ": $@");
|
||||||
|
$exportSession->var->end;
|
||||||
|
$exportSession->close;
|
||||||
return ($returnCode, $message);
|
return ($returnCode, $message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue