From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 13 Feb 2013 13:10:36 +0000 (+0100)
Subject: Opendocument PDF Konvertierung unter FCGI ermöglicht
X-Git-Tag: release-3.1.0beta1~615
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=c6ab4d998bb67369edaa4141a89d1c06c42a7e15;p=kivitendo-erp.git

Opendocument PDF Konvertierung unter FCGI ermöglicht

Forken unter FCGI muss die in/out streams gesondert behandeln.
---

diff --git a/SL/Template/OpenDocument.pm b/SL/Template/OpenDocument.pm
index e0523d346..f9507f9ba 100644
--- a/SL/Template/OpenDocument.pm
+++ b/SL/Template/OpenDocument.pm
@@ -457,10 +457,19 @@ sub spawn_openoffice {
       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 ($::dispatcher->interface_type eq 'FastCGI') {
+          $::dispatcher->{request}->Finish;
+          $::dispatcher->{request}->LastCall;
+        }
         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);
+      } else {
+        # parent
+        if ($::dispatcher->interface_type eq 'FastCGI') {
+          $::dispatcher->{request}->Attach;
+        }
       }
 
       $main::lxdebug->message(LXDebug->DEBUG2(), "  Parent after fork\n");