projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Warnung unterdrücken die den Test fehlschlagen lässt.
[kivitendo-erp.git]
/
SL
/
Template
/
OpenDocument.pm
diff --git
a/SL/Template/OpenDocument.pm
b/SL/Template/OpenDocument.pm
index
e0523d3
..
f9507f9
100644
(file)
--- a/
SL/Template/OpenDocument.pm
+++ b/
SL/Template/OpenDocument.pm
@@
-457,10
+457,19
@@
sub spawn_openoffice {
last;
}
last;
}
+ if ($::dispatcher->interface_type eq 'FastCGI') {
+ $::dispatcher->{request}->Detach;
+ }
+
if (!$spawned_oo) {
my $pid = fork();
if (0 == $pid) {
$main::lxdebug->message(LXDebug->DEBUG2(), " Child daemonizing\n");
if (!$spawned_oo) {
my $pid = fork();
if (0 == $pid) {
$main::lxdebug->message(LXDebug->DEBUG2(), " Child daemonizing\n");
+
+ if ($::dispatcher->interface_type eq 'FastCGI') {
+ $::dispatcher->{request}->Finish;
+ $::dispatcher->{request}->LastCall;
+ }
chdir('/');
open(STDIN, '/dev/null');
open(STDOUT, '>/dev/null');
chdir('/');
open(STDIN, '/dev/null');
open(STDOUT, '>/dev/null');
@@
-474,6
+483,11
@@
sub spawn_openoffice {
"-accept=socket,host=localhost,port=" .
$::lx_office_conf{print_templates}->{openofficeorg_daemon_port} . ";urp;");
exec(@cmdline);
"-accept=socket,host=localhost,port=" .
$::lx_office_conf{print_templates}->{openofficeorg_daemon_port} . ";urp;");
exec(@cmdline);
+ } else {
+ # parent
+ if ($::dispatcher->interface_type eq 'FastCGI') {
+ $::dispatcher->{request}->Attach;
+ }
}
$main::lxdebug->message(LXDebug->DEBUG2(), " Parent after fork\n");
}
$main::lxdebug->message(LXDebug->DEBUG2(), " Parent after fork\n");