[otrs-cvs] otrs/Kernel/Modules Installer.pm,1.98,1.99

Comments:
Update of /home/cvs/otrs/Kernel/Modules
In directory lancelot:/tmp/cvs-serv21118/Kernel/Modules

Modified Files:
	Installer.pm 
Log Message:
Reload before finishing so mail settings, log settings etc are reloaded. Clear 'restart web server' message for Perlex/IIS.

Author: mb

Index: Installer.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Modules/Installer.pm,v
retrieving revision 1.98
retrieving revision 1.99
diff -2 -u -d -r1.98 -r1.99
--- Installer.pm	2 Feb 2013 21:53:28 -0000	1.98
+++ Installer.pm	2 Feb 2013 22:19:42 -0000	1.99
@@ -94,12 +94,18 @@
         $Dist{Webserver} = 'service httpd restart';
     }
-    else {
-        if ( exists $ENV{MOD_PERL} ) {
-            eval 'require mod_perl';
-            if ( defined $mod_perl::VERSION ) {
-                $Dist{Webserver} = 'Apache2 + mod_perl2';
-            }
+    elsif ( exists $ENV{MOD_PERL} ) {
+        eval 'require mod_perl';
+        if ( defined $mod_perl::VERSION ) {
+            $Dist{Webserver} = 'Apache2 + mod_perl2';
         }
     }
+    elsif (
+        exists $ENV{'GATEWAY_INTERFACE'}
+        && $ENV{'GATEWAY_INTERFACE'} eq "CGI-PerlEx"
+        )
+    {
+        $Dist{Vendor}    = '';
+        $Dist{Webserver} = '';
+    }
 
     # check if Apache::Reload is loaded
@@ -530,5 +536,5 @@
             if (
                 exists $ENV{'GATEWAY_INTERFACE'}
-                and $ENV{'GATEWAY_INTERFACE'} eq "CGI-PerlEx"
+                && $ENV{'GATEWAY_INTERFACE'} eq "CGI-PerlEx"
                 )
             {
@@ -856,4 +862,13 @@
         }
 
+        # if running under PerlEx, reload the application (and thus the configuration)
+        if (
+            exists $ENV{'GATEWAY_INTERFACE'}
+            && $ENV{'GATEWAY_INTERFACE'} eq "CGI-PerlEx"
+            )
+        {
+            PerlEx::ReloadAll();
+        }
+
         # check if the user wants to register
         my $DoRegistration   = 1;
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log