Changeset 14236 for gsdl/trunk

Timestamp:

2007-07-09T14:44:19+12:00 (17 years ago)

Author:

mdewsnip

Message:

Added a bunch more code to deal with IIS 6 craziness, thanks to Stefan Boddie.

File:

• gsdl/trunk/cgi-bin/gliserver.pl (modified) (5 diffs)

gsdl/trunk/cgi-bin/gliserver.pl

@@ -264 +264 @@
     my $installation_status = "";
 
+    print STDOUT "Content-type:text/plain\n\n";
+
     # Check that Java is installed and accessible
     my $java = $gsdl_cgi->get_java_path();
     my $java_command = "$java -version 2>&1";
+
+    # IIS 6: redirecting output from STDERR to STDOUT just doesn't work, so we have to let it go
+    #   directly out to the page
+    if ($iis6_mode)
+    {
+    $java_command = "java -version";
+    }
+
     my $java_output = `$java_command`;
     my $java_status = $?;
@@ -285 +295 @@
 
     if ($installation_ok) {
-    $gsdl_cgi->generate_ok_message($installation_status . "\nInstallation OK!");
+    print STDOUT $installation_status . "\nInstallation OK!";
     }
     else {
-    $gsdl_cgi->generate_error($installation_status);
+    print STDOUT $installation_status;
     }
 }
@@ -594 +604 @@
     }
 
+    print STDOUT "Content-type:text/plain\n\n";
+
     my $perl_command = "perl -S $script $perl_args 2>&1";
+
+    # IIS 6: redirecting output from STDERR to STDOUT just doesn't work, so we have to let it go
+    #   directly out to the page
+    if ($iis6_mode)
+    {
+    $perl_command = "perl -S $script $perl_args";
+    }
+
     my $perl_output = `$perl_command`;
     my $perl_status = $?;
@@ -601 +621 @@
     }
 
-    print STDOUT "Content-type:text/plain\n\n";
-    print STDOUT $perl_output;
+    if (defined($perl_output))
+    {
+    print STDOUT $perl_output;
+    }
 }
 
@@ -746 +768 @@
     }
 
+    print STDOUT "Content-type:text/plain\n\n";
+
     my $perl_command = "perl -S $script $perl_args 2>&1";
+
+    # IIS 6: redirecting output from STDERR to STDOUT just doesn't work, so we have to let it go
+    #   directly out to the page
+    if ($iis6_mode)
+    {
+    $perl_command = "perl -S $script $perl_args";
+    }
+
     if (!open(PIN, "$perl_command |")) {
     $gsdl_cgi->generate_error("Unable to execute command: $perl_command");
     }
 
-    print STDOUT "Content-type:text/plain\n\n";
     while (defined (my $perl_output_line = <PIN>)) {
     print STDOUT $perl_output_line;